Date: Mon, 16 Dec 2013 18:38:44 +0100 (CET) From: Geoffroy Desvernay <dgeo@centrale-marseille.fr> To: FreeBSD-gnats-submit@freebsd.org Cc: demon@FreeBSD.org Subject: ports/184808: [PATCH] net-mgmt/nagios-plugins: re-enable dns with drill Message-ID: <20131216173845.3365D1CCEA@dgeo.sysadm.ec-m.fr> Resent-Message-ID: <201312161740.rBGHe0ki009752@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184808
>Category: ports
>Synopsis: [PATCH] net-mgmt/nagios-plugins: re-enable dns with drill
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 16 17:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Geoffroy Desvernay
>Release: FreeBSD 10.0-BETA4 amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 10.0-BETA4 FreeBSD 10.0-BETA4 #0: Mon Dec 2 18:21:18 CET
>Description:
On a > 1000055 system (drill instead of dig), check_dns is still not installed
(SUB_DNS="@comment ")
Port maintainer (demon@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
Install this port on a 10.x system, check_dns is not here although the Makefile has logic for this case.
>Fix:
Remove SUB_DNS... patch attached.
--- nagios-plugins-1.5_1,1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 336646)
+++ Makefile (working copy)
@@ -156,9 +156,6 @@
.if ${OSVERSION} > 1000055
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff
CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill
-PLIST_SUB+= SUB_DNS="@comment "
-.else
-PLIST_SUB+= SUB_DNS=""
.endif
.if !exists(/usr/bin/ssh)
Index: pkg-plist
===================================================================
--- pkg-plist (revision 336646)
+++ pkg-plist (working copy)
@@ -8,7 +8,7 @@
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
--- nagios-plugins-1.5_1,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131216173845.3365D1CCEA>