ports/110533: [patch] WITHOUT_NLS support for www/neon and www/sitecopy

[Helge Oldach]

>Number:         110533
>Category:       ports
>Synopsis:       [patch] WITHOUT_NLS support for www/neon and www/sitecopy
>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 Mar 19 19:50:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 6.2-757 i386
>Organization:
>Environment:

System: FreeBSD localhost 6.2-757 FreeBSD 6.2-757 #0: Thu Mar 15 20:35:30 CET 2007 toor at localhost:/usr/obj/usr/src/sys/HMO i386

>Description:

Both ports/www/neon and ports/www/sitecopy do support building without
NLS, using our standard WITHOUT_NLS knob which essentially emits a
--disable-nls configure option.

The trivial patch below implements both. Tested & works.

>How-To-Repeat:

>Fix:

--- neon/Makefile.ctm	Sat Mar 17 04:43:50 2007
+++ neon/Makefile	Mon Mar 19 20:21:09 2007
@@ -19,7 +19,14 @@
 
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
 USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 .ifndef WITHOUT_OPENSSL
 USE_OPENSSL=	yes
--- neon/pkg-plist.ctm	Sat Mar 17 04:43:50 2007
+++ neon/pkg-plist	Mon Mar 19 20:23:09 2007
@@ -26,14 +26,14 @@
 lib/libneon.la
 lib/libneon.a
 libdata/pkgconfig/neon.pc
-share/locale/cs/LC_MESSAGES/neon.mo
-share/locale/de/LC_MESSAGES/neon.mo
-share/locale/fr/LC_MESSAGES/neon.mo
-share/locale/ja/LC_MESSAGES/neon.mo
-share/locale/nn/LC_MESSAGES/neon.mo
-share/locale/ru/LC_MESSAGES/neon.mo
-share/locale/tr/LC_MESSAGES/neon.mo
-share/locale/zh/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/de/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/zh/LC_MESSAGES/neon.mo
 %%PORTDOCS%%%%DOCSDIR%%/html/api.html
 %%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
--- sitecopy/Makefile.ctm	Sat Mar 17 04:43:50 2007
+++ sitecopy/Makefile	Mon Mar 19 20:27:37 2007
@@ -22,10 +22,17 @@
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 CONFIGURE_ARGS=	--with-neon --with-libxml2
-USE_GETTEXT=	yes
 USE_GNOME=	libxml2
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 .ifndef WITHOUT_SSL
 USE_OPENSSL=	yes
--- sitecopy/pkg-plist.ctm	Thu Oct 20 16:40:44 2005
+++ sitecopy/pkg-plist	Mon Mar 19 20:29:30 2007
@@ -3,14 +3,14 @@
 %%DOCSDIR%%/README
 %%DOCSDIR%%/THANKS
 %%DOCSDIR%%/update.sh
-share/locale/cs/LC_MESSAGES/sitecopy.mo
-share/locale/de/LC_MESSAGES/sitecopy.mo
-share/locale/fr/LC_MESSAGES/sitecopy.mo
-share/locale/it/LC_MESSAGES/sitecopy.mo
-share/locale/ja/LC_MESSAGES/sitecopy.mo
-share/locale/nn/LC_MESSAGES/sitecopy.mo
-share/locale/ru/LC_MESSAGES/sitecopy.mo
-share/locale/tr/LC_MESSAGES/sitecopy.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/sitecopy.mo
+%%NLS%%share/locale/de/LC_MESSAGES/sitecopy.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/sitecopy.mo
+%%NLS%%share/locale/it/LC_MESSAGES/sitecopy.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/sitecopy.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/sitecopy.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/sitecopy.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/sitecopy.mo
 %%DATADIR%%/changes.awk
 %%DATADIR%%/examplerc
 @dirrm share/sitecopy
>Release-Note:
>Audit-Trail:
>Unformatted: