Add missing USE_OPENSSL=yes

PR:		195796

16 files changed, 46 insertions, 29 deletions

diff --git a/security/duo/Makefile b/security/duo/Makefile
index 934636cbaacb..98bf8d883efc 100644
--- a/security/duo/Makefile
+++ b/security/duo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	duo
 PORTVERSION=	1.9.13
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://dl.duosecurity.com/ \
 		http://mirrors.rit.edu/zi/
@@ -16,9 +17,11 @@ LICENSE=	GPLv2
 CONFIGURE_ARGS=	--with-pam=${PREFIX}/lib/security --sysconfdir=${PREFIX}/etc \
 		--docdir=${DOCSDIR} --includedir=${PREFIX}/include/${PORTNAME}
 
-USES=		libtool pathfix
 GNU_CONFIGURE=	yes
+USES=		libtool pathfix
 USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
+
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index 300df353671c..e9def50c6a3f 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -2,13 +2,14 @@
 
 PORTNAME=	HsOpenSSL
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Partial OpenSSL binding for Haskell
 
 USE_CABAL=	network>=2.1.0.0
+USE_OPENSSL=	yes
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/security/john/Makefile b/security/john/Makefile
index 6c7529275daa..6670edf624de 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	john
 DISTVERSION=	1.7.9-jumbo-7
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openwall.com/john/g/ \
 		http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \
@@ -16,6 +17,7 @@ LICENSE=	GPLv2
 
 USES=		gmake shebangfix tar:bzip2
 SHEBANG_FILES=	run/*.pl
+USE_OPENSSL=	yes
 BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src
 
 # We prefer -jumbo (community-enhanced) versions instead of vanilla releases
diff --git a/security/ncrack/Makefile b/security/ncrack/Makefile
index e60193306bf7..b84d3fe9ee12 100644
--- a/security/ncrack/Makefile
+++ b/security/ncrack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ncrack
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://nmap.org/ncrack/dist/ \
 				http://redundancy.redundancy.org/mirror/
@@ -12,6 +13,7 @@ MAINTAINER=	lx@FreeBSD.org
 COMMENT=	High-speed network authentication cracking tool
 
 GNU_CONFIGURE=	yes
-USES=	gmake
+USES=		gmake
+USE_OPENSSL=	yes
 
 .include <bsd.port.mk>
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 77e5362b7ef6..da5996ee9749 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nessus-libnasl
 PORTVERSION=	2.2.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -22,7 +22,8 @@ LIB_DEPENDS=	libnessus.so:${PORTSDIR}/security/nessus-libraries
 
 GNU_CONFIGURE=	yes
 USES=		bison libtool
-USE_LDCONFIG=	YES
+USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/libnasl
 
 .include <bsd.port.mk>
diff --git a/security/openca-tools-forked/Makefile b/security/openca-tools-forked/Makefile
index 8434c7bacf9d..386b39fd58ff 100644
--- a/security/openca-tools-forked/Makefile
+++ b/security/openca-tools-forked/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openca-tools-forked
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 DIST_SUBDIR=	openxpki
 
@@ -17,8 +17,9 @@ GH_ACCOUNT=	openxpki
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	641e43a
 
-USES=		gmake perl5
 GNU_CONFIGURE=	yes
+USES=		gmake perl5
+USE_OPENSSL=	yes
 
 # security/openssl already has a verify.1 manpage.
 post-stage:
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index f21051516e09..1777c96c4f51 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	osiris
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://osiris.shmoo.com/data/ \
 		http://redundancy.redundancy.org/mirror/
@@ -11,6 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shmoo client/server host integrity checker
 
 GNU_CONFIGURE=	yes
+USE_OPENSSL=	yes
 USE_RC_SUBR=	yes
 
 OPTIONS_DEFINE=	OSIRISMD OSIRISD PRINTDB CLI
diff --git a/security/ossec-hids-client/Makefile b/security/ossec-hids-client/Makefile
index f7a5b2ea1990..29a814aa6ef4 100644
--- a/security/ossec-hids-client/Makefile
+++ b/security/ossec-hids-client/Makefile
@@ -1,6 +1,7 @@
 # Created by: Valerio Daelli <valerio.daelli@gmail.com>
 # $FreeBSD$
 
+PORTREVISION=	1
 COMMENT=	The client port of ossec-hids
 
 CLIENT_ONLY=	yes
diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile
index ed03e03e280b..749c2f973707 100644
--- a/security/ossec-hids-local/Makefile
+++ b/security/ossec-hids-local/Makefile
@@ -1,6 +1,7 @@
 # Created by: Valerio Daelli <valerio.daelli@gmail.com>
 # $FreeBSD$
 
+PORTREVISION=	1
 COMMENT=	The client and server (local) port of ossec-hids
 
 LOCAL_ONLY=	yes
diff --git a/security/ossec-hids-server/Makefile b/security/ossec-hids-server/Makefile
index 53eaaa26fa11..283cc422c493 100644
--- a/security/ossec-hids-server/Makefile
+++ b/security/ossec-hids-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ossec-hids
 PORTVERSION=	2.8.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ossec.net/files/ \
 		http://www.ossec.net/files/old/
@@ -17,6 +17,7 @@ USE_RC_SUBR=	ossec-hids
 CFLAGS+=	-ferror-limit=0
 
 USES=		readline
+USE_OPENSSL=	yes
 
 .if defined(MAINTAINER_MODE)
 UID_FILES+=	../../UIDs
diff --git a/security/pev/Makefile b/security/pev/Makefile
index a14570eba602..eb7f1cbd4738 100644
--- a/security/pev/Makefile
+++ b/security/pev/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pev
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
@@ -13,10 +14,11 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=	gmake
+USES=		gmake
 USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
 
 MAKE_ARGS=	MAKE=${MAKE_CMD}
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/proxytunnel/Makefile b/security/proxytunnel/Makefile
index cea07b7125ae..fae077e94406 100644
--- a/security/proxytunnel/Makefile
+++ b/security/proxytunnel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	proxytunnel
 PORTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20source%20tarballs/${PORTNAME}%20${PORTVERSION}
 
@@ -10,6 +11,7 @@ MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Connects stdin and stdout to an origin server through an HTTPS proxy
 
 USES=		pkgconfig gmake tar:tgz
+USE_OPENSSL=	yes
 
 ALL_TARGET=	${PORTNAME}
 
diff --git a/security/skipfish/Makefile b/security/skipfish/Makefile
index ac6199582fb4..6310237af84f 100644
--- a/security/skipfish/Makefile
+++ b/security/skipfish/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	skipfish
 PORTVERSION=	2.10b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -17,6 +17,7 @@ LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
 USES=		gmake tar:tgz
+USE_OPENSSL=	yes
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
diff --git a/security/sslscan/Makefile b/security/sslscan/Makefile
index 2e7eac86d1cc..d07a43a48939 100644
--- a/security/sslscan/Makefile
+++ b/security/sslscan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sslscan
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 EXTRACT_SUFX=	.tgz
@@ -12,6 +13,9 @@ COMMENT=	SSLScan is a fast SSL port scanner
 
 LICENSE=	GPLv3
 
-MAKE_ARGS=	CC="${CC}" CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include ${CPPFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${LIBS}
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+USE_OPENSSL=	yes
 
 .include <bsd.port.mk>
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index b2be196e910d..4ff194f642e5 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	starttls
 PORTVERSION=	0.10
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/
 
@@ -12,5 +12,6 @@ COMMENT=	Simple wrapper program for STARTTLS on ${EMACS_PORT_NAME}
 GNU_CONFIGURE=	yes
 USES=		gmake
 USE_EMACS=	yes
+USE_OPENSSL=	yes
 
 .include <bsd.port.mk>
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 86129c12df05..f864d6233429 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	stunnel
 PORTVERSION=	5.08
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.stunnel.org/downloads/%SUBDIR%/ \
 		http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
@@ -26,44 +27,36 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		shebangfix libtool
-USE_RC_SUBR=	stunnel
 USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
+USE_RC_SUBR=	stunnel
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var/tmp --enable-static --disable-systemd
+CONFIGURE_ARGS=	--localstatedir=/var/tmp --enable-static --disable-systemd \
+		--with-ssl="${OPENSSLBASE}"
 SHEBANG_FILES=	src/stunnel3.in
 
-OPTIONS_DEFINE=			IPV6 LIBWRAP SSL_PORT FIPS DOCS EXAMPLES
+OPTIONS_DEFINE=			IPV6 LIBWRAP FIPS DOCS EXAMPLES
 OPTIONS_SINGLE=			THREAD
 OPTIONS_SINGLE_THREAD=		FORK PTHREAD UCONTEXT
 OPTIONS_DEFAULT=		PTHREAD
 
 IPV6_CONFIGURE_ENABLE=		ipv6
 LIBWRAP_CONFIGURE_ENABLE=	libwrap
-SSL_PORT_CONFIGURE_ON=		--with-ssl="${OPENSSLBASE}"
-SSL_PORT_CONFIGURE_OFF=		--with-ssl=/usr
-SSL_PORT_USE=			OPENSSL=yes
 FIPS_CONFIGURE_ENABLE=		fips
 
-SSL_PORT_DESC=			Use OpenSSL from the ports collection
 FORK_DESC=			Use the fork(3) threading model
 PTHREAD_DESC=			Use the pthread(3) threading model
 UCONTEXT_DESC=			Use the ucontext(3) threading model
 FIPS_DESC=			Enable OpenSSL FIPS mode
 
-.include <bsd.port.options.mk>
-
 STUNNEL_USER?=	stunnel
 STUNNEL_GROUP?=	stunnel
 
 USERS=		${STUNNEL_USER}
 GROUPS=		${STUNNEL_GROUP}
 
-.if ${PORT_OPTIONS:MSSL_PORT}
-WITH_OPENSSL_PORT=	yes
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLIBWRAP}
 LDFLAGS+=		-lwrap
@@ -114,4 +107,4 @@ cert:
 	@${ECHO} ""
 	@(cd ${WRKSRC}/tools/; make install-data-local)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>