diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2019-04-23 13:04:11 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2019-04-23 13:04:11 +0000 |
| commit | 33634159f7ff67534e8c8e8a0def13da77039e23 (patch) | |
| tree | ab976844c9116b087e4b301f96285dd917904ca8 /net-mgmt/monitoring-plugins | |
| parent | a7e6f6e408e652931e3f0b5720754f21e43c4430 (diff) | |
| download | ports-33634159f7ff67534e8c8e8a0def13da77039e23.tar.gz ports-33634159f7ff67534e8c8e8a0def13da77039e23.zip | |
Remove conflicts from bind-tools and the server ports.
All servers now depend on the same bind-tools, from the latest BIND9
release.
Chase dependencies to make sure they now depend on the correct port.
Differential Revision: https://reviews.freebsd.org/D19922
Notes
Notes:
svn path=/head/; revision=499757
Diffstat (limited to 'net-mgmt/monitoring-plugins')
| -rw-r--r-- | net-mgmt/monitoring-plugins/Makefile | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index fb17b8decd64..e106a8fd039e 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -3,7 +3,7 @@ PORTNAME= monitoring-plugins PORTVERSION= 2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} @@ -18,11 +18,9 @@ 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 ${BIND_VERS:S/^/DNS_BIND9/} +OPTIONS_SINGLE_DNS= DNS_BASE DNS_BINDTOOLS OPTIONS_DEFAULT=EXTRAOPTS DNS_BASE OPTIONS_SUB= yes @@ -41,9 +39,6 @@ DNS_DESC= Configuration of check_dig and check_dns (see help) DNS_BASE_DESC= >= 10 means drill for check_dig and no check_dns DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools -.for v in ${BIND_VERS} -DNS_BIND9${v}_DESC= Use dig and nslookup from dns/bind9${v} -.endfor EXTRAOPTS_CONFIGURE_ENABLE= extra-opts @@ -117,11 +112,6 @@ 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 -.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} @@ -135,10 +125,6 @@ CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill \ ac_cv_path_PATH_TO_NSLOOKUP= PLIST_SUB+= CHECK_DNS="@comment " .else -. if ${PORT_OPTIONS:MDNS_BASE} -CONFIGURE_ARGS+= --with-dig-command=/usr/bin/dig \ - --with-nslookup-command=/usr/bin/nslookup -. endif PLIST_SUB+= CHECK_DNS="" .endif |