Module Name: src
Committed By: he
Date: Wed May 25 19:21:20 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/bin: Makefile.inc
src/crypto/external/bsd/heimdal/bin/gsstool: Makefile
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
src/crypto/external/bsd/heimdal/bin/kcc: Makefile
src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
src/crypto/external/bsd/heimdal/bin/kinit: Makefile
src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
src/crypto/external/bsd/heimdal/bin/string2key: Makefile
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile
src/crypto/external/bsd/heimdal/dist/lib/hx509: sel.h
src/crypto/external/bsd/heimdal/dist/lib/krb5: version-script.map
src/crypto/external/bsd/heimdal/lib: Makefile
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile
Log Message:
Fix up Heimdal so that it can be built statically, allowing the
sun2 port to proceed beyond trying and failing to build Heimdal.
This is done by:
1) Stop pretending that libipc is a separate library, and instead
build it as part of libkrb5. The version map for libkrb5 needed
to be updated to expose the required symbols from libipc.
2) The lexer in libhx509 needs to use its own prefix, so that the
resulting library can be statically linked with a lexer which
uses the default prefix. This was hidden because libhx509's
version map file (which is only used for the shared libs) hid
away the lexer symbols. Some defines needed tweaking as well
to restore buildability.
3) Excplicitly mention all the required libraries in LDADD+= and
make sure DPADD is set to correspond. This allows static linking;
earlier this relied on shared library dependencies to have all the
libs pulled in. In the process, convert to single-line LDADD+=
and DPADD+= settings. Use Makefile.inc for the common libraries
to the extent possible.
Successfully built from scratch for i386 and sun2 several times,
and for lots of other ports as well.
Discussed with elric@ and christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/sbin/ktutil/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/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.1 src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.2
--- src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.1 Wed Apr 13 19:16:44 2011
+++ src/crypto/external/bsd/heimdal/bin/Makefile.inc Wed May 25 19:21:16 2011
@@ -1,3 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/04/13 19:16:44 elric Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/05/25 19:21:16 he Exp $
BINDIR=/usr/bin
+
+LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lwind
+LDADD+= -lheimbase ${LIBVERS}
+LDADD+= -lcrypto -lcrypt
+
+DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBWIND}
+DPADD+= ${LIBHEIMBASE} ${LIBVERS}
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
Index: src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.1 Wed Apr 13 19:16:44 2011
+++ src/crypto/external/bsd/heimdal/bin/gsstool/Makefile Wed May 25 19:21:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:44 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,8 +13,12 @@
MAN=
-LDADD+= -lgssapi -lsl ${LIBVERS}
-DPADD+= ${LIBGSSAPI} ${LIBSL} ${LIBVERS}
+LDADD+= -lgssapi -lheimntlm
+LDADD+= -lsl ${LIBVERS}
+LDADD+= -ledit -lterminfo
+DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM}
+DPADD+= ${LIBSL}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.1 Wed Apr 13 19:16:45 2011
+++ src/crypto/external/bsd/heimdal/bin/hxtool/Makefile Wed May 25 19:21:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:45 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,8 +13,12 @@
MAN=
-LDADD+= -lgssapi -lsl ${LIBVERS}
-DPADD+= ${LIBGSSAPI} ${LIBSL} ${LIBVERS}
+LDADD+= -lgssapi
+LDADD+= -lsl
+LDADD+= -ledit -lterminfo
+DPADD+= ${LIBGSSAPI}
+DPADD+= ${LIBSL}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kcc/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.1 Wed Apr 13 19:16:45 2011
+++ src/crypto/external/bsd/heimdal/bin/kcc/Makefile Wed May 25 19:21:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:45 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -21,8 +21,10 @@
CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
-LDADD+= -lkrb5 -lkafs -lsl -lheimbase ${LIBVERS}
-DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBSL} ${LIBVERS}
+LDADD+= -lkafs -lsl
+LDADD+= -ledit -lterminfo
+DPADD+= ${LIBKAFS} ${LIBSL}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.1 Wed Apr 13 19:16:45 2011
+++ src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile Wed May 25 19:21:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:45 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,8 +10,8 @@
PROG= kdestroy
SRCS= kdestroy.c
-LDADD+= -lkrb5 -lkafs -lsl -lheimbase -lheimntlm ${LIBVERS}
-DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBSL} ${LIBVERS}
+LDADD+= -lkafs -lsl -lheimntlm
+DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.1 Wed Apr 13 19:16:45 2011
+++ src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile Wed May 25 19:21:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:45 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,8 +10,8 @@
PROG= kgetcred
SRCS= kgetcred.c
-LDADD+= -lkrb5 -lkafs -lsl -lheimbase -lheimntlm ${LIBVERS}
-DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBSL} ${LIBVERS}
+LDADD+= -lkafs -lsl -lheimntlm
+DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kinit/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/kinit/Makefile:1.1 Wed Apr 13 19:16:45 2011
+++ src/crypto/external/bsd/heimdal/bin/kinit/Makefile Wed May 25 19:21:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:45 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -12,8 +12,8 @@
CPPFLAGS+= -I${HEIMDIST}/lib/ntlm
-LDADD+= -lkrb5 -lkafs -lsl -lheimbase -lheimntlm ${LIBVERS}
-DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBSL} ${LIBVERS}
+LDADD+= -lkafs -lsl -lheimntlm
+DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.1 Wed Apr 13 19:16:46 2011
+++ src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile Wed May 25 19:21:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:46 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,8 +10,8 @@
PROG= kpasswd
SRCS= kpasswd.c
-LDADD+= -lkrb5 -lkafs -lsl -lheimbase -lheimntlm ${LIBVERS}
-DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBSL} ${LIBVERS}
+LDADD+= -lkafs -lsl -lheimntlm
+DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/string2key/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.1 Wed Apr 13 19:16:46 2011
+++ src/crypto/external/bsd/heimdal/bin/string2key/Makefile Wed May 25 19:21:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:46 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -20,8 +20,5 @@
-I${HEIMBASE}/lib/libheimntlm \
-I${HEIMBASE}/lib/libwind \
-LDADD+= -lkrb5 -lcrypto -lwind ${LIBVERS}
-DPADD+= ${LIBKRB5} ${LIBVERS}
-
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.1 Wed Apr 13 19:16:47 2011
+++ src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile Wed May 25 19:21:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:47 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
WARNS?= 2 # XXX -Wextra
@@ -20,10 +20,5 @@
# -I${DESTDIR}/usr/include/krb5 \
# -DHAVE_CONFIG_H
-LDADD+= -lkrb5 -lhx509 -lcrypto -lasn1 -lcom_err \
- ${LIBVERS} -lroken -lcrypt
-DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} \
- ${LIBVERS} ${LIBROKEN} ${LIBCRYPT}
-
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.1.1.1 Wed Apr 13 18:15:12 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h Wed May 25 19:21:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sel.h,v 1.1.1.1 2011/04/13 18:15:12 elric Exp $ */
+/* $NetBSD: sel.h,v 1.2 2011/05/25 19:21:17 he Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -69,14 +69,18 @@
extern struct hx_expr_input _hx509_expr_input;
-#define yyparse _hx509_sel_yyparse
+#if !defined(yylex)
#define yylex _hx509_sel_yylex
+#define yywrap _hx509_sel_yywrap
+#endif
+#if !defined(yyparse)
+#define yyparse _hx509_sel_yyparse
#define yyerror _hx509_sel_yyerror
#define yylval _hx509_sel_yylval
#define yychar _hx509_sel_yychar
#define yydebug _hx509_sel_yydebug
#define yynerrs _hx509_sel_yynerrs
-#define yywrap _hx509_sel_yywrap
+#endif
int _hx509_sel_yyparse(void);
int _hx509_sel_yylex(void);
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map:1.1.1.1 Wed Apr 13 18:15:39 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map Wed May 25 19:21:17 2011
@@ -760,6 +760,15 @@
_krb5_put_int;
_krb5_s4u2self_to_checksumdata;
+ # ipc stuff
+ heim_ipc_main;
+ heim_ipc_cred_get_uid;
+ heim_ipc_cred_get_gid;
+ heim_ipc_cred_get_pid;
+ heim_ipc_cred_get_session;
+ heim_sipc_launchd_mach_init;
+ heim_sipc_service_unix;
+
# kinit helper
krb5_get_init_creds_opt_set_pkinit_user_certs;
krb5_pk_enterprise_cert;
Index: src/crypto/external/bsd/heimdal/lib/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/Makefile:1.1 Wed Apr 13 19:16:47 2011
+++ src/crypto/external/bsd/heimdal/lib/Makefile Wed May 25 19:21:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:47 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
.include "bsd.own.mk"
@@ -17,7 +17,6 @@
libwind \
.WAIT \
libhx509 \
- libipc \
.WAIT \
libkrb5 \
.WAIT \
Index: src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.1 Wed Apr 13 19:16:50 2011
+++ src/crypto/external/bsd/heimdal/lib/libhdb/Makefile Wed May 25 19:21:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:50 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
USE_FORT?= yes # network protocol library
@@ -19,8 +19,6 @@
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase
-LDADD+= ${LIBIPC_PIC}
-
HEIMSRCS= hdb_err.et hdb.asn1
SRCS= \
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.1 Wed Apr 13 19:16:51 2011
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Wed May 25 19:21:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:51 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
NOLINT= # defined
@@ -55,6 +55,8 @@
softp11.c \
${BUILT_SOURCES}
+LPREFIX= _hx509_sel_yy
+
CPPFLAGS+= \
-I${HEIMDIST}/lib/hx509/ref \
-I${HEIMDIST}/lib/asn1
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.3 Fri May 20 20:09:37 2011
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Wed May 25 19:21:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/20 20:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/25 19:21:18 he Exp $
USE_FORT?= yes # network protocol library
@@ -21,8 +21,6 @@
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase
-LDADD+= ${LIBIPC_PIC}
-
HEIMSRCS= krb_err.et krb5_err.et heim_err.et k524_err.et
SRCS= \
@@ -143,6 +141,10 @@
warn.c \
write_message.c
+# Build the ipc library as part of this
+SRCS+= common.c client.c server.c
+.PATH: ${HEIMDIST}/lib/ipc
+
INCSDIR= /usr/include/krb5
INCS= krb5.h \
Index: src/crypto/external/bsd/heimdal/libexec/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.1 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.2
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.1 Wed Apr 13 19:16:56 2011
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc Wed May 25 19:21:18 2011
@@ -1,3 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/04/13 19:16:56 elric Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/05/25 19:21:18 he Exp $
BINDIR=/usr/libexec
+
+LDADD+= -lkrb5 -lhx509
+LDADD+= -lasn1 -lcom_err -lroken ${LIBVERS}
+LDADD+= -lheimbase -lheimntlm -lwind
+LDADD+= -lcrypto -lcrypt
+
+DPADD+= ${LIBKRB5} ${LIBHX509}
+DPADD+= ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBVERS}
+DPADD+= ${LIBHEIMBASE} ${LIBHEIMNTLM} ${LIBWIND}
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.1 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.2
--- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.1 Wed Apr 13 19:16:56 2011
+++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile Wed May 25 19:21:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:56 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -14,10 +14,8 @@
-I${HEIMDIST}/lib/krb5 \
-I${HEIMDIST}/lib/ipc
-LDADD+= -lkdc ${LIBVERS} ${LIBIPC}
-DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} \
- ${LIBASN1} ${LIBCOM_ERR} ${LIBVERS} ${LIBROKEN} \
- ${LIBCRYPT}
+LDADD+= -lkdc -lhdb
+DPADD+= ${LIBKDC} ${LIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.1 src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.2
--- src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.1 Wed Apr 13 19:16:56 2011
+++ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile Wed May 25 19:21:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:56 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -14,12 +14,8 @@
-I${HEIMDIST}/lib/asn1 \
-I${HEIMDIST}/lib/krb5
-LDADD+= -lhdb -lkrb5 -lhx509 -lcrypto \
- -lasn1 -lcom_err ${LIBVERS} -lroken \
- -lcrypt
-DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} \
- ${LIBASN1} ${LIBCOM_ERR} ${LIBVERS} ${LIBROKEN} \
- ${LIBCRYPT}
+LDADD+= -lhdb
+DPADD+= ${LIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.1 src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.2
--- src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.1 Wed Apr 13 19:16:57 2011
+++ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile Wed May 25 19:21:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:57 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -20,12 +20,8 @@
-I${HEIMDIST}/lib/asn1 \
-I${DESTDIR}/usr/include/kadm5
-LDADD+= -lkadm5srv -lhdb -lkrb5 -lhx509 -lasn1 \
- -lcrypto ${LIBVERS} -lcom_err -lroken \
- -lcrypt -lutil
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \
- ${LIBCRYPTO} ${LIBVERS} ${LIBCOM_ERR} ${LIBROKEN} \
- ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lkadm5srv -lhdb -lutil
+DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.1 src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.2
--- src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile:1.1 Wed Apr 13 19:16:57 2011
+++ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile Wed May 25 19:21:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:57 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -17,12 +17,8 @@
-I${HEIMDIST}/lib/asn1 \
-I${DESTDIR}/usr/include/kadm5
-LDADD+= -lkadm5srv -lhdb -lkrb5 -lhx509 -lasn1 \
- -lcrypto ${LIBVERS} -lcom_err -lroken \
- -lcrypt -lutil
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \
- ${LIBCRYPTO} ${LIBVERS} ${LIBCOM_ERR} ${LIBROKEN} \
- ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lkadm5srv -lhdb -lutil
+DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.1 src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.2
--- src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.1 Wed Apr 13 19:16:57 2011
+++ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile Wed May 25 19:21:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:57 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -18,12 +18,8 @@
-I${HEIMDIST}/lib/asn1 \
-I${HEIMBASE}/include/krb5
-LDADD+= -lgssapi -lkadm5srv -lhdb -lkrb5 -lhx509 \
- -lcrypto -lasn1 -lcom_err ${LIBVERS} \
- -lroken -lcrypt -lutil
-DPADD+= ${LIBGSSAPI} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} \
- ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} \
- ${LIBVERS} ${LIBROKEN} ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lgssapi -lkadm5srv -lhdb -lutil
+DPADD+= ${LIBGSSAPI} ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.1 src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.2
--- src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile:1.1 Wed Apr 13 19:16:57 2011
+++ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile Wed May 25 19:21:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:57 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:18 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,14 +11,8 @@
CPPFLAGS+= -DINETD_SUPPORT
-LDADD+= -lkadm5srv -lhdb -lkrb5 -lhx509 \
- -lcrypto -lasn1 \
- -lcom_err ${LIBVERS} -lroken -lcrypt \
- -lutil
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
- ${LIBCRYPTO} ${LIBASN1} \
- ${LIBCOM_ERR} ${LIBVERS} ${LIBROKEN} ${LIBCRYPT} \
- ${LIBUTIL}
+LDADD+= -lkadm5srv -lhdb -lutil
+DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.1 src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.2
--- src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.1 Wed Apr 13 19:16:58 2011
+++ src/crypto/external/bsd/heimdal/sbin/Makefile.inc Wed May 25 19:21:18 2011
@@ -1,3 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/04/13 19:16:58 elric Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/05/25 19:21:18 he Exp $
BINDIR=/usr/sbin
+
+LDADD+= -lkrb5 -lhx509 -lasn1 -lwind
+LDADD+= -lcom_err -lroken -lheimbase ${LIBVERS}
+LDADD+= -lcrypto -lcrypt
+
+DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBWIND}
+DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBHEIMBASE} ${LIBVERS}
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
Index: src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/hprop/Makefile:1.1 Wed Apr 13 19:16:58 2011
+++ src/crypto/external/bsd/heimdal/sbin/hprop/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:58 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -20,10 +20,8 @@
-I${HEIMDIST}/lib/hdb \
-I${HEIMDIST}/lib/krb5
-LDADD+= -lhdb -lkrb5 -lhx509 -lcrypto -lasn1 \
- -lcom_err ${LIBVERS} -lroken -lcrypt -lutil
-DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
- ${LIBCOM_ERR} ${LIBVERS} ${LIBROKEN} ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lhdb -lutil
+DPADD+= ${LIBHDB} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile:1.1 Wed Apr 13 19:16:58 2011
+++ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:58 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -12,12 +12,10 @@
CPPFLAGS+= -I${DESTDIR}/usr/include/kadm5
-LDADD+= -lkadm5srv -lhdb -lkrb5 -lhx509 -lcrypto \
- -lasn1 -lsl -lcom_err ${LIBVERS} \
- -lroken -lcrypt -ledit -lterminfo
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} \
- ${LIBASN1} ${LIBSL} ${LIBCOM_ERR} ${LIBVERS} \
- ${LIBROKEN} ${LIBCRYPT} ${LIBEDIT} ${LIBTERMINFO}
+LDADD+= -lkadm5srv -lhdb -lsl
+LDADD+= -ledit -lterminfo
+DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBSL}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile:1.1 Wed Apr 13 19:16:59 2011
+++ src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:59 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -39,10 +39,10 @@
-I${HEIMBASE}/lib/libwind \
-I${DESTDIR}/usr/include/kadm5
-LDADD+= -lkadm5srv -lkadm5clnt -lkrb5 -lsl -ledit ${LIBVERS} -lroken -lutil
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} \
- ${LIBASN1} ${LIBCOM_ERR} ${LIBSL} ${LIBEDIT} ${LIBTERMINFO} \
- ${LIBVERS} ${LIBROKEN} ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lkadm5srv -lhdb -lkadm5clnt -lsl
+LDADD+= -lutil -ledit -lterminfo
+DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKADM5CLNT} ${LIBSL}
+DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/kcm/Makefile:1.1 Wed Apr 13 19:16:59 2011
+++ src/crypto/external/bsd/heimdal/sbin/kcm/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:59 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -27,10 +27,8 @@
CPPFLAGS+= -I${HEIMDIST}/lib/ipc
-LDADD+= -lkafs -lkrb5 -lheimntlm -lhx509 -lcrypto -lasn1 -lcom_err \
- ${LIBIPC_PIC} ${LIBVERS} -lroken -lcrypt -lutil
-DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
- ${LIBCOM_ERR} ${LIBVERS} ${LIBROKEN} ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lkafs -lheimntlm -lutil
+DPADD+= ${LIBKAFS} ${LIBHEIMNTLM} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/kdc/Makefile:1.1 Wed Apr 13 19:16:59 2011
+++ src/crypto/external/bsd/heimdal/sbin/kdc/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:59 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -18,12 +18,8 @@
-I${HEIMDIST}/lib/krb5 \
-I${HEIMBASE}/include/krb5 \
-LDADD+= -lkdc ${LIBVERS}
-#LDADD+= -lkdc -lhdb -lkrb5 -lhx509 -lheimntlm -lcrypto -lasn1 -lcom_err \
-# -lroken -lcrypt -lutil ${LIBVERS}
-DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBCRYPTO} \
- ${LIBASN1} ${LIBCOM_ERR} ${LIBVERS} ${LIBROKEN} \
- ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lkdc -lhdb -lheimntlm -lutil
+DPADD+= ${LIBKDC} ${LIBHDB} ${LIBHEIMNTLM} ${LIBUTIL}
MAN= kdc.8
Index: src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.1 Wed Apr 13 19:16:59 2011
+++ src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:59 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,11 +11,8 @@
HEIMSRCS+= kdigest.c kdigest-commands.in
-LDADD+= -lkrb5 -lhx509 -lheimntlm -lcrypto -lasn1 -lcom_err -lsl \
- ${LIBVERS} -lroken -lcrypt -lutil -ledit -lterminfo
-DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBCRYPTO} ${LIBASN1} \
- ${LIBCOM_ERR} ${LIBSL} ${LIBVERS} ${LIBROKEN} ${LIBCRYPT} \
- ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
+LDADD+= -lheimntlm -lsl -lutil -ledit -lterminfo
+DPADD+= ${LIBHEIMNTLM} ${LIBSL} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile:1.1 Wed Apr 13 19:17:00 2011
+++ src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:17:00 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -9,10 +9,8 @@
SRCS= kimpersonate.c
MAN= kimpersonate.8
-LDADD+= -lkafs -lkrb5 -lhx509 -lheimntlm -lcrypto \
- -lasn1 -lcom_err ${LIBVERS} -lroken -lcrypt
-DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBCRYPTO} \
- ${LIBASN1} ${LIBCOM_ERR} ${LIBVERS} ${LIBROKEN} ${LIBCRYPT}
+LDADD+= -lkafs -lheimntlm
+DPADD+= ${LIBKAFS} ${LIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/kstash/Makefile:1.1 Wed Apr 13 19:17:00 2011
+++ src/crypto/external/bsd/heimdal/sbin/kstash/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:17:00 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -21,8 +21,8 @@
# -I${HEIMBASE}/lib/libwind \
# -DHAVE_CONFIG_H
-LDADD+= -lhdb -lkrb5 ${LIBVERS}
-DPADD+= ${LIBKRB5} ${LIBHDB} ${LIBVERS}
+LDADD+= -lhdb
+DPADD+= ${LIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.1 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.2
--- src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile:1.1 Wed Apr 13 19:17:00 2011
+++ src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile Wed May 25 19:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:17:00 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -26,10 +26,8 @@
remove.c \
rename.c
-LDADD+= -lkadm5clnt -lkrb5 -lsl ${LIBVERS} -lroken -lutil
-DPADD+= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBCRYPTO} \
- ${LIBASN1} ${LIBCOM_ERR} ${LIBSL} ${LIBEDIT} ${LIBTERMINFO} \
- ${LIBVERS} ${LIBROKEN} ${LIBCRYPT} ${LIBUTIL}
+LDADD+= -lkadm5clnt -lsl -ledit -lterminfo -lutil
+DPADD+= ${LIBKADM5CLNT} ${LIBSL} ${LIBEDIT} ${LIBTERMINFO} ${LIBUTIL}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
