From 70e2222e8c0c871f4147b1bbf3538ac5fc987a10 Mon Sep 17 00:00:00 2001
From: mat <mat@FreeBSD.org>
Date: Thu, 12 Jan 2017 08:15:41 +0000
Subject: Commit the cleanups that should have gone in with the pervious
 update.

Sponsored by:	Absolight
---
 dns/bind911/Makefile | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'dns/bind911/Makefile')

diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index cddf9416eb45..af6d8986b2c1 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -69,7 +69,7 @@ OPTIONS_RADIO_GOSTDEF=	GOST GOST_ASN1
 
 .if !defined(BIND_TOOLS_SLAVE)
 OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP
-OPTIONS_DEFINE+=	LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+OPTIONS_DEFINE+=	RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
 			MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
 			START_LATE
 OPTIONS_GROUP=		DLZ
@@ -100,7 +100,6 @@ QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 LMDB_DESC=		Use LMDB for zone management
 DNSTAP_DESC=		Provides fast passive logging of DNS messages
 
-LINKS_DESC=		Create conf file symlinks in ${PREFIX}
 RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
 RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
 DLZ_DESC=		Dynamically Loadable Zones
@@ -209,31 +208,17 @@ DNSTAP_LIB_DEPENDS=	libfstrm.so:devel/fstrm \
 CONFIGURE_ARGS+=	--without-gost
 .endif
 
-.if !${PORT_OPTIONS:MLINKS}
-PKGINSTALL=${NONEXISTENT}
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL}
 CONFIGURE_ARGS+=	--enable-threads
 .else
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100)
-PKGINSTALL=	${NONEXISTENT}
-PLIST_SUB+=	NOBASE="" BASE="@comment "
-SUB_LIST+=	NOBASE="" BASE="@comment "
 .if !defined(BIND_TOOLS_SLAVE)
 USE_RC_SUBR+=	named
 SUB_FILES+=	named.conf
-.endif # !defined(BIND_TOOLS_SLAVE)
-.else
-PLIST_SUB+=	NOBASE="@comment " BASE=""
-SUB_LIST+=	NOBASE="@comment " BASE=""
 .endif
 
-PKGDEINSTALL=	${PKGINSTALL}
-
 MAKE_JOBS_UNSAFE=	yes
 
 PORTDOCS=	*
-- 
cgit