From owner-svn-ports-all@FreeBSD.ORG Fri Nov 22 11:43:20 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79144767; Fri, 22 Nov 2013 11:43:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4E9532E54; Fri, 22 Nov 2013 11:43:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMBhKsU059926; Fri, 22 Nov 2013 11:43:20 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAMBhJaa059924; Fri, 22 Nov 2013 11:43:19 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201311221143.rAMBhJaa059924@svn.freebsd.org> From: Dmitry Sivachenko Date: Fri, 22 Nov 2013 11:43:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334574 - head/net-mgmt/nagios-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Nov 2013 11:43:20 -0000 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