11 files changed, 51 insertions, 78 deletions

diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index 592f375f0185..894ea3bdd3e2 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
+PORTREVISION=	3
 PKGNAMESUFFIX=	-bat
 
 COMMENT=	Network backup solution (GUI)
@@ -24,7 +25,7 @@ CONFIGURE_ARGS+=	--enable-bat \
 			--disable-build-stored \
 			--enable-client-only
 
-OPTIONS_DEFINE=	OPENSSL
-OPTIONS_DEFAULT=OPENSSL
+OPTIONS_DEFINE=	#
+OPTIONS_DEFAULT=#
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula-client-static/Makefile b/sysutils/bacula-client-static/Makefile
index b0a937561b19..35e39a628a7b 100644
--- a/sysutils/bacula-client-static/Makefile
+++ b/sysutils/bacula-client-static/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client-static
 
 COMMENT=	Network backup solution (static client)
@@ -12,8 +12,8 @@ MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
 PLIST_FILES=	sbin/bacula-fd-static \
 		sbin/bconsole-static
 
-OPTIONS_DEFINE=	NLS OPENSSL
-OPTIONS_DEFAULT=NLS OPENSSL
+OPTIONS_DEFINE=	NLS
+OPTIONS_DEFAULT=#
 
 CONFIGURE_ARGS+=	--enable-client-only \
 			--enable-static-fd \
diff --git a/sysutils/bacula-client/Makefile b/sysutils/bacula-client/Makefile
index 11f34c010e91..e90c23a8ce80 100644
--- a/sysutils/bacula-client/Makefile
+++ b/sysutils/bacula-client/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Network backup solution (client)
@@ -12,7 +12,7 @@ USE_RC_SUBR=	bacula-fd
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
 
-OPTIONS_DEFINE=	NLS OPENSSL PYTHON
-OPTIONS_DEFAULT=NLS OPENSSL
+OPTIONS_DEFINE=	NLS PYTHON
+OPTIONS_DEFAULT=#
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 70e546e3b53c..f94af749989e 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	7.0.5
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -13,6 +13,7 @@ MAINTAINER=	dvl@FreeBSD.org
 COMMENT?=	Network backup solution (server)
 
 USES+=		libtool
+USE_OPENSSL=	yes
 
 CONFLICTS?=	bacula5-server-*
 
@@ -29,8 +30,8 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL
-OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
+OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS
+OPTIONS_DEFAULT?=	NLS PGSQL
 MTX_DESC=		Install mtx for control of autochanger devices
 
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index aaee432c1a30..cfe49c0dba2b 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	monit
 PORTVERSION=	5.11
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.mmonit.com/monit/dist/
 
@@ -30,6 +31,7 @@ SUB_FILES=	pkg-message
 PORTDOCS=	COPYING README
 
 SSL_CONFIGURE_OFF=	--without-ssl
+SSL_USE=		OPENSSL=yes
 
 post-install:
 	${INSTALL} -m 600 ${WRKSRC}/monitrc ${STAGEDIR}${PREFIX}/etc/monitrc.sample
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index b30594bed424..ee97944622bf 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.7.0a2
+PORTREVISION=	1
 PKGNAMESUFFIX=	-devel
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
@@ -21,12 +22,8 @@ CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_RADIO=	SSL
-OPTIONS_RADIO_SSL=	SYS_SSL PORTS_SSL
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS
-OPTIONS_DEFAULT=	PORTS_SSL JSON
-SYS_SSL_DESC=		Build with OpenSSL support (from system)
-PORTS_SSL_DESC=		Build with OpenSSL support (from ports)
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL
+OPTIONS_DEFAULT=	OPENSSL JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
@@ -53,20 +50,17 @@ BROKEN_sparc64=	Does not compile on sparc64: gcc core dump
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=		yes
+WITH_OPENSSL_PORT=	yes
 CONFIGURE_ARGS+=	--enable-ssl
-CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
-			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.so
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT=	yes
-.endif
-
 .if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
 .else
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 4d96079f6ac1..915d975fca4a 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
 DISTFILES=	syslog-ng_${DISTVERSION}.tar.gz
@@ -21,12 +21,8 @@ CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_RADIO=	SSL
-OPTIONS_RADIO_SSL=	SYS_SSL PORTS_SSL
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS
-OPTIONS_DEFAULT=	PORTS_SSL JSON
-SYS_SSL_DESC=		Build with OpenSSL support (from system)
-PORTS_SSL_DESC=		Build with OpenSSL support (from ports)
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL
+OPTIONS_DEFAULT=	OPENSSL JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
@@ -53,20 +49,17 @@ BROKEN_sparc64=	Does not compile on sparc64: gcc core dump
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=		yes
+WITH_OPENSSL_PORT=	yes
 CONFIGURE_ARGS+=	--enable-ssl
-CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
-			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.so
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT=	yes
-.endif
-
 .if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
 .else
diff --git a/sysutils/syslog-ng33/Makefile b/sysutils/syslog-ng33/Makefile
index b423a7c16a8b..da85b8e01670 100644
--- a/sysutils/syslog-ng33/Makefile
+++ b/sysutils/syslog-ng33/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.3.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
 PKGNAMESUFFIX=	33
@@ -18,13 +18,10 @@ CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
 
-OPTIONS_RADIO=	SSL JSON
-OPTIONS_RADIO_SSL=	SYS_SSL PORTS_SSL
+OPTIONS_RADIO=		JSON
 OPTIONS_RADIO_JSON=	JSON_C JSON_GLIB
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 PCRE SYSLOG2NG DOCS
-OPTIONS_DEFAULT=	PORTS_SSL PCRE
-SYS_SSL_DESC=		Build with OpenSSL support (from system)
-PORTS_SSL_DESC=		Build with OpenSSL support (from ports)
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 PCRE SYSLOG2NG DOCS OPENSSL
+OPTIONS_DEFAULT=	OPENSSL PCRE
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
@@ -46,20 +43,17 @@ CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=		yes
+WITH_OPENSSL_PORT=	yes
 CONFIGURE_ARGS+=	--enable-ssl
-CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
-			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.so
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT=	yes
-.endif
-
 .if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
 .else
diff --git a/sysutils/syslog-ng34/Makefile b/sysutils/syslog-ng34/Makefile
index 7cce63743338..b97979a8bed4 100644
--- a/sysutils/syslog-ng34/Makefile
+++ b/sysutils/syslog-ng34/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.4.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
 PKGNAMESUFFIX=	34
@@ -20,12 +20,8 @@ CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
 
-OPTIONS_RADIO=	SSL
-OPTIONS_RADIO_SSL=	SYS_SSL PORTS_SSL
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS
-OPTIONS_DEFAULT=	PORTS_SSL PCRE
-SYS_SSL_DESC=		Build with OpenSSL support (from system)
-PORTS_SSL_DESC=		Build with OpenSSL support (from ports)
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS OPENSSL
+OPTIONS_DEFAULT=	OPENSSL PCRE
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
@@ -50,8 +46,9 @@ BROKEN_sparc64=	Does not compile on sparc64: gcc core dump
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=		yes
+WITH_OPENSSL_PORT=	yes
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
 			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
@@ -60,10 +57,6 @@ PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.so
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT=	yes
-.endif
-
 .if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
 .else
diff --git a/sysutils/syslog-ng35/Makefile b/sysutils/syslog-ng35/Makefile
index ceae8550da63..943e824932e6 100644
--- a/sysutils/syslog-ng35/Makefile
+++ b/sysutils/syslog-ng35/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.5.6
-PORTREVISION=	5
+PORTREVISION=	6
 PKGNAMESUFFIX=	35
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
@@ -21,12 +21,8 @@ CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_RADIO=	SSL
-OPTIONS_RADIO_SSL=	SYS_SSL PORTS_SSL
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS REDIS
-OPTIONS_DEFAULT=	PORTS_SSL PCRE
-SYS_SSL_DESC=		Build with OpenSSL support (from system)
-PORTS_SSL_DESC=		Build with OpenSSL support (from ports)
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS REDIS OPENSSL
+OPTIONS_DEFAULT=	OPENSSL PCRE
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
@@ -54,20 +50,17 @@ BROKEN_sparc64=	Does not compile on sparc64: gcc core dump
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=		yes
+WITH_OPENSSL_PORT=	yes
 CONFIGURE_ARGS+=	--enable-ssl
-CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
-			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.so
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT=	yes
-.endif
-
 .if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
 .else
diff --git a/sysutils/tlsdate/Makefile b/sysutils/tlsdate/Makefile
index c4ae002dc816..4070d8346160 100644
--- a/sysutils/tlsdate/Makefile
+++ b/sysutils/tlsdate/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	tlsdate
 PORTVERSION=	0.0.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
 
@@ -20,6 +21,7 @@ GH_TAGNAME=	${GH_COMMIT}
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pkgconfig
+USE_OPENSSL=	yes
 
 OPTIONS_DEFINE=	DOCS