ports/62351: devel/bison defined both WITHOUT_NLS and USE_GETTEXT

[TAKAHASHI Kaoru]

>Number:         62351
>Category:       ports
>Synopsis:       devel/bison 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:   Wed Feb 04 08:10:17 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 bison build with -DWITHOUT_NLS, don't use gettext.
But USE_GETTEXT defined always.

>How-To-Repeat:

% cd ports/devel/bison && sudo make -DWITHOUT_NLS install
% grep gettext /var/db/pkg/bison*/+CONTENTS


>Fix:

diff -ruN bison.orig/Makefile bison/Makefile
--- bison.orig/Makefile	Wed Feb  4 15:26:41 2004
+++ bison/Makefile	Thu Feb  5 01:07:47 2004
@@ -15,18 +15,21 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+
 CONFLICTS=	bison-[0-9]+
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 .if !defined(WITHOUT_NLS)
 PLIST_SUB=	NLS=""
 .else
 PLIST_SUB=	NLS="@comment "
 .endif
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+.endif
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if defined(WITHOUT_NLS)
>Release-Note:
>Audit-Trail:
>Unformatted: