svn commit: r334574 - head/net-mgmt/nagios-plugins
Dmitry Sivachenko
demon at FreeBSD.org
Fri Nov 22 11:43:20 UTC 2013
Author: demon
Date: Fri Nov 22 11:43:19 2013
New Revision: 334574
URL: http://svnweb.freebsd.org/changeset/ports/334574
Log:
Revert r334475 for now until I figure out how to properly register dependency
on dig command (it can come wither from bindXX or bind-tools ports
which conflict to each other).
Noted by: mat@ and others.
Modified:
head/net-mgmt/nagios-plugins/Makefile
head/net-mgmt/nagios-plugins/pkg-plist
Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile Fri Nov 22 11:31:13 2013 (r334573)
+++ head/net-mgmt/nagios-plugins/Makefile Fri Nov 22 11:43:19 2013 (r334574)
@@ -18,8 +18,8 @@ USE_AUTOTOOLS= libtool aclocal autoconf
ACLOCAL_ARGS= -I m4 -I gl/m4
AUTOMAKE_ARGS= --add-missing
-OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DNS
-OPTIONS_DEFAULT=IPV6 DNS
+OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS
+OPTIONS_DEFAULT=IPV6
QSTAT_DESC= Game server query support (check_game)
FPING_DESC= Support for non-flooding fast ping (check_fping)
@@ -28,7 +28,6 @@ RADIUS_DESC= Radius support (check_radiu
MYSQL_DESC= MySQL support (check_mysql)
PGSQL_DESC= PostgreSQL support (check_pgsql)
LDAP_DESC= OpenLDAP support (check_ldap)
-DNS_DESC= DNS support via dig (check_dns, check_dig)
JAIL_DESC= Compilation within jail(8) (see Makefile)
GNU_CONFIGURE= yes
@@ -71,14 +70,6 @@ PLIST_SUB+= SUB_QSTAT=""
PLIST_SUB+= SUB_QSTAT="@comment "
.endif
-.if ${PORT_OPTIONS:MDNS}
-BUILD_DEPENDS+= dig:${PORTSDIR}/dns/bind-tools
-RUN_DEPENDS+= dig:${PORTSDIR}/dns/bind-tools
-PLIST_SUB+= SUB_DNS=""
-.else
-PLIST_SUB+= SUB_DNS="@comment "
-.endif
-
.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --with-ipv6
.else
Modified: head/net-mgmt/nagios-plugins/pkg-plist
==============================================================================
--- head/net-mgmt/nagios-plugins/pkg-plist Fri Nov 22 11:31:13 2013 (r334573)
+++ head/net-mgmt/nagios-plugins/pkg-plist Fri Nov 22 11:43:19 2013 (r334574)
@@ -4,10 +4,10 @@ libexec/nagios/check_by_ssh
libexec/nagios/check_clamd
libexec/nagios/check_cluster
libexec/nagios/check_dhcp
-%%SUB_DNS%%libexec/nagios/check_dig
+libexec/nagios/check_dig
libexec/nagios/check_disk
libexec/nagios/check_disk_smb
-%%SUB_DNS%%libexec/nagios/check_dns
+libexec/nagios/check_dns
libexec/nagios/check_dummy
libexec/nagios/check_file_age
libexec/nagios/check_flexlm
More information about the svn-ports-all
mailing list