diff options
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/ntp/Makefile.inc | 2 | ||||
-rw-r--r-- | usr.sbin/ntp/ntp-keygen/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/ntp/ntpd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pkg_install/Makefile.inc | 2 | ||||
-rw-r--r-- | usr.sbin/ppp/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pppd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/sendmail/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpdump/Makefile | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 39ab303..162fb97 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -193,7 +193,7 @@ _atm= atm .endif .if !defined(NO_BIND) -.if !defined(NO_BIND_DNSSEC) && !defined(NOCRYPT) +.if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT) _dnssec-keygen= dnssec-keygen _dnssec-signzone= dnssec-signzone .endif @@ -211,7 +211,7 @@ _rndc-confgen= rndc-confgen _bluetooth= bluetooth .endif -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) _keyserv= keyserv .endif diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index 4b931a8..845d28a 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -8,7 +8,7 @@ NTPDEFS= -DSYS_FREEBSD # -DMX4200 -DNMEA -DBOEDER CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) CFLAGS+= -DOPENSSL .endif diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index 540c851..f3fa451 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -12,7 +12,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ DPADD= ${LIBNTP} LDADD= ${LIBNTP} -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DPADD+= ${LIBMD} ${LIBCRYPTO} LDADD+= -lmd -lcrypto .endif diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index c906583..5b3fdba 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -31,7 +31,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto .endif diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile index ee4019b..e74b5dc 100644 --- a/usr.sbin/pkg_install/Makefile +++ b/usr.sbin/pkg_install/Makefile @@ -2,7 +2,7 @@ SUBDIR= lib add create delete info ${_sign} version -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) _sign= sign .endif diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc index 89c2593..46518b9 100644 --- a/usr.sbin/pkg_install/Makefile.inc +++ b/usr.sbin/pkg_install/Makefile.inc @@ -6,7 +6,7 @@ LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a LIBINSTALL= ${.CURDIR}/../lib/libinstall.a .endif -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && \ +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \ defined(LDADD) && ${LDADD:M-lfetch} != "" DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 9b0ad57..370d057 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -72,7 +72,7 @@ CFLAGS+=-DNOSUID SRCS+= id.c .endif -.if defined(RELEASE_CRUNCH) || defined(NOCRYPT) || defined(NO_OPENSSL) +.if defined(RELEASE_CRUNCH) || defined(NO_CRYPT) || defined(NO_OPENSSL) CFLAGS+=-DNODES .else SRCS+= chap_ms.c mppe.c diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index e2f4bd8..c7b6174 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -30,7 +30,7 @@ DPADD+= ${LIBPCAP} LDADD+= -lpcap # MS-CHAP support. Requires the DES library. -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) CFLAGS+= -DCHAPMS SRCS+= chap_ms.c LDADD+= -lcrypto diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 4226a72..4b2dc72 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -63,7 +63,7 @@ LDADD+= ${LIBSMUTIL} ${LIBSM} SRCS+= sm_os.h CLEANFILES+=sm_os.h -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) # STARTTLS support CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL DPADD+= ${LIBSSL} ${LIBCRYPTO} diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 1117f17a..95d7431 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -42,7 +42,7 @@ CFLAGS+= -DLBL_ALIGN DPADD= ${LIBL} ${LIBPCAP} LDADD= -ll -lpcap -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H |