Index: net-mgmt/nagios-plugins/Makefile =================================================================== --- net-mgmt/nagios-plugins/Makefile (revision 494499) +++ net-mgmt/nagios-plugins/Makefile (working copy) @@ -15,14 +15,14 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL= monitoring-plugins-* - USES= charsetfix gmake perl5 libtool ssl USE_SUBMAKE= yes +CONFLICTS_INSTALL= monitoring-plugins-* + 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 DNS_BIND911 DNS_BIND912 DNS_BIND913 DNS_BIND914 OPTIONS_DEFAULT=EXTRAOPTS DNS_BASE OPTIONS_SUB= yes @@ -42,6 +42,9 @@ 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 +DNS_BIND912_DESC= Use dig and nslookup from dns/bind912 +DNS_BIND913_DESC= Use dig and nslookup from dns/bind913 +DNS_BIND914_DESC= Use dig and nslookup from dns/bind914 EXTRAOPTS_CONFIGURE_ENABLE= extra-opts @@ -117,12 +120,10 @@ 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 \ - --with-nslookup-command=${LOCALBASE}/bin/nslookup - +DNS_BIND912_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind912 +DNS_BIND913_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind913 +DNS_BIND914_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind914 SSH_PORTABLE_BUILD_DEPENDS= ${LOCALBASE}/bin/ssh:security/openssh-portable SSH_PORTABLE_RUN_DEPENDS:= ${SSH_PORTABLE_BUILD_DEPENDS} SSH_PORTABLE_CONFIGURE_ON= --with-ssh-command=${LOCALBASE}/bin/ssh @@ -129,6 +130,13 @@ .include +# Look for BUILD_DEPENDS versions of some binaries +.for prog in dig nslookup +.if exists(${LOCALBASE}/bin/${prog}) +CONFIGURE_ARGS+= --with-${prog}-command=${LOCALBASE}/bin/${prog} +.endif +.endfor + .if ${PORT_OPTIONS:MDNS_BASE} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill \