From de347b311fb2ac8a5e51a1d831d48da1ce473eff Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 3 Aug 2003 16:45:17 +0000 Subject: [PATCH] Remove NOSECURE which no longer serves a purpose. Note: FreeBSD also removed NOSECURE. Submitted-by: Jeroen Ruigrok/asmodai --- Makefile.inc1 | 7 +++---- bin/ed/Makefile | 4 ++-- etc/defaults/make.conf | 3 +-- lib/Makefile | 4 ++-- lib/libcrypt/Makefile | 4 ++-- lib/libfetch/Makefile | 4 ++-- lib/libpam/modules/pam_kerberosIV/Makefile | 4 +--- libexec/Makefile | 4 ++-- release/picobsd/dial/crunch.conf | 4 ++-- release/picobsd/isp/crunch.conf | 4 ++-- release/picobsd/net/crunch.conf | 4 ++-- release/picobsd/router/crunch.conf | 4 ++-- share/man/man5/make.conf.5 | 7 +------ usr.bin/Makefile | 4 ++-- usr.bin/fetch/Makefile | 4 ++-- usr.sbin/pkg_install/Makefile | 4 ++-- usr.sbin/pkg_install/add/Makefile | 4 ++-- usr.sbin/pkg_install/create/Makefile | 4 ++-- usr.sbin/pkg_install/delete/Makefile | 4 ++-- usr.sbin/pkg_install/info/Makefile | 4 ++-- usr.sbin/ppp/Makefile | 5 ++--- usr.sbin/pppd/Makefile | 4 ++-- usr.sbin/sendmail/Makefile | 5 ++--- usr.sbin/tcpdump/tcpdump/Makefile | 6 +++--- 24 files changed, 47 insertions(+), 58 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 92293c9271..61ea5cd5ac 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.2 2003/06/17 04:21:10 dillon Exp $ +# $DragonFly: src/Makefile.inc1,v 1.3 2003/08/03 16:45:13 dillon Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -10,7 +10,6 @@ # -DNOCRYPT will prevent building of crypt versions # -DNOMAN do not build the manual pages # -DNOPROFILE do not build profiled libraries -# -DNOSECURE do not go into secure subdir # -DNOGAMES do not go into games subdir # -DNOSHARE do not go into share subdir # -DNOINFO do not make or install info files @@ -78,7 +77,7 @@ SUBDIR+= libexec .if exists(${.CURDIR}/sbin) SUBDIR+= sbin .endif -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) SUBDIR+= secure .endif .if exists(${.CURDIR}/share) && !defined(NOSHARE) @@ -723,7 +722,7 @@ lib/libskey__L: lib/libcrypt__L lib/libmd__L _generic_libs+= lib -.if !defined(NOCRYPT) && !defined(NOSECURE) +.if !defined(NOCRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl .if !defined(NO_OPENSSH) diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 36ed9ba39b..06befe3830 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,12 +1,12 @@ # $FreeBSD: src/bin/ed/Makefile,v 1.18.2.1 2001/12/13 09:58:12 ru Exp $ -# $DragonFly: src/bin/ed/Makefile,v 1.2 2003/06/17 04:22:49 dillon Exp $ +# $DragonFly: src/bin/ed/Makefile,v 1.3 2003/08/03 16:45:14 dillon Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES DPADD= ${LIBCIPHER} diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index d38e0b6275..d5b0d0fa6e 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $ -# $DragonFly: src/etc/defaults/make.conf,v 1.3 2003/06/17 05:14:59 dillon Exp $ +# $DragonFly: src/etc/defaults/make.conf,v 1.4 2003/08/03 16:45:14 dillon Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -110,7 +110,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ #NOMAN= true # do not build manual pages #NOPERL= true # do not build perl. Disables OpenSSL optimizations #NOPROFILE= true # Avoid compiling profiled libraries -#NOSECURE= true # do not build crypto code in secure/ subdir #NOSHARE= true # do not go into the share subdir # # To build sys/modules when building the world (our old way of doing things) diff --git a/lib/Makefile b/lib/Makefile index 5837c7b46e..ce1791e8d0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/Makefile,v 1.107.2.16 2002/10/10 19:24:35 kbyanc Exp $ -# $DragonFly: src/lib/Makefile,v 1.2 2003/06/17 04:26:38 dillon Exp $ +# $DragonFly: src/lib/Makefile,v 1.3 2003/08/03 16:45:15 dillon Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -66,7 +66,7 @@ _compat= compat .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \ - defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4)) + defined(NOCRYPT) || !defined(MAKE_KERBEROS4) _libtelnet= libtelnet .endif diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 77d92ca0b3..d0235f9495 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -1,6 +1,6 @@ # # $FreeBSD: src/lib/libcrypt/Makefile,v 1.24.2.4 2001/07/16 03:28:26 peter Exp $ -# $DragonFly: src/lib/libcrypt/Makefile,v 1.2 2003/06/17 04:26:49 dillon Exp $ +# $DragonFly: src/lib/libcrypt/Makefile,v 1.3 2003/08/03 16:45:15 dillon Exp $ # SHLIB_MAJOR= 2 @@ -14,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil CFLAGS+= -DLIBC_SCCS -Wall # Pull in the crypt-des.c source, assuming it is present. .if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \ - !defined(NOSECURE) && !defined(NOCRYPT) + !defined(NOCRYPT) .PATH: ${.CURDIR}/../../secure/lib/libcrypt SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index df83385062..a7cded5eef 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libfetch/Makefile,v 1.14.2.5 2003/01/09 11:50:32 des Exp $ -# $DragonFly: src/lib/libfetch/Makefile,v 1.2 2003/06/17 04:26:49 dillon Exp $ +# $DragonFly: src/lib/libfetch/Makefile,v 1.3 2003/08/03 16:45:15 dillon Exp $ MAINTAINER= des@freebsd.org LIB= fetch @@ -12,7 +12,7 @@ INCS= fetch.h MAN= fetch.3 CLEANFILES= ftperr.h httperr.h -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto diff --git a/lib/libpam/modules/pam_kerberosIV/Makefile b/lib/libpam/modules/pam_kerberosIV/Makefile index f782022f48..25f64f7110 100644 --- a/lib/libpam/modules/pam_kerberosIV/Makefile +++ b/lib/libpam/modules/pam_kerberosIV/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # # $FreeBSD: src/lib/libpam/modules/pam_kerberosIV/Makefile,v 1.5.2.4 2002/07/03 21:41:29 des Exp $ -# $DragonFly: src/lib/libpam/modules/pam_kerberosIV/Attic/Makefile,v 1.2 2003/06/17 04:26:50 dillon Exp $ +# $DragonFly: src/lib/libpam/modules/pam_kerberosIV/Attic/Makefile,v 1.3 2003/08/03 16:45:15 dillon Exp $ LIB= pam_kerberosIV @@ -34,10 +34,8 @@ CFLAGS+= -I${.CURDIR}/../../libpam CFLAGS+= -DKERBEROS DPADD+= ${LIBKRB} LDADD+= -lkrb -.if !defined(NOSECURE) DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto -.endif DPADD+= ${LIBCOM_ERR} LDADD+= -lcom_err diff --git a/libexec/Makefile b/libexec/Makefile index e09a8cf668..530998e6e8 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/libexec/Makefile,v 1.42.2.5 2002/11/12 17:32:48 obrien Exp $ -# $DragonFly: src/libexec/Makefile,v 1.3 2003/06/17 05:15:10 dillon Exp $ +# $DragonFly: src/libexec/Makefile,v 1.4 2003/08/03 16:45:15 dillon Exp $ # Present but disabled: kpasswdd SUBDIR= atrun \ @@ -47,7 +47,7 @@ SUBDIR+=rtld-elf .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \ - defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4)) + defined(NOCRYPT) || !defined(MAKE_KERBEROS4) # make release needs both SUBDIR+=telnetd .endif diff --git a/release/picobsd/dial/crunch.conf b/release/picobsd/dial/crunch.conf index 32d3531c96..85867dda56 100644 --- a/release/picobsd/dial/crunch.conf +++ b/release/picobsd/dial/crunch.conf @@ -1,11 +1,11 @@ # $FreeBSD: src/release/picobsd/dial/crunch.conf,v 1.1.2.4 2002/04/19 12:42:51 ru Exp $ -# $DragonFly: src/release/picobsd/dial/Attic/crunch.conf,v 1.2 2003/06/17 04:27:20 dillon Exp $ +# $DragonFly: src/release/picobsd/dial/Attic/crunch.conf,v 1.3 2003/08/03 16:45:15 dillon Exp $ # # NOTE1: the string "/usr/src" will be automatically replaced with the # correct value set in 'build' script - you should change it there # Default build options -buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC +buildopts -DNOPAM -DRELEASE_CRUNCH -DNOCRYPT -DNONETGRAPH -DNOIPSEC # other sources srcdirs /usr/src/bin diff --git a/release/picobsd/isp/crunch.conf b/release/picobsd/isp/crunch.conf index d8320b8580..a0eba1344b 100644 --- a/release/picobsd/isp/crunch.conf +++ b/release/picobsd/isp/crunch.conf @@ -1,12 +1,12 @@ # # $FreeBSD: src/release/picobsd/isp/crunch.conf,v 1.1.2.4 2002/04/19 12:42:51 ru Exp $ -# $DragonFly: src/release/picobsd/isp/Attic/crunch.conf,v 1.2 2003/06/17 04:27:20 dillon Exp $ +# $DragonFly: src/release/picobsd/isp/Attic/crunch.conf,v 1.3 2003/08/03 16:45:15 dillon Exp $ # # NOTE: the string "/usr/src" will be automatically replaced with the # correct value set in 'build' script - you should change it there # Default build options -buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC +buildopts -DNOPAM -DRELEASE_CRUNCH -DNOCRYPT -DNONETGRAPH -DNOIPSEC # other sources srcdirs /usr/src/bin diff --git a/release/picobsd/net/crunch.conf b/release/picobsd/net/crunch.conf index 4aab26034c..25c71a0846 100644 --- a/release/picobsd/net/crunch.conf +++ b/release/picobsd/net/crunch.conf @@ -1,12 +1,12 @@ # # $FreeBSD: src/release/picobsd/net/crunch.conf,v 1.1.2.4 2002/04/19 12:42:51 ru Exp $ -# $DragonFly: src/release/picobsd/net/Attic/crunch.conf,v 1.2 2003/06/17 04:27:20 dillon Exp $ +# $DragonFly: src/release/picobsd/net/Attic/crunch.conf,v 1.3 2003/08/03 16:45:15 dillon Exp $ # # NOTE: the string "/usr/src" will be automatically replaced with the # correct value set in 'build' script - you should change it there # Default build options. -buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC +buildopts -DNOPAM -DRELEASE_CRUNCH -DNOCRYPT -DNONETGRAPH -DNOIPSEC # other sources srcdirs /usr/src/bin diff --git a/release/picobsd/router/crunch.conf b/release/picobsd/router/crunch.conf index 1a3f2a542c..801ace5950 100644 --- a/release/picobsd/router/crunch.conf +++ b/release/picobsd/router/crunch.conf @@ -1,11 +1,11 @@ # $FreeBSD: src/release/picobsd/router/crunch.conf,v 1.1.2.3 2002/04/19 12:42:51 ru Exp $ -# $DragonFly: src/release/picobsd/router/Attic/crunch.conf,v 1.2 2003/06/17 04:27:20 dillon Exp $ +# $DragonFly: src/release/picobsd/router/Attic/crunch.conf,v 1.3 2003/08/03 16:45:15 dillon Exp $ # # NOTE: the string "/usr/src" will be automatically replaced with the # correct value set in 'build' script - you should change it there # Default build options -buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC +buildopts -DNOPAM -DRELEASE_CRUNCH -DNOCRYPT -DNONETGRAPH -DNOIPSEC # other sources srcdirs /usr/src/bin diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 20efbd067a..f94c32a896 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ -.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.3 2003/06/17 05:15:13 dillon Exp $ +.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.4 2003/08/03 16:45:15 dillon Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -546,11 +546,6 @@ Set to avoid building .It Va NOPROFILE .Pq Vt bool Set to avoid compiling profiled libraries. -.It Va NOSECURE -.Pq Vt bool -set to not build crypto code in -.Pa secure -subdir. .It Va NOSHARE .Pq Vt bool Set to not build in the diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 4c286b8be7..ae3e95d337 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,6 +1,6 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD: src/usr.bin/Makefile,v 1.144.2.17 2003/01/04 17:17:07 obrien Exp $ -# $DragonFly: src/usr.bin/Makefile,v 1.3 2003/07/29 00:29:07 rob Exp $ +# $DragonFly: src/usr.bin/Makefile,v 1.4 2003/08/03 16:45:16 dillon Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -208,7 +208,7 @@ SUBDIR= alias \ .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../kerberosIV) && !exists(${.CURDIR}/../secure)) || \ - defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4)) + defined(NOCRYPT) || !defined(MAKE_KERBEROS4) # Releases need both this non-crypt telnet and the crypt telnet. SUBDIR+=telnet .endif diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index cb2e6dce91..810cc7cd73 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -1,12 +1,12 @@ # $FreeBSD: src/usr.bin/fetch/Makefile,v 1.3.6.4 2003/01/09 11:54:58 des Exp $ -# $DragonFly: src/usr.bin/fetch/Makefile,v 1.2 2003/06/17 04:29:26 dillon Exp $ +# $DragonFly: src/usr.bin/fetch/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ MAINTAINER= des@freebsd.org PROG= fetch WARNS?= 2 DPADD= ${LIBFETCH} LDADD= -lfetch -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBCRYPTO} ${LIBSSL} LDADD+= -lcrypto -lssl .endif diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile index 7dfbbcf668..ef173b7681 100644 --- a/usr.sbin/pkg_install/Makefile +++ b/usr.sbin/pkg_install/Makefile @@ -1,9 +1,9 @@ # $FreeBSD: src/usr.sbin/pkg_install/Makefile,v 1.5.2.7 2003/01/09 12:05:52 des Exp $ -# $DragonFly: src/usr.sbin/pkg_install/Attic/Makefile,v 1.2 2003/06/17 04:29:59 dillon Exp $ +# $DragonFly: src/usr.sbin/pkg_install/Attic/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ SUBDIR= lib add create delete info update version -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION= crypto SUBDIR+= sign .endif diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index 94614b4d31..ba1f6e4518 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.11.2.4 2003/01/09 12:05:53 des Exp $ -# $DragonFly: src/usr.sbin/pkg_install/add/Attic/Makefile,v 1.2 2003/06/17 04:29:59 dillon Exp $ +# $DragonFly: src/usr.sbin/pkg_install/add/Attic/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ PROG= pkg_add SRCS= main.c perform.c futil.c extract.c @@ -11,7 +11,7 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile index 8382215d09..4d21d79c56 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/pkg_install/create/Makefile,v 1.11.2.3 2003/01/09 12:05:53 des Exp $ -# $DragonFly: src/usr.sbin/pkg_install/create/Attic/Makefile,v 1.2 2003/06/17 04:29:59 dillon Exp $ +# $DragonFly: src/usr.sbin/pkg_install/create/Attic/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ PROG= pkg_create @@ -10,7 +10,7 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile index 5db45779d5..89a250628d 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/pkg_install/delete/Makefile,v 1.11.2.4 2003/01/09 12:05:53 des Exp $ -# $DragonFly: src/usr.sbin/pkg_install/delete/Attic/Makefile,v 1.2 2003/06/17 04:29:59 dillon Exp $ +# $DragonFly: src/usr.sbin/pkg_install/delete/Attic/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ PROG= pkg_delete SRCS= main.c perform.c @@ -11,7 +11,7 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile index 0edf350585..2c7b8a60f7 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/pkg_install/info/Makefile,v 1.11.2.4 2003/01/09 12:05:53 des Exp $ -# $DragonFly: src/usr.sbin/pkg_install/info/Attic/Makefile,v 1.2 2003/06/17 04:29:59 dillon Exp $ +# $DragonFly: src/usr.sbin/pkg_install/info/Attic/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ PROG= pkg_info SRCS= main.c perform.c show.c @@ -11,7 +11,7 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 9cdb5db679..40e8959637 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/ppp/Makefile,v 1.73.2.8 2002/09/01 02:12:22 brian Exp $ -# $DragonFly: src/usr.sbin/ppp/Makefile,v 1.2 2003/06/17 04:30:00 dillon Exp $ +# $DragonFly: src/usr.sbin/ppp/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ PROG= ppp MAN= ppp.8 @@ -16,7 +16,6 @@ NOI4B= true NONAT= true NOKLDLOAD= true NORADIUS= true -NOSECURE= true NOSUID= true .endif @@ -71,7 +70,7 @@ CFLAGS+=-DNOSUID SRCS+= id.c .endif -.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NOSECURE) || defined(NO_OPENSSL) || defined(NODES) +.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES) CFLAGS+=-DNODES .else DISTRIBUTION=crypto diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index 50424c7b54..1cd488a9c0 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.19.2.2 2001/08/19 03:32:43 kris Exp $ -# $DragonFly: src/usr.sbin/pppd/Makefile,v 1.2 2003/06/17 04:30:01 dillon Exp $ +# $DragonFly: src/usr.sbin/pppd/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ CFLAGS+= -DHAVE_PATHS_H @@ -31,7 +31,7 @@ LDADD+= -lpcap DPADD+= ${LIBPCAP} # MS-CHAP support. Requires the DES library. -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto CFLAGS+=-DCHAPMS SRCS+= chap_ms.c diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 82721458d0..4a85ab4361 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.8 (Berkeley) 3/28/97 # $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.15.2.13 2002/03/25 21:32:29 gshapiro Exp $ -# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.2 2003/06/17 04:30:03 dillon Exp $ +# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.3 2003/08/03 16:45:16 dillon Exp $ MAINTAINER= gshapiro@FreeBSD.org @@ -60,8 +60,7 @@ SRCS+= sm_os.h CLEANFILES+=sm_os.h .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && \ - !defined(NOSECURE) && !defined(NO_OPENSSL) && \ - !defined(RELEASE_CRUNCH) + !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) # STARTTLS support DISTRIBUTION= crypto CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index edccb017d6..deedf97e31 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.25.2.6 2002/07/05 11:30:32 fenner Exp $ -# $DragonFly: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.2 2003/06/17 04:30:03 dillon Exp $ +# $DragonFly: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.3 2003/08/03 16:45:17 dillon Exp $ TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump @@ -41,8 +41,8 @@ CFLAGS+= -DLBL_ALIGN DPADD= ${LIBL} ${LIBPCAP} LDADD= -ll -lpcap -.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \ - !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && \ + !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto -- 2.41.0