Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.602
diff -u -r1.602 bsd.port.mk
--- Mk/bsd.port.mk 21 Aug 2008 06:16:11 -0000 1.602
+++ Mk/bsd.port.mk 21 Aug 2008 10:10:53 -0000
@@ -1440,10 +1440,6 @@
.include "${PORTSDIR}/Mk/bsd.local.mk"
.endif
-.if defined(USE_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-.endif
-
.if defined(USE_EMACS)
.include "${PORTSDIR}/Mk/bsd.emacs.mk"
.endif
@@ -1957,6 +1953,10 @@
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
.endif
+.if defined(USE_OPENSSL)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.endif
+
.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
.include "${PORTSDIR}/Mk/bsd.qt.mk"
.endif
Index: Mk/bsd.openssl.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.openssl.mk,v
retrieving revision 1.39
diff -u -r1.39 bsd.openssl.mk
--- Mk/bsd.openssl.mk 5 Aug 2008 09:33:07 -0000 1.39
+++ Mk/bsd.openssl.mk 21 Aug 2008 10:10:53 -0000
@@ -33,8 +33,12 @@
# BUILD_DEPENDS - are added if needed
# RUN_DEPENDS - are added if needed
+.if !defined(_OPENSSLMKINCLUDED)
+
OpenSSL_Include_MAINTAINER= dinoex@FreeBSD.org
+_OPENSSLMKINCLUDED= yes
+
# honor obsolete options for a bit
.if defined(USE_OPENSSL_BASE) && !defined(WITH_OPENSSL_BASE)
WITH_OPENSSL_BASE=yes
@@ -171,3 +175,4 @@
### crypto
#RESTRICTED= "Contains cryptography."
+.endif
Index: devel/p5-Event-RPC/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-Event-RPC/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- devel/p5-Event-RPC/Makefile 17 Apr 2008 14:25:18 -0000 1.2
+++ devel/p5-Event-RPC/Makefile 21 Aug 2008 10:10:53 -0000
@@ -44,8 +44,7 @@
.endif
.if !defined(WITHOUT_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
BUILD_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
.endif
Index: devel/libopkele/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/libopkele/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- devel/libopkele/Makefile 23 Jul 2008 00:55:49 -0000 1.5
+++ devel/libopkele/Makefile 21 Aug 2008 10:10:53 -0000
@@ -38,7 +38,6 @@
.if ${OSVERSION} < 700000
WITH_OPENSSL_PORT= yes
.endif
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
# If we use the base OpenSSL either by default or
# by design, we need to remove the openssl dependency
Index: dns/opendd/Makefile
===================================================================
RCS file: /home/pcvs/ports/dns/opendd/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- dns/opendd/Makefile 27 Apr 2008 05:21:19 -0000 1.3
+++ dns/opendd/Makefile 21 Aug 2008 10:10:53 -0000
@@ -31,7 +31,7 @@
.endif
.if defined(WITH_OPENDD_SSL) && !defined(WITHOUT_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_SSL= yes
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
MAKE_ENV+= "USE_SOCKET_SSL=yes"
Index: ftp/curl/Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/Makefile,v
retrieving revision 1.94
diff -u -r1.94 Makefile
--- ftp/curl/Makefile 21 Aug 2008 06:17:00 -0000 1.94
+++ ftp/curl/Makefile 21 Aug 2008 10:10:53 -0000
@@ -90,7 +90,7 @@
.endif
.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_SSL= yes
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
.else
CONFIGURE_ARGS+= --without-ssl
Index: ftp/lftp/Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/lftp/Makefile,v
retrieving revision 1.126
diff -u -r1.126 Makefile
--- ftp/lftp/Makefile 6 Jun 2008 13:28:19 -0000 1.126
+++ ftp/lftp/Makefile 21 Aug 2008 10:10:53 -0000
@@ -56,7 +56,7 @@
.endif
.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl
.else
CONFIGURE_ARGS+= --without-openssl
Index: ftp/proftpd/Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/proftpd/Makefile,v
retrieving revision 1.137
diff -u -r1.137 Makefile
--- ftp/proftpd/Makefile 20 Aug 2008 00:56:42 -0000 1.137
+++ ftp/proftpd/Makefile 21 Aug 2008 10:10:53 -0000
@@ -195,7 +195,7 @@
.endif
.if defined(WITH_OPENSSL)
-.include <${PORTSDIR}/Mk/bsd.openssl.mk>
+USE_OPENSSL= yes
CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC}
PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB}
MODULES:=${MODULES}:mod_tls
Index: ftp/vsftpd/Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/vsftpd/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- ftp/vsftpd/Makefile 30 Jul 2008 14:09:34 -0000 1.33
+++ ftp/vsftpd/Makefile 21 Aug 2008 10:10:53 -0000
@@ -36,7 +36,7 @@
.if ${OSVERSION} < 700000
WITH_OPENSSL_PORT= yes
.endif
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
SSL_SUFFIX= -ssl
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
Index: ftp/wget/Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/wget/Makefile,v
retrieving revision 1.88
diff -u -r1.88 Makefile
--- ftp/wget/Makefile 21 Aug 2008 06:17:02 -0000 1.88
+++ ftp/wget/Makefile 21 Aug 2008 10:10:53 -0000
@@ -33,7 +33,7 @@
.if !defined(WITHOUT_GNUTLS)
IGNORE= GNUTLS and OPENSSL are mutually exclusive, enable at most one of them
.endif
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+=--with-ssl
CPPFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
Index: ftp/wzdftpd/Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/wzdftpd/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- ftp/wzdftpd/Makefile 21 Aug 2008 06:17:02 -0000 1.56
+++ ftp/wzdftpd/Makefile 21 Aug 2008 10:10:53 -0000
@@ -60,8 +60,7 @@
.endif
.if defined(WITH_SSL)
-#USE_OPENSSL= yes
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
.else
CONFIGURE_ARGS+= --disable-openssl
.endif
Index: ftp/proftpd-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/proftpd-devel/Makefile,v
retrieving revision 1.140
diff -u -r1.140 Makefile
--- ftp/proftpd-devel/Makefile 20 Aug 2008 00:56:42 -0000 1.140
+++ ftp/proftpd-devel/Makefile 21 Aug 2008 10:10:53 -0000
@@ -217,7 +217,7 @@
.endif
.if defined(WITH_OPENSSL)
-.include <${PORTSDIR}/Mk/bsd.openssl.mk>
+USE_OPENSSL= yes
CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC}
PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB}
MODULES:=${MODULES}:mod_tls
Index: irc/ircd-ratbox/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/ircd-ratbox/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- irc/ircd-ratbox/Makefile 19 Jan 2008 07:00:27 -0000 1.15
+++ irc/ircd-ratbox/Makefile 21 Aug 2008 10:10:53 -0000
@@ -61,7 +61,7 @@
.endif
.if defined(WITH_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-openssl
.else
CONFIGURE_ARGS+= --disable-openssl
Index: irc/ircd-ratbox-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/ircd-ratbox-devel/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- irc/ircd-ratbox-devel/Makefile 16 Aug 2008 22:34:40 -0000 1.14
+++ irc/ircd-ratbox-devel/Makefile 21 Aug 2008 10:10:53 -0000
@@ -63,7 +63,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-openssl
.else
CONFIGURE_ARGS+= --disable-openssl
Index: irc/ircproxy/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/ircproxy/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- irc/ircproxy/Makefile 2 Jan 2008 22:04:48 -0000 1.9
+++ irc/ircproxy/Makefile 21 Aug 2008 10:10:53 -0000
@@ -26,7 +26,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
.else
CONFIGURE_ARGS+= --disable-ssl
.endif
Index: irc/znc/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/znc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- irc/znc/Makefile 20 Jun 2008 18:04:23 -0000 1.3
+++ irc/znc/Makefile 21 Aug 2008 10:10:53 -0000
@@ -33,7 +33,7 @@
.endif
.if defined(WITH_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
PLIST_SUB+= OPENSSL=""
.else
Index: irc/unreal/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/unreal/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- irc/unreal/Makefile 10 Sep 2007 19:00:40 -0000 1.14
+++ irc/unreal/Makefile 21 Aug 2008 10:10:53 -0000
@@ -79,9 +79,8 @@
.endif
.if defined(WITH_SSL)
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.endif
.if defined(WITH_REMOTE)
Index: irc/inspircd/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/inspircd/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- irc/inspircd/Makefile 19 May 2008 07:01:38 -0000 1.9
+++ irc/inspircd/Makefile 21 Aug 2008 10:10:53 -0000
@@ -125,8 +125,7 @@
.endif
.if defined(WITH_OPENSSL) && !defined(WITHOUT_OPENSSL)
-# I'd like to say USE_OPENSSL=yes here but that's not allowed.
-# Failing that maybe?: .include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-openssl
SYMLINK_FILES+= m_ssl_openssl.cpp
PLIST_SUB+= OPENSSL=""
Index: japanese/p5-Mail-SpamAssassin/Makefile
===================================================================
RCS file: /home/pcvs/ports/japanese/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- japanese/p5-Mail-SpamAssassin/Makefile 25 Jul 2008 12:23:59 -0000 1.12
+++ japanese/p5-Mail-SpamAssassin/Makefile 21 Aug 2008 10:10:53 -0000
@@ -77,7 +77,7 @@
.endif
.if !defined(WITHOUT_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
USE_OPENSSL= yes
CFLAGS+= -I${OPENSSLINC}
Index: lang/php4/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/php4/Makefile,v
retrieving revision 1.121
diff -u -r1.121 Makefile
--- lang/php4/Makefile 20 Aug 2008 00:56:52 -0000 1.121
+++ lang/php4/Makefile 21 Aug 2008 10:10:53 -0000
@@ -129,7 +129,7 @@
MAKE_ENV+= LDFLAGS="${LDFLAGS}"
.if defined(WITH_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
--with-openssl-dir=${OPENSSLBASE}
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
Index: mail/libesmtp/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/libesmtp/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- mail/libesmtp/Makefile 21 Aug 2008 06:17:35 -0000 1.41
+++ mail/libesmtp/Makefile 21 Aug 2008 10:10:53 -0000
@@ -39,7 +39,7 @@
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
PLIST_SUB+= NEED_OPENSSL=""
.else
Index: mail/mail-notification/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/mail-notification/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- mail/mail-notification/Makefile 16 Jul 2008 05:48:18 -0000 1.58
+++ mail/mail-notification/Makefile 21 Aug 2008 10:10:53 -0000
@@ -116,8 +116,7 @@
.if defined(WITHOUT_SSL)
JB_CONF_ARGS+= ssl=no
.else
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
.endif
.if defined(WITHOUT_SASL)
JB_CONF_ARGS+= sasl=no
Index: mail/nbsmtp/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/nbsmtp/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- mail/nbsmtp/Makefile 21 Aug 2008 06:17:38 -0000 1.18
+++ mail/nbsmtp/Makefile 21 Aug 2008 10:10:53 -0000
@@ -29,7 +29,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl
.endif
Index: mail/zmailer/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/zmailer/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- mail/zmailer/Makefile 21 Feb 2008 21:19:59 -0000 1.35
+++ mail/zmailer/Makefile 21 Aug 2008 10:10:53 -0000
@@ -26,7 +26,7 @@
.if defined(WITHOUT_SSL)
CONFIGURE_ARGS= --without-openssl
.else
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS= --with-openssl
.endif
Index: mail/p5-Mail-SpamAssassin/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.120
diff -u -r1.120 Makefile
--- mail/p5-Mail-SpamAssassin/Makefile 25 Jul 2008 12:24:01 -0000 1.120
+++ mail/p5-Mail-SpamAssassin/Makefile 21 Aug 2008 10:10:53 -0000
@@ -68,9 +68,8 @@
.endif
.if !defined(WITHOUT_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
USE_OPENSSL= yes
+RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
CONFIGURE_ARGS+= ENABLE_SSL=yes
Index: mail/claws-mail/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.142
diff -u -r1.142 Makefile
--- mail/claws-mail/Makefile 28 Jun 2008 14:40:05 -0000 1.142
+++ mail/claws-mail/Makefile 21 Aug 2008 10:10:53 -0000
@@ -126,8 +126,8 @@
CONFIGURE_ARGS+= --enable-gnutls --disable-openssl
LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls
.else
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --disable-gnutls
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+= --enable-openssl --with-openssl-includes=${OPENSSLINC} \
--with-openssl-libs=${OPENSSLLIB}
CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
Index: mail/postfix/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/postfix/Makefile,v
retrieving revision 1.139
diff -u -r1.139 Makefile
--- mail/postfix/Makefile 17 Aug 2008 23:14:30 -0000 1.139
+++ mail/postfix/Makefile 21 Aug 2008 10:10:53 -0000
@@ -137,7 +137,7 @@
.endif
.if defined(WITH_TLS)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC}
POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
.endif
Index: mail/postfix-current/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/postfix-current/Makefile,v
retrieving revision 1.227
diff -u -r1.227 Makefile
--- mail/postfix-current/Makefile 17 Aug 2008 05:52:25 -0000 1.227
+++ mail/postfix-current/Makefile 21 Aug 2008 10:10:53 -0000
@@ -124,7 +124,7 @@
.endif
.if defined(WITH_TLS)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC}
POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
.endif
Index: mail/postfix1/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/postfix1/Makefile,v
retrieving revision 1.93
diff -u -r1.93 Makefile
--- mail/postfix1/Makefile 21 Jul 2008 22:29:22 -0000 1.93
+++ mail/postfix1/Makefile 21 Aug 2008 10:10:53 -0000
@@ -80,7 +80,7 @@
.endif
.if defined(WITH_TLS)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
MAN8+= tlsmgr.8
POSTFIX_CCARGS+= -DHAS_SSL -I${OPENSSLINC}
POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
Index: mail/qmail/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/qmail/Makefile,v
retrieving revision 1.131
diff -u -r1.131 Makefile
--- mail/qmail/Makefile 19 Aug 2008 13:13:46 -0000 1.131
+++ mail/qmail/Makefile 21 Aug 2008 10:10:53 -0000
@@ -311,8 +311,7 @@
.if defined(SLAVE_LDAP)
. if defined(WITH_TLS)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
. endif
. for param in ${LDAP_PARAMS}
Index: mail/sylpheed2/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/sylpheed2/Makefile,v
retrieving revision 1.163
diff -u -r1.163 Makefile
--- mail/sylpheed2/Makefile 19 Jun 2008 04:43:30 -0000 1.163
+++ mail/sylpheed2/Makefile 21 Aug 2008 10:10:53 -0000
@@ -44,8 +44,7 @@
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+=--enable-ssl
.else
CONFIGURE_ARGS+=--disable-ssl
Index: mail/postfix23/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/postfix23/Makefile,v
retrieving revision 1.133
diff -u -r1.133 Makefile
--- mail/postfix23/Makefile 28 Feb 2008 20:03:29 -0000 1.133
+++ mail/postfix23/Makefile 21 Aug 2008 10:10:53 -0000
@@ -136,7 +136,7 @@
.endif
.if defined(WITH_TLS)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC}
POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
.endif
Index: mail/sylpheed2-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/sylpheed2-devel/Makefile,v
retrieving revision 1.165
diff -u -r1.165 Makefile
--- mail/sylpheed2-devel/Makefile 11 Jun 2008 21:09:10 -0000 1.165
+++ mail/sylpheed2-devel/Makefile 21 Aug 2008 10:10:54 -0000
@@ -51,8 +51,7 @@
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
CONFIGURE_ARGS+=--enable-ssl
.else
Index: mail/postfix24/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/postfix24/Makefile,v
retrieving revision 1.136
diff -u -r1.136 Makefile
--- mail/postfix24/Makefile 28 Feb 2008 20:04:09 -0000 1.136
+++ mail/postfix24/Makefile 21 Aug 2008 10:10:54 -0000
@@ -137,7 +137,7 @@
.endif
.if defined(WITH_TLS)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC}
POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
.endif
Index: net/isc-dhcp3-server/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/isc-dhcp3-server/Makefile,v
retrieving revision 1.122
diff -u -r1.122 Makefile
--- net/isc-dhcp3-server/Makefile 4 Dec 2007 01:28:43 -0000 1.122
+++ net/isc-dhcp3-server/Makefile 21 Aug 2008 10:10:54 -0000
@@ -67,8 +67,6 @@
.if !defined(WITHOUT_DHCP_LDAP_SSL)
USE_OPENSSL= yes
-# hack to get bsd.openssl.mk included at this late state
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.endif
.endif
Index: net/freeradius/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/freeradius/Makefile,v
retrieving revision 1.66
diff -u -r1.66 Makefile
--- net/freeradius/Makefile 20 Aug 2008 00:57:02 -0000 1.66
+++ net/freeradius/Makefile 21 Aug 2008 10:10:54 -0000
@@ -81,13 +81,9 @@
.endif
CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
--with-large-files \
- --with-openssl-includes=${OPENSSLINC}
-# This conditionality avoids -L/usr/lib in the radiusd build step when
-# building with base system OpenSSL
-.if ${OPENSSLLIB} != "/usr/lib"
-CONFIGURE_ARGS+=--with-openssl-libraries=${OPENSSLLIB}
-.endif
-CONFIGURE_ARGS+=--without-rlm_sql_db2 \
+ --with-openssl-includes=${OPENSSLINC} \
+ --with-openssl-libraries=${OPENSSLLIB} \
+ --without-rlm_sql_db2 \
--without-rlm_sql_freetds \
--without-rlm_sql_iodbc \
--without-rlm_sql_oracle \
Index: net/freeradius2/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/freeradius2/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- net/freeradius2/Makefile 20 Aug 2008 00:57:02 -0000 1.72
+++ net/freeradius2/Makefile 21 Aug 2008 10:10:54 -0000
@@ -78,13 +78,9 @@
SUB_LIST+= PORTDOCS=""
.endif
CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
- --with-openssl-includes=${OPENSSLINC}
-# This conditionality avoids -L/usr/lib in the radiusd build step when
-# building with base system OpenSSL
-.if ${OPENSSLLIB} != "/usr/lib"
-CONFIGURE_ARGS+=--with-openssl-libraries=${OPENSSLLIB}
-.endif
-CONFIGURE_ARGS+=--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
+ --with-openssl-includes=${OPENSSLINC} \
+ --with-openssl-libraries=${OPENSSLLIB} \
+ --with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR} \
--without-rlm_eap_ikev2 \
--without-rlm_eap_tnc \
Index: net/openser/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/openser/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- net/openser/Makefile 25 Jul 2008 12:24:06 -0000 1.11
+++ net/openser/Makefile 21 Aug 2008 10:10:54 -0000
@@ -92,7 +92,7 @@
.if defined(WITH_TLS)
MODULES+= tlsops
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
TLS_RC_FILES= tls/rootCA/cacert.pem \
tls/rootCA/certs/01.pem \
tls/rootCA/index.txt \
Index: net/socat/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/socat/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- net/socat/Makefile 20 Aug 2008 06:50:57 -0000 1.25
+++ net/socat/Makefile 21 Aug 2008 10:10:54 -0000
@@ -33,8 +33,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
.else
CONFIGURE_ARGS+= --disable-openssl
.endif
Index: net/isc-dhcp30-server/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/isc-dhcp30-server/Makefile,v
retrieving revision 1.122
diff -u -r1.122 Makefile
--- net/isc-dhcp30-server/Makefile 4 Dec 2007 01:28:43 -0000 1.122
+++ net/isc-dhcp30-server/Makefile 21 Aug 2008 10:10:54 -0000
@@ -67,8 +67,6 @@
.if !defined(WITHOUT_DHCP_LDAP_SSL)
USE_OPENSSL= yes
-# hack to get bsd.openssl.mk included at this late state
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.endif
.endif
Index: net/isc-dhcp31-server/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/isc-dhcp31-server/Makefile,v
retrieving revision 1.122
diff -u -r1.122 Makefile
--- net/isc-dhcp31-server/Makefile 4 Dec 2007 01:28:43 -0000 1.122
+++ net/isc-dhcp31-server/Makefile 21 Aug 2008 10:10:54 -0000
@@ -67,8 +67,6 @@
.if !defined(WITHOUT_DHCP_LDAP_SSL)
USE_OPENSSL= yes
-# hack to get bsd.openssl.mk included at this late state
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.endif
.endif
Index: net/isc-dhcp40-server/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/isc-dhcp40-server/Makefile,v
retrieving revision 1.122
diff -u -r1.122 Makefile
--- net/isc-dhcp40-server/Makefile 4 Dec 2007 01:28:43 -0000 1.122
+++ net/isc-dhcp40-server/Makefile 21 Aug 2008 10:10:54 -0000
@@ -67,8 +67,6 @@
.if !defined(WITHOUT_DHCP_LDAP_SSL)
USE_OPENSSL= yes
-# hack to get bsd.openssl.mk included at this late state
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.endif
.endif
Index: net-mgmt/ettercap/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/ettercap/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- net-mgmt/ettercap/Makefile 21 Aug 2008 06:18:02 -0000 1.36
+++ net-mgmt/ettercap/Makefile 21 Aug 2008 10:10:54 -0000
@@ -83,7 +83,7 @@
.endif
.if !defined(WITHOUT_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
.else
CONFIGURE_ARGS+= --without-openssl
Index: net-mgmt/nrpe2/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nrpe2/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- net-mgmt/nrpe2/Makefile 6 Jun 2008 13:53:04 -0000 1.24
+++ net-mgmt/nrpe2/Makefile 21 Aug 2008 10:10:54 -0000
@@ -57,7 +57,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl
.else
CONFIGURE_ARGS+= --disable-ssl
Index: polish/libgadu/Makefile
===================================================================
RCS file: /home/pcvs/ports/polish/libgadu/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- polish/libgadu/Makefile 26 Jul 2008 16:14:48 -0000 1.9
+++ polish/libgadu/Makefile 21 Aug 2008 10:10:54 -0000
@@ -34,7 +34,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
.else
CONFIGURE_ARGS+= --without-openssl
.endif
Index: print/cups-base/Makefile
===================================================================
RCS file: /home/pcvs/ports/print/cups-base/Makefile,v
retrieving revision 1.97
diff -u -r1.97 Makefile
--- print/cups-base/Makefile 21 Aug 2008 06:18:08 -0000 1.97
+++ print/cups-base/Makefile 21 Aug 2008 10:10:54 -0000
@@ -75,8 +75,8 @@
CONFIGURE_ARGS+= --enable-gnutls --disable-openssl
LIB_DEPENDS+= gnutls-openssl.26:${PORTSDIR}/security/gnutls
.else
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --disable-gnutls --enable-openssl
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.endif
.if defined(WITH_PHP)
Index: security/cyrus-sasl2/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/cyrus-sasl2/Makefile,v
retrieving revision 1.135
diff -u -r1.135 Makefile
--- security/cyrus-sasl2/Makefile 21 May 2008 02:30:23 -0000 1.135
+++ security/cyrus-sasl2/Makefile 21 Aug 2008 10:10:54 -0000
@@ -192,11 +192,7 @@
EBONES= "@comment "
.endif
-.if ${OPENSSLBASE} == /usr
-CONFIGURE_ARGS+=--with-openssl=yes
-.else
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-.endif
SASLAUTHD_RUNPATH?= /var/run/saslauthd
Index: security/ftimes/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/ftimes/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- security/ftimes/Makefile 15 Apr 2007 06:12:51 -0000 1.11
+++ security/ftimes/Makefile 21 Aug 2008 10:10:54 -0000
@@ -66,8 +66,7 @@
.endif
.if defined(WITH_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
.else
CONFIGURE_ARGS+= --without-ssl
Index: sysutils/monit/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sysutils/monit/Makefile 12 Dec 2007 18:42:10 -0000 1.9
+++ sysutils/monit/Makefile 21 Aug 2008 10:10:54 -0000
@@ -38,7 +38,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl --with-openssl="${OPENSSLBASE}"
.else
CONFIGURE_ARGS+= --without-ssl
Index: sysutils/ucspi-tcp/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/ucspi-tcp/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- sysutils/ucspi-tcp/Makefile 25 Jul 2008 18:59:32 -0000 1.32
+++ sysutils/ucspi-tcp/Makefile 21 Aug 2008 10:10:54 -0000
@@ -74,8 +74,7 @@
.endif
.if defined(WITH_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
PATCH_SITES+= http://www.nrg4u.com/qmail/:ssl
PATCHFILES+= ucspi-tcp-ssl-20050405.patch.gz:ssl
.endif
Index: www/apache22/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/apache22/Makefile,v
retrieving revision 1.220
diff -u -r1.220 Makefile
--- www/apache22/Makefile 21 Aug 2008 06:18:34 -0000 1.220
+++ www/apache22/Makefile 21 Aug 2008 10:10:54 -0000
@@ -107,7 +107,7 @@
.include "${APACHEDIR}/Makefile.modules"
.if (defined(WITH_SSL)|| !defined(WITHOUT_SSL_MODULES))
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
Index: www/lighttpd/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- www/lighttpd/Makefile 21 Aug 2008 06:18:35 -0000 1.61
+++ www/lighttpd/Makefile 21 Aug 2008 10:10:54 -0000
@@ -49,7 +49,7 @@
_REQUIRE= DAEMON
.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl \
--with-openssl-includes=${OPENSSLINC} \
--with-openssl-libs=${OPENSSLLIB}
Index: www/nginx/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/nginx/Makefile,v
retrieving revision 1.136
diff -u -r1.136 Makefile
--- www/nginx/Makefile 7 Jul 2008 14:07:48 -0000 1.136
+++ www/nginx/Makefile 21 Aug 2008 10:10:54 -0000
@@ -148,7 +148,7 @@
.endif # WITH_MAIL_MODULE
.if defined(NGINX_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
.endif
PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
Index: www/squid/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/squid/Makefile,v
retrieving revision 1.216
diff -u -r1.216 Makefile
--- www/squid/Makefile 10 Aug 2008 21:57:28 -0000 1.216
+++ www/squid/Makefile 21 Aug 2008 10:10:54 -0000
@@ -287,11 +287,7 @@
CONFIGURE_ARGS+= --disable-carp
.endif
.if defined(WITH_SQUID_SSL)
-# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
-# works when it is defined before bsd.port{.pre}.mk is .included.
-# This makes it currently impossible to combine this macro with OPTIONS to
-# conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl \
--with-openssl="${OPENSSLBASE}"
CFLAGS+= -I${OPENSSLINC}
Index: www/xshttpd/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/xshttpd/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- www/xshttpd/Makefile 21 Aug 2008 06:18:38 -0000 1.18
+++ www/xshttpd/Makefile 21 Aug 2008 10:10:54 -0000
@@ -44,8 +44,7 @@
CONFIGURE_ARGS+=--with-rootdir=${WWWDIR}
.if !defined(WITHOUT_SSL)
-.include <${PORTSDIR}/Mk/bsd.openssl.mk>
-#USE_OPENSSL= yes
+USE_OPENSSL= yes
CONFIGURE_ARGS+=--with-ssl
.else
CONFIGURE_ARGS+=--without-ssl
Index: www/xshttpd-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/xshttpd-devel/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- www/xshttpd-devel/Makefile 21 Aug 2008 06:18:38 -0000 1.58
+++ www/xshttpd-devel/Makefile 21 Aug 2008 10:10:54 -0000
@@ -45,8 +45,7 @@
CONFIGURE_ARGS+=--with-rootdir=${WWWDIR}
.if !defined(WITHOUT_SSL)
-.include <${PORTSDIR}/Mk/bsd.openssl.mk>
-#USE_OPENSSL= yes
+USE_OPENSSL= yes
CONFIGURE_ARGS+=--with-ssl
.else
CONFIGURE_ARGS+=--without-ssl
Index: www/squid30/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/squid30/Makefile,v
retrieving revision 1.216
diff -u -r1.216 Makefile
--- www/squid30/Makefile 20 Aug 2008 00:57:30 -0000 1.216
+++ www/squid30/Makefile 21 Aug 2008 10:10:54 -0000
@@ -269,11 +269,7 @@
CONFIGURE_ARGS+= --disable-carp
.endif
.if defined(WITH_SQUID_SSL)
-# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
-# works when it is defined before bsd.port{.pre}.mk is .included.
-# This makes it currently impossible to combine this macro with OPTIONS to
-# conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl \
--with-openssl="${OPENSSLBASE}"
CFLAGS+= -I${OPENSSLINC}
Index: www/nginx-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/nginx-devel/Makefile,v
retrieving revision 1.158
diff -u -r1.158 Makefile
--- www/nginx-devel/Makefile 18 Aug 2008 14:54:11 -0000 1.158
+++ www/nginx-devel/Makefile 21 Aug 2008 10:10:54 -0000
@@ -159,7 +159,7 @@
.endif # WITH_MAIL_MODULE
.if defined(NGINX_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
.endif
PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
Index: www/cacheboy/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/cacheboy/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- www/cacheboy/Makefile 15 Aug 2008 10:57:59 -0000 1.15
+++ www/cacheboy/Makefile 21 Aug 2008 10:10:54 -0000
@@ -265,7 +265,7 @@
# works when it is defined before bsd.port{.pre}.mk is .included.
# This makes it currently impossible to combine this macro with OPTIONS to
# conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl \
--with-openssl="${OPENSSLBASE}"
CFLAGS+= -I${OPENSSLINC}
Index: www/squid26/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/squid26/Makefile,v
retrieving revision 1.203
diff -u -r1.203 Makefile
--- www/squid26/Makefile 10 Aug 2008 22:03:38 -0000 1.203
+++ www/squid26/Makefile 21 Aug 2008 10:10:54 -0000
@@ -299,11 +299,7 @@
CONFIGURE_ARGS+= --disable-carp
.endif
.if defined(WITH_SQUID_SSL)
-# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
-# works when it is defined before bsd.port{.pre}.mk is .included.
-# This makes it currently impossible to combine this macro with OPTIONS to
-# conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-ssl \
--with-openssl="${OPENSSLBASE}"
CFLAGS+= -I${OPENSSLINC}
|
