diff options
| author | demon <demon@FreeBSD.org> | 2013-11-22 19:43:19 +0800 |
|---|---|---|
| committer | demon <demon@FreeBSD.org> | 2013-11-22 19:43:19 +0800 |
| commit | e86315b0c15c55680be65b950c9496c9930e4a08 (patch) | |
| tree | 4d007e2c89906dcd303817958e0946552ddb708f /net-mgmt | |
| parent | 3a191b3d7696360eb90ba0c83255bd351f03140f (diff) | |
| download | freebsd-ports-gnome-e86315b0c15c55680be65b950c9496c9930e4a08.tar.gz freebsd-ports-gnome-e86315b0c15c55680be65b950c9496c9930e4a08.tar.zst freebsd-ports-gnome-e86315b0c15c55680be65b950c9496c9930e4a08.zip | |
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.
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/nagios-plugins/Makefile | 13 | ||||
| -rw-r--r-- | net-mgmt/nagios-plugins/pkg-plist | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index 42f43f3a7a6c..62bd82916875 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -18,8 +18,8 @@ USE_AUTOTOOLS= libtool aclocal autoconf automake 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_radius) 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 diff --git a/net-mgmt/nagios-plugins/pkg-plist b/net-mgmt/nagios-plugins/pkg-plist index e2c8a1aec65b..2e5e70660a65 100644 --- a/net-mgmt/nagios-plugins/pkg-plist +++ b/net-mgmt/nagios-plugins/pkg-plist @@ -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 |