svn commit: r495467 - in head/net-mgmt: monitoring-plugins nagios-plugins

[Mathieu Arnold]

Author: mat
Date: Tue Mar 12 16:11:14 2019
New Revision: 495467
URL: https://svnweb.freebsd.org/changeset/ports/495467

Log:
  Add BIND9 9.12 and 9.14 as possible depends.
  
  PR:		236186
  Reported by:	leres

Modified:
  head/net-mgmt/monitoring-plugins/Makefile   (contents, props changed)
  head/net-mgmt/nagios-plugins/Makefile   (contents, props changed)

Modified: head/net-mgmt/monitoring-plugins/Makefile
==============================================================================
--- head/net-mgmt/monitoring-plugins/Makefile	Tue Mar 12 16:03:57 2019	(r495466)
+++ head/net-mgmt/monitoring-plugins/Makefile	Tue Mar 12 16:11:14 2019	(r495467)
@@ -18,9 +18,11 @@ CONFLICTS_INSTALL=	nagios-plugins-*
 USES=		charsetfix gmake perl5 libtool ssl
 USE_SUBMAKE=	yes
 
+BIND_VERS=11 12 14
+
 OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 NLS DBI EXTRAOPTS SSH_PORTABLE
 OPTIONS_SINGLE=	DNS
-OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS DNS_BIND911
+OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS ${BIND_VERS:S/^/DNS_BIND9/}
 OPTIONS_DEFAULT=EXTRAOPTS DNS_BASE
 OPTIONS_SUB=	yes
 
@@ -39,7 +41,9 @@ DNS_DESC=	Configuration of check_dig and check_dns (se
 
 DNS_BASE_DESC=	>= 10 means drill for check_dig and no check_dns
 DNS_BINDTOOLS_DESC=	Use dig and nslookup from dns/bind-tools
-DNS_BIND911_DESC=	Use dig and nslookup from dns/bind911
+.for v in ${BIND_VERS}
+DNS_BIND9${v}_DESC=	Use dig and nslookup from dns/bind9${v}
+.endfor
 
 EXTRAOPTS_CONFIGURE_ENABLE=	extra-opts
 
@@ -113,9 +117,11 @@ DBI_CONFIGURE_WITH=	dbi
 DNS_BINDTOOLS_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind-tools
 DNS_BINDTOOLS_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
-DNS_BIND911_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind911
-DNS_BIND911_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
+.for v in ${BIND_VERS}
+DNS_BIND9${v}_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind9${v}
+DNS_BIND9${v}_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
+.endfor
 
 SSH_PORTABLE_BUILD_DEPENDS=	${LOCALBASE}/bin/ssh:security/openssh-portable
 SSH_PORTABLE_RUN_DEPENDS:=	${SSH_PORTABLE_BUILD_DEPENDS}

Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile	Tue Mar 12 16:03:57 2019	(r495466)
+++ head/net-mgmt/nagios-plugins/Makefile	Tue Mar 12 16:11:14 2019	(r495467)
@@ -20,9 +20,11 @@ CONFLICTS_INSTALL=	monitoring-plugins-*
 USES=		charsetfix gmake perl5 libtool ssl
 USE_SUBMAKE=	yes
 
+BIND_VERS=11 12 14
+
 OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 NLS DBI EXTRAOPTS SSH_PORTABLE
 OPTIONS_SINGLE=	DNS
-OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS DNS_BIND911
+OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS ${BIND_VERS:S/^/DNS_BIND9/}
 OPTIONS_DEFAULT=EXTRAOPTS DNS_BASE
 OPTIONS_SUB=	yes
 
@@ -41,7 +43,9 @@ DNS_DESC=	Configuration of check_dig and check_dns (se
 
 DNS_BASE_DESC=	>= 10 means drill for check_dig and no check_dns
 DNS_BINDTOOLS_DESC=	Use dig and nslookup from dns/bind-tools
-DNS_BIND911_DESC=	Use dig and nslookup from dns/bind911
+.for v in ${BIND_VERS}
+DNS_BIND9${v}_DESC=	Use dig and nslookup from dns/bind9${v}
+.endfor
 
 EXTRAOPTS_CONFIGURE_ENABLE=	extra-opts
 
@@ -119,9 +123,11 @@ DBI_CONFIGURE_WITH=	dbi
 DNS_BINDTOOLS_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind-tools
 DNS_BINDTOOLS_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
-DNS_BIND911_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind911
-DNS_BIND911_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
+.for v in ${BIND_VERS}
+DNS_BIND9${v}_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:dns/bind9${v}
+DNS_BIND9${v}_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
+.endfor
 
 SSH_PORTABLE_BUILD_DEPENDS=	${LOCALBASE}/bin/ssh:security/openssh-portable
 SSH_PORTABLE_RUN_DEPENDS:=	${SSH_PORTABLE_BUILD_DEPENDS}