diff options
-rw-r--r-- | secure/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/pkg_install/Makefile.inc | 7 | ||||
-rw-r--r-- | usr.sbin/pkg_install/add/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/pkg_install/create/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/pkg_install/delete/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/pkg_install/info/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/pkg_install/sign/Makefile | 1 | ||||
-rw-r--r-- | usr.sbin/pkg_install/version/Makefile | 5 |
9 files changed, 11 insertions, 29 deletions
diff --git a/secure/Makefile b/secure/Makefile index b168391..2ee6067 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -4,7 +4,7 @@ SUBDIR= lib libexec usr.bin usr.sbin # These are programs which depend on crypto, but not Kerberos. SPROGS= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \ - lib/libfetch usr.bin/fetch \ + lib/libfetch usr.bin/fetch usr.sbin/pkg_install \ lib/libtelnet libexec/telnetd usr.bin/telnet .if !defined(NO_SENDMAIL) SPROGS+=usr.sbin/sendmail diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile index f93fadb..ee4019b 100644 --- a/usr.sbin/pkg_install/Makefile +++ b/usr.sbin/pkg_install/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ -SUBDIR= lib add create delete info version +SUBDIR= lib add create delete info ${_sign} version .if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION= crypto -SUBDIR+= sign +_sign= sign .endif .include <bsd.subdir.mk> diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc index 6dc305d..e6715ce 100644 --- a/usr.sbin/pkg_install/Makefile.inc +++ b/usr.sbin/pkg_install/Makefile.inc @@ -6,6 +6,13 @@ LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a LIBINSTALL= ${.CURDIR}/../lib/libinstall.a .endif +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && \ + defined(LDADD) && ${LDADD:M-lfetch} != "" +DISTRIBUTION= crypto +DPADD+= ${LIBSSL} ${LIBCRYPTO} +LDADD+= -lssl -lcrypto +.endif + # Inherit BINDIR from one level up. .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index 55c5388..b72511a 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -10,9 +10,4 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto -.endif - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile index e6c252b..5919769 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -10,9 +10,4 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBMD} LDADD= ${LIBINSTALL} -lmd -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto -.endif - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile index 39bd1f4..5c19dba 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -10,9 +10,4 @@ WARNS?= 4 DPADD= ${LIBINSTALL} ${LIBMD} LDADD= ${LIBINSTALL} -lmd -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto -.endif - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile index 76f9864..bc90013 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -10,9 +10,4 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto -.endif - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/sign/Makefile b/usr.sbin/pkg_install/sign/Makefile index a7b354c..a848441 100644 --- a/usr.sbin/pkg_install/sign/Makefile +++ b/usr.sbin/pkg_install/sign/Makefile @@ -7,6 +7,7 @@ MLINKS= pkg_sign.1 pkg_check.1 SRCS= main.c check.c common.c gzip.c pgp_check.c pgp_sign.c \ sha1.c sign.c stand.c x509.c +DISTRIBUTION= crypto DPADD= ${LIBINSTALL} ${LIBCRYPTO} LDADD= ${LIBINSTALL} -lcrypto diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile index 8a80e49..b097a3a 100644 --- a/usr.sbin/pkg_install/version/Makefile +++ b/usr.sbin/pkg_install/version/Makefile @@ -10,11 +10,6 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto -.endif - test: ./test-pkg_version.sh |