From nobody@FreeBSD.org  Mon Feb 25 22:00:51 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B7EC416A40A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 25 Feb 2008 22:00:51 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id ACA7813C467
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 25 Feb 2008 22:00:51 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m1PLw8Sd021869
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 25 Feb 2008 21:58:08 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m1PLw8oO021868;
	Mon, 25 Feb 2008 21:58:08 GMT
	(envelope-from nobody)
Message-Id: <200802252158.m1PLw8oO021868@www.freebsd.org>
Date: Mon, 25 Feb 2008 21:58:08 GMT
From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: net-mgmt/nagios-plugins: [PATCH] WITHOUT_NLS=yes actually works
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: jarrod@netleader.com.au

>Number:         121098
>Category:       ports
>Synopsis:       net-mgmt/nagios-plugins: [PATCH] WITHOUT_NLS=yes actually works
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 25 22:10:00 UTC 2008
>Closed-Date:    Wed Mar 19 14:31:07 UTC 2008
>Last-Modified:  Wed Mar 19 14:40:02 UTC 2008
>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@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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Feb 25 22:10:06 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121098 

From: Jarrod Sayers <jarrod@netleader.com.au>
To: pgollucci@p6m7g8.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/121098: net-mgmt/nagios-plugins: [PATCH] WITHOUT_NLS=yes actually works
Date: Wed, 19 Mar 2008 23:20:57 +1030

 Approved, though I don't see any gain from altering the WITHOUT_NLS  
 logic, so let's leave that as is and just move USE_GETTEXT.
 
 Jarrod.
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Wed Mar 19 13:13:53 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121098 
State-Changed-From-To: feedback->closed 
State-Changed-By: rafan 
State-Changed-When: Wed Mar 19 14:31:05 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121098 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/121098: commit references a PR
Date: Wed, 19 Mar 2008 14:31:10 +0000 (UTC)

 rafan       2008-03-19 14:31:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/nagios-plugins Makefile 
   Log:
   - USE_GETTEXT should defined only when WITH_NLS
   
   PR:             ports/121098
   Submitted by:   Philip M. Gollucci <pgollucci at p6m7g8.com>
   Approved by:    Jarrod Sayers <jarrod at netleader.com.au> (maintainer)
   
   Revision  Changes    Path
   1.67      +1 -1      ports/net-mgmt/nagios-plugins/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
