MFH: r489481

Do not set OPTIONS_DEFINE twice

Approved by:	ports-secteam build fix blanket

audio/alac/Makefile

@@ -20,7 +20,6 @@ OPTIONS_SUB=	yes
 
 GH_ACCOUNT=	mikebrady
 
-OPTIONS_DEFINE=	CONVERTER
 OPTIONS_DEFINE=	CONVERTER
 CONVERTER_DESC=	Build with command-line utility to read and write audio data
 OPTIONS_DEFAULT=CONVERTER

comms/tlf/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	tlf
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.hs-mittweida.de/tb/ \
 		LOCAL/shurd
@@ -33,6 +34,4 @@ HAMLIB_CONFIGURE_ENABLE=hamlib
 FLDIGI_LIB_DEPENDS=	libxmlrpc.so:net/xmlrpc-c
 FLDIGI_CONFIGURE_ENABLE=fldigi-xmlrpc
 
-OPTIONS_DEFINE=	DOCS
-
 .include <bsd.port.mk>

databases/pg_partman/Makefile

@@ -25,8 +25,6 @@ SHEBANG_GLOB=	*.py
 
 OPTIONS_DEFINE=	DOCS
 
-OPTIONS_DEFINE=	DOCS
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pg_partman_bgw.so
 

mail/enma/Makefile

@@ -13,8 +13,6 @@ COMMENT=	Sender authentication milter supporting SPF and Sender ID
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS_DEFINE=	LIBBIND
-LIBBIND_DESC=	Link against dns/libbind instead of dns/ldns
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl-incdir=${OPENSSLINC} \
@@ -29,7 +27,9 @@ MANLANG=	"" ja_JP.UTF-8
 PORTDOCS=	ChangeLog INSTALL LICENSE README
 SUB_FILES=	milter-enma
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS LIBBIND
+
+LIBBIND_DESC=	Link against dns/libbind instead of dns/ldns
 
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 CONF_SUB=	${REINPLACE_CMD} -e '/milter\.postfix/s/false/true/' ${WRKSRC}/enma/etc/enma.conf.sample

net-mgmt/py-snmp4/Makefile

@@ -17,8 +17,6 @@ LICENSE=	BSD2CLAUSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto@${PY_FLAVOR}
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 

net/py-tofu/Makefile

@@ -17,8 +17,6 @@ LICENSE=	GPLv2+
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
 
-OPTIONS_DEFINE=	EXAMPLES
-
 NO_ARCH=	yes
 USES=		python tar:bzip2
 USE_PYTHON=	autoplist distutils