Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Nov 2013 11:30:10 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334475 - head/net-mgmt/nagios-plugins
Message-ID:  <201311211130.rALBUAoU061148@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Thu Nov 21 11:30:10 2013
New Revision: 334475
URL: http://svnweb.freebsd.org/changeset/ports/334475

Log:
  Add optional dependency on bind-tools to install dig(1) on FreeBSD-10 and above
  (it has been removed from base system).
  
  PR:		184118
  Submitted by:	Geoffroy Desvernay <dgeo@centrale-marseille.fr>

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	Thu Nov 21 11:01:31 2013	(r334474)
+++ head/net-mgmt/nagios-plugins/Makefile	Thu Nov 21 11:30:10 2013	(r334475)
@@ -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
-OPTIONS_DEFAULT=IPV6
+OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DNS
+OPTIONS_DEFAULT=IPV6 DNS
 
 QSTAT_DESC=	Game server query support (check_game)
 FPING_DESC=	Support for non-flooding fast ping (check_fping)
@@ -28,6 +28,7 @@ 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
@@ -70,6 +71,14 @@ 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	Thu Nov 21 11:01:31 2013	(r334474)
+++ head/net-mgmt/nagios-plugins/pkg-plist	Thu Nov 21 11:30:10 2013	(r334475)
@@ -4,10 +4,10 @@ libexec/nagios/check_by_ssh
 libexec/nagios/check_clamd
 libexec/nagios/check_cluster
 libexec/nagios/check_dhcp
-libexec/nagios/check_dig
+%%SUB_DNS%%libexec/nagios/check_dig
 libexec/nagios/check_disk
 libexec/nagios/check_disk_smb
-libexec/nagios/check_dns
+%%SUB_DNS%%libexec/nagios/check_dns
 libexec/nagios/check_dummy
 libexec/nagios/check_file_age
 libexec/nagios/check_flexlm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311211130.rALBUAoU061148>