From nobody@FreeBSD.org  Tue May  4 01:50:28 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 525721065676
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  4 May 2010 01:50:28 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 420E58FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  4 May 2010 01:50:28 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o441oSAf064039
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 4 May 2010 01:50:28 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o441oRnb064038;
	Tue, 4 May 2010 01:50:27 GMT
	(envelope-from nobody)
Message-Id: <201005040150.o441oRnb064038@www.freebsd.org>
Date: Tue, 4 May 2010 01:50:27 GMT
From: bf <bf1783@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH]x11-toolkits/Xaw3d: fix NLS support
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         146278
>Category:       ports
>Synopsis:       [PATCH]x11-toolkits/Xaw3d: fix NLS support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 04 02:00:05 UTC 2010
>Closed-Date:    Thu May 06 08:47:20 CEST 2010
>Last-Modified:  Thu May 06 08:47:20 CEST 2010
>Originator:     bf
>Release:        9-CURRENT amd64
>Organization:
-
>Environment:
>Description:
Build an i18n-enabled Xaw3d by default, and allow this feature to be disabled via an NLS option. Properly record any dependence on devel/gettext.  Do not install i18n-related headers if NLS is disabled, so that the configure scripts of dependent ports are not confused.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -x '*old.*' -x '*new.*' -ruN Xaw3d.orig/Makefile Xaw3d/Makefile
--- Xaw3d.orig/Makefile	2010-05-03 21:04:25.000000000 -0400
+++ Xaw3d/Makefile	2010-05-03 21:47:38.000000000 -0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	Xaw3d
 PORTVERSION=	1.5E
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.visi.com/users/hawkeyd/X/ \
 		http://www.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware_source/x/xaw3d/ \
@@ -24,11 +24,26 @@
 SUB_FILES=	pkg-message
 SUB_LIST=	XAWVER="${XAWVER}"
 
+OPTIONS=	NLS "Provide limited Natural Language Support via gettext" on
+
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-extract:
 	${MKDIR} ${WRKSRC}/X11/Xaw3d
 	cd ${WRKSRC}/X11/Xaw3d; ${LN} -sf ../../*.h .
+.if defined(WITHOUT_NLS)
+	${REINPLACE_CMD} -e '/LINTLIBS =/s/=.*/=/' \
+		-e '/#ifdef XawI18nDefines/s//#if 0/' \
+		${WRKSRC}/Imakefile
+		
+.endif
 
 # Workaround a bug in egcs on FreeBSD/Alpha.
 .if ${ARCH} == "alpha"
diff -x '*old.*' -x '*new.*' -ruN Xaw3d.orig/pkg-plist Xaw3d/pkg-plist
--- Xaw3d.orig/pkg-plist	2010-05-03 21:04:25.000000000 -0400
+++ Xaw3d/pkg-plist	2010-05-03 20:02:01.000000000 -0400
@@ -28,10 +28,10 @@
 include/X11/Xaw3d/ListP.h
 include/X11/Xaw3d/MenuButtoP.h
 include/X11/Xaw3d/MenuButton.h
-include/X11/Xaw3d/MultiSink.h
-include/X11/Xaw3d/MultiSinkP.h
-include/X11/Xaw3d/MultiSrc.h
-include/X11/Xaw3d/MultiSrcP.h
+%%NLS%%include/X11/Xaw3d/MultiSink.h
+%%NLS%%include/X11/Xaw3d/MultiSinkP.h
+%%NLS%%include/X11/Xaw3d/MultiSrc.h
+%%NLS%%include/X11/Xaw3d/MultiSrcP.h
 include/X11/Xaw3d/Paned.h
 include/X11/Xaw3d/PanedP.h
 include/X11/Xaw3d/Panner.h
@@ -74,11 +74,11 @@
 include/X11/Xaw3d/ToggleP.h
 include/X11/Xaw3d/Tree.h
 include/X11/Xaw3d/TreeP.h
-include/X11/Xaw3d/VendorEP.h
+%%NLS%%include/X11/Xaw3d/VendorEP.h
 include/X11/Xaw3d/Viewport.h
 include/X11/Xaw3d/ViewportP.h
 include/X11/Xaw3d/Xaw3dP.h
-include/X11/Xaw3d/XawImP.h
+%%NLS%%include/X11/Xaw3d/XawImP.h
 include/X11/Xaw3d/XawInit.h
 %%PORTDOCS%%share/doc/Xaw3d/README.XAW3D
 @dirrm include/X11/Xaw3d


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue May 4 02:00:15 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146278: commit references a PR
Date: Wed,  5 May 2010 15:20:51 +0000 (UTC)

 dinoex      2010-05-05 15:20:39 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-toolkits/Xaw3d   Makefile pkg-plist 
   Log:
   - new option WITHOUT_NLS
   PR:             146278
   Submitted by:   bf
   
   Revision  Changes    Path
   1.55      +15 -0     ports/x11-toolkits/Xaw3d/Makefile
   1.17      +7 -7      ports/x11-toolkits/Xaw3d/pkg-plist
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Thu May 6 08:47:00 CEST 2010 
State-Changed-Why:  
committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146278 
>Unformatted:
