18 files changed, 17 insertions, 19 deletions

diff --git a/security/aimsniff/Makefile b/security/aimsniff/Makefile
index a9793f285a0d..71b2826347dc 100644
--- a/security/aimsniff/Makefile
+++ b/security/aimsniff/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap\
 OPTIONS_DEFINE=	SUID_ROOT DOCS
 SUID_ROOT_DESC=	Install aimsniff with set-uid bit
 
-PORT_OPTIONS=	DOCS
 PORTDOCS=	README table.struct rc.aimsniff
 
 USES=		perl5
diff --git a/security/amap/Makefile b/security/amap/Makefile
index 5d957d9f3792..31320042b929 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -16,7 +16,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 USE_OPENSSL=	yes
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 PORTDOCS=	README TODO CHANGES AMAP-LIB-INTERFACE
 
 LOCAL_CONF_FILES=	appdefs.resp appdefs.rpc appdefs.trig
diff --git a/security/avcheck/Makefile b/security/avcheck/Makefile
index 2496ac99ad3d..a39e2d5ef4a4 100644
--- a/security/avcheck/Makefile
+++ b/security/avcheck/Makefile
@@ -14,7 +14,7 @@ PORTDOCS=	README.AVP README.AVP.de README.DrWeb README.Exim \
 		README.Postfix README.Postfix.de README.Sendmail eicar.msg \
 		eicar.txt
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/^CC/#CC/g ; s/^CFLAGS/#CFLAGS/g' ${WRKSRC}/Makefile
diff --git a/security/bruteforceblocker/Makefile b/security/bruteforceblocker/Makefile
index 3d33cc4eeede..e9c22668dc23 100644
--- a/security/bruteforceblocker/Makefile
+++ b/security/bruteforceblocker/Makefile
@@ -21,7 +21,7 @@ NO_BUILD=	yes
 USES=		perl5
 USE_PERL5=	run
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SUB_FILES=	pkg-message
diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index 88d0e9aca5de..31f000abb30c 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.pangeia.com.br/pub/seg/pac/ \
 MAINTAINER=	cordeiro@nic.br
 COMMENT=	Tool to locally check for signs of a rootkit
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 SCRIPT_FILES=	chkrootkit
 PROG_FILES=	chklastlog \
diff --git a/security/easypg/Makefile b/security/easypg/Makefile
index 484f6060f336..e2f3c1e0a3ae 100644
--- a/security/easypg/Makefile
+++ b/security/easypg/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
 GNU_CONFIGURE=	yes
 USE_EMACS=	yes
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 INFO=	epa
 PORTDOCS=	ChangeLog NEWS README
 
diff --git a/security/f-prot/Makefile b/security/f-prot/Makefile
index 1ef05fa2d385..c419ced2238c 100644
--- a/security/f-prot/Makefile
+++ b/security/f-prot/Makefile
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 SUB_FILES=	900.fpupdate fpscan fpupdate
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/security/fakebo/Makefile b/security/fakebo/Makefile
index caa107dd8f22..bb6d50f43805 100644
--- a/security/fakebo/Makefile
+++ b/security/fakebo/Makefile
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 AUTOMAKE_ARGS=	--add-missing
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${FIND} ${WRKSRC} -type l -delete
diff --git a/security/fiked/Makefile b/security/fiked/Makefile
index 1e30472a68f8..73705478e46e 100644
--- a/security/fiked/Makefile
+++ b/security/fiked/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 USES=	tar:bzip2 gmake
 
-OPTIONS_DEFINE=	LIBNET
+OPTIONS_DEFINE=	LIBNET DOCS
 OPTIONS_DEFAULT=LIBNET
 LIBNET_DESC=	Build with libnet support
 
@@ -24,7 +24,6 @@ MAKEFILE=	GNUmakefile
 
 PLIST_FILES=	bin/fiked man/man1/fiked.1.gz
 PORTDOCS=	README NEWS
-PORT_OPTIONS=	DOCS
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
diff --git a/security/fwanalog/Makefile b/security/fwanalog/Makefile
index 8eba7800e9f3..c61d4c84f6d0 100644
--- a/security/fwanalog/Makefile
+++ b/security/fwanalog/Makefile
@@ -19,7 +19,7 @@ CONFFILES=	fwanalog-dom.tab \
 		fwanalog.opts \
 		services.conf
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} \
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index c262e531e669..070298095e90 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -18,7 +18,7 @@ USE_PYTHON=	yes
 MAN1=		gcipher.1
 LICENSE_FILES=	${WRKSRC}/LICENSE
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/security/hlfl/Makefile b/security/hlfl/Makefile
index 026f775fb62d..c73f3b23dd41 100644
--- a/security/hlfl/Makefile
+++ b/security/hlfl/Makefile
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--datadir=${LOCALBASE}/share/doc
 PORTDOCS=	services.hlfl sample_1.hlfl sample_2.hlfl test.hlfl syntax.txt
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/hlfl ${STAGEDIR}${PREFIX}/bin
diff --git a/security/honggfuzz/Makefile b/security/honggfuzz/Makefile
index beae3f1788ca..9df065f34542 100644
--- a/security/honggfuzz/Makefile
+++ b/security/honggfuzz/Makefile
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=   ${WRKSRC}/COPYING
 
 USES=	gmake
-PORT_OPTIONS=	EXAMPLES
+OPTIONS_DEFINE=	EXAMPLES
 
 # inplace replacement to remove relative binary path in examples scripts
 post-patch:
diff --git a/security/ifd-slb_rf60/Makefile b/security/ifd-slb_rf60/Makefile
index c1adab34c3ea..0aa67d326b2d 100644
--- a/security/ifd-slb_rf60/Makefile
+++ b/security/ifd-slb_rf60/Makefile
@@ -19,7 +19,7 @@ CFLAGS+=	-fPIC
 SUB_LIST=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^ifd-//}
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README
 PLIST_FILES=	lib/pcsc/drivers/libslb_rf60.so
diff --git a/security/ipfcount/Makefile b/security/ipfcount/Makefile
index 8feeb3c6f11f..4e695c940b97 100644
--- a/security/ipfcount/Makefile
+++ b/security/ipfcount/Makefile
@@ -15,7 +15,7 @@ PLIST_FILES=	bin/ipfcount man/man1/ipfcount.1.gz
 
 USES=		perl5
 
-PORT_OPTIONS=	EXAMPLES
+OPTIONS_DEFINE=	EXAMPLES
 
 PORTEXAMPLES=	100.ipfcount
 SUB_FILES=	pkg-message
diff --git a/security/jbrofuzz/Makefile b/security/jbrofuzz/Makefile
index ebe03b730734..24e4b100fa46 100644
--- a/security/jbrofuzz/Makefile
+++ b/security/jbrofuzz/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	JAVA_CMD=${JAVA} JBROFUZZ=${PORTNAME}
 
-PORT_OPTIONS=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/libbf/Makefile b/security/libbf/Makefile
index 3865f3c78aa1..2a1a95914e7a 100644
--- a/security/libbf/Makefile
+++ b/security/libbf/Makefile
@@ -20,7 +20,7 @@ MAKEFLAGS+=	BF_ENC=bf_enc.o
 
 WRKSRC=		${WRKDIR}/bf
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	blowfish.doc COPYRIGHT README VERSION
 
diff --git a/security/makepasswd/Makefile b/security/makepasswd/Makefile
index 46e3c08cc8d7..3eba16437560 100644
--- a/security/makepasswd/Makefile
+++ b/security/makepasswd/Makefile
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 USES=		perl5
 USE_PERL5=	run
 
-PORT_OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 RUN_DEPENDS+=	p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
 		p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random