ports/62332: devel/gmake defined both WITHOUT_NLS and USE_GETTEXT

[TAKAHASHI Kaoru]

>Number:         62332
>Category:       ports
>Synopsis:       devel/gmake defined both WITHOUT_NLS and USE_GETTEXT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 03 23:40:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     TAKAHASHI Kaoru
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD rave.kaoru.trans-nt.com 5.2-RELEASE FreeBSD 5.2-RELEASE #2: Sun Jan 11 22:32:46 JST 2004 root at rave.kaoru.trans-nt.com:/usr/obj/usr/src/sys/RAVE i386


	
>Description:

When gmake build with -DWITHOUT_NLS, don't use gettext.
But USE_GETTEXT defined always.

Same applies to devel/bison.

>How-To-Repeat:

% cd ports/devel/gmake && sudo make -DWITHOUT_NLS install
% grep gettext /var/db/pkg/gmake-3.80_2/+CONTENTS
@pkgdep gettext-0.13.1
@comment DEPORIGIN:devel/gettext


>Fix:

diff -ruN gmake.orig/Makefile gmake/Makefile
--- gmake.orig/Makefile	Wed Feb  4 15:34:11 2004
+++ gmake/Makefile	Wed Feb  4 16:25:04 2004
@@ -16,15 +16,12 @@
 MAINTAINER=	ade at FreeBSD.org
 COMMENT=	GNU version of 'make' utility
 
-.if !defined(WITHOUT_NLS)
-.endif
-
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--program-prefix=g
 .if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
>Release-Note:
>Audit-Trail:
>Unformatted: