CVS commit: src/crypto/external/bsd/heimdal/bin/krb5-config

2019-12-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Dec 17 00:16:26 UTC 2019

Modified Files:
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile

Log Message:
PR/54773: David Shao: krb5-config.in needs to be evaluated by the shell now
in order to work. Perhaps it is better to keep a local modified copy that
does not need this treatment...


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.3	Thu Apr 24 09:50:53 2014
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile	Mon Dec 16 19:16:26 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2014/04/24 13:50:53 pettai Exp $
+#	$NetBSD: Makefile,v 1.4 2019/12/17 00:16:26 christos Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -11,8 +11,9 @@ MAN=		krb5-config.1
 CLEANFILES+=	krb5-config
 
 krb5-config: krb5-config.in
-	${TOOL_SED} -e "s!@PACKAGE\@!heimdal!g" \
-	-e "s!@VERSION\@!1.5.3!g" \
+	${TOOL_SED} \
+		-e "s!@PACKAGE\@!heimdal!g" \
+	-e "s!@VERSION\@!${VERSION}!g" \
 	-e "s!@prefix\@!/!g" \
 	-e "s!@exec_prefix\@!/!g" \
 	-e "s!@libdir\@!/usr/lib!g" \
@@ -26,7 +27,7 @@ krb5-config: krb5-config.in
 	-e "s!@LIB_pkinit\@!-lhx509!g" \
 	-e "s!@PTHREAD_LIBADD\@!!g" \
 	-e "s!@LIBS\@!!g" \
-	${HEIMDIST}/tools/krb5-config.in > $@
+	${HEIMDIST}/tools/krb5-config.in | sh > $@
 	chmod +x $@
 
 .include 



CVS commit: src/crypto/external/bsd/heimdal/bin/krb5-config

2013-04-12 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Fri Apr 12 18:08:10 UTC 2013

Modified Files:
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile

Log Message:
Don't force pthread linkage.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.1	Wed Apr 13 19:16:46 2011
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile	Fri Apr 12 18:08:10 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/04/13 19:16:46 elric Exp $
+#	$NetBSD: Makefile,v 1.2 2013/04/12 18:08:10 joerg Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -24,7 +24,7 @@ krb5-config: krb5-config.in
 	-e "s!@LIB_dlopen\@!!g" \
 	-e "s!@LIB_door_create\@!!g" \
 	-e "s!@LIB_pkinit\@!-lhx509!g" \
-	-e "s!@PTHREAD_LIBADD\@!-lpthread!g" \
+	-e "s!@PTHREAD_LIBADD\@!!g" \
 	-e "s!@LIBS\@!!g" \
 	${HEIMDIST}/tools/krb5-config.in > $@
 	chmod +x $@