ports/121098: net-mgmt/nagios-plugins: [PATCH] WITHOUT_NLS=yes actually works

[Philip M. Gollucci]

>Number:         121098
>Category:       ports
>Synopsis:       net-mgmt/nagios-plugins: [PATCH] WITHOUT_NLS=yes actually works
>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 Feb 25 22:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        8.0-CURRENT
>Organization:
Riderway Inc.
>Environment:
FreeBSD philip.hq.rws 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Tue Nov  6 16:28:12 EST 2007     pgollucci at philip.hq.rws:/usr/obj/usr/src/sys/RIDERWAY  i386

>Description:
USE_GETTEXT=yes has to be in the conditional.

Also, changed defined() to !defined to match idiom on in porters handbook.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/nagios-plugins/Makefile,v
retrieving revision 1.66
diff -u -r1.66 Makefile
--- Makefile	18 Dec 2007 23:32:12 -0000	1.66
+++ Makefile	25 Feb 2008 21:47:51 -0000
@@ -18,7 +18,6 @@
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:261
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I m4 -I gl/m4
@@ -129,11 +128,12 @@
 PLIST_SUB+=	SUB_LDAP="@comment "
 .endif
 
-.if defined(WITHOUT_NLS)
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
 .endif
 
 post-patch:


>Release-Note:
>Audit-Trail:
>Unformatted: