Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@.
This commit is contained in:
he 2011-05-25 19:21:16 +00:00
parent 3f383b9dd4
commit 6cf367a4a1
33 changed files with 137 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/external/bsd/heimdal/bin/Makefile.inc vendored
View File

@ -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}

10
crypto/external/bsd/heimdal/bin/gsstool/Makefile vendored
View File

@ -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 @@ HEIMSRCS= gsstool.c gss-commands.in
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>

10
crypto/external/bsd/heimdal/bin/hxtool/Makefile vendored
View File

@ -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 @@ HEIMSRCS= hxtool.c hxtool-commands.in
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>

8
crypto/external/bsd/heimdal/bin/kcc/Makefile vendored
View File

@ -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 @@ SRCS= copy_cred_cache.c \
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>

6
crypto/external/bsd/heimdal/bin/kdestroy/Makefile vendored
View File

@ -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 @@ USE_FORT?= yes # cryptographic software
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>

6
crypto/external/bsd/heimdal/bin/kgetcred/Makefile vendored
View File

@ -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 @@ USE_FORT?= yes # cryptographic software
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>

6
crypto/external/bsd/heimdal/bin/kinit/Makefile vendored
View File

@ -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 @@ SRCS= kinit.c
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>

6
crypto/external/bsd/heimdal/bin/kpasswd/Makefile vendored
View File

@ -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 @@ USE_FORT?= yes # cryptographic software
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>

5
crypto/external/bsd/heimdal/bin/string2key/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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>

7
crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile vendored
View File

@ -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 @@ SRCS= verify_krb5_conf.c
# -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>

10
crypto/external/bsd/heimdal/dist/lib/hx509/sel.h vendored
View File

@ -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 @@ struct hx_expr_input {
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);

9
crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map vendored
View File

@ -760,6 +760,15 @@ HEIMDAL_KRB5_2.0 {
_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;

3
crypto/external/bsd/heimdal/lib/Makefile vendored
View File

@ -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 @@ SUBDIR = \
libwind \
.WAIT \
libhx509 \
libipc \
.WAIT \
libkrb5 \
.WAIT \

4
crypto/external/bsd/heimdal/lib/libhdb/Makefile vendored
View File

@ -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 @@ LIBDPLIBS+= hx509 ${HEIMBASE}/lib/libhx509 \
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase
LDADD+= ${LIBIPC_PIC}
HEIMSRCS= hdb_err.et hdb.asn1
SRCS= \

4
crypto/external/bsd/heimdal/lib/libhx509/Makefile vendored
View File

@ -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 @@ SRCS= \
softp11.c \
${BUILT_SOURCES}
LPREFIX= _hx509_sel_yy
CPPFLAGS+= \
-I${HEIMDIST}/lib/hx509/ref \
-I${HEIMDIST}/lib/asn1

8
crypto/external/bsd/heimdal/lib/libkrb5/Makefile vendored
View File

@ -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 @@ LIBDPLIBS+= hx509 ${HEIMBASE}/lib/libhx509 \
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 @@ SRCS= \
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 \

12
crypto/external/bsd/heimdal/libexec/Makefile.inc vendored
View File

@ -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}

8
crypto/external/bsd/heimdal/libexec/digest-service/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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>

10
crypto/external/bsd/heimdal/libexec/hpropd/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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>

10
crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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>

10
crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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>

10
crypto/external/bsd/heimdal/libexec/kadmind/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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>

12
crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile vendored
View File

@ -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 @@ MAN= kpasswdd.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>

10
crypto/external/bsd/heimdal/sbin/Makefile.inc vendored
View File

@ -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}

8
crypto/external/bsd/heimdal/sbin/hprop/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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>

12
crypto/external/bsd/heimdal/sbin/iprop-log/Makefile vendored
View File

@ -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 @@ HEIMSRCS= iprop-log.c iprop-commands.in
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>

10
crypto/external/bsd/heimdal/sbin/kadmin/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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>

8
crypto/external/bsd/heimdal/sbin/kcm/Makefile vendored
View File

@ -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 @@ SRCS= \
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>

10
crypto/external/bsd/heimdal/sbin/kdc/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= \
-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

9
crypto/external/bsd/heimdal/sbin/kdigest/Makefile vendored
View File

@ -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 @@ MAN=
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>

8
crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile vendored
View File

@ -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 @@ PROG= kimpersonate
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>

6
crypto/external/bsd/heimdal/sbin/kstash/Makefile vendored
View File

@ -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 @@ CPPFLAGS+= -I${HEIMDIST}/lib/krb5 -I${DESTDIR}/usr/include/krb5
# -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>

8
crypto/external/bsd/heimdal/sbin/ktutil/Makefile vendored
View File

@ -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 @@ SRCS= \
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>