From hmo@sep.oldach.net  Mon Mar 19 19:43:29 2007
Return-Path: <hmo@sep.oldach.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5401916A400
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 19:43:29 +0000 (UTC)
	(envelope-from hmo@sep.oldach.net)
Received: from rigel.oldach.net (rigel.oldach.net [194.8.96.250])
	by mx1.freebsd.org (Postfix) with ESMTP id D339013C4D5
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 19:43:27 +0000 (UTC)
	(envelope-from hmo@sep.oldach.net)
Received: from sep.oldach.net (hmo.in-dsl.de [217.197.85.210])
	by rigel.oldach.net (8.13.8/8.13.8/hmo30jul04) with ESMTP id l2JJhOY4023957
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Mon, 19 Mar 2007 20:43:26 +0100 (CET)
	(envelope-from hmo@sep.oldach.net)
Received: from sep.oldach.net (localhost [127.0.0.1])
	by sep.oldach.net (8.13.8/8.13.8/hmo26jun05) with ESMTP id l2JJhNam048416
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 19 Mar 2007 20:43:23 +0100 (CET)
	(envelope-from hmo@sep.oldach.net)
Received: (from hmo@localhost)
	by sep.oldach.net (8.13.8/8.13.8/Submit/hmo26jun05) id l2JJhMEQ048415;
	Mon, 19 Mar 2007 20:43:22 +0100 (CET)
	(envelope-from hmo)
Message-Id: <200703191943.l2JJhMEQ048415@sep.oldach.net>
Date: Mon, 19 Mar 2007 20:43:22 +0100 (CET)
From: Helge Oldach <ports-neon-sitecopy-mar07@oldach.net>
Reply-To: Helge Oldach <ports-neon-sitecopy-mar07@oldach.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: lev@freebsd.org, olgeni@freebsd.org
Subject: [patch] WITHOUT_NLS support for www/neon and www/sitecopy
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110533
>Category:       ports
>Synopsis:       [patch] WITHOUT_NLS support for www/neon and www/sitecopy
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mezz
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 19 19:50:02 GMT 2007
>Closed-Date:    Sun Aug 01 19:32:52 UTC 2010
>Last-Modified:  Sun Aug  1 19:40:04 UTC 2010
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->lev 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 19 19:50:13 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

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

From: ports-neon-sitecopy-mar07@oldach.net (Helge Oldach)
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc: olgeni@FreeBSD.org
Subject: Re: ports/110533: [patch] WITHOUT_NLS support for www/neon and www/sitecopy
Date: Fri, 6 Apr 2007 19:58:50 +0200 (CEST)

 Hi,
 
 my patch for ports/www/sitecopy is not correct. Please see below for a
 corrected patch.
 
 Helge
 
 --- Makefile.ctm	Sat Mar 17 04:43:50 2007
 +++ Makefile	Fri Apr  6 19:51:15 2007
 @@ -19,13 +19,20 @@
  LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon
  
  GNU_CONFIGURE=	yes
 -CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" \
 -		LIBS="-L${LOCALBASE}/lib -lintl"
 +CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
  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
 +CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -lintl"
 +USE_GETTEXT=	yes
 +PLIST_SUB+=	NLS=""
 +.endif
  
  .ifndef WITHOUT_SSL
  USE_OPENSSL=	yes
 --- pkg-plist.ctm	Thu Oct 20 16:40:44 2005
 +++ 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
Responsible-Changed-From-To: lev->olegni 
Responsible-Changed-By: lev 
Responsible-Changed-When: Tue Jul 17 19:53:23 UTC 2007 
Responsible-Changed-Why:  

Over to maintainer of www/sitecopy. 
www/neon was patched. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=110533 
Responsible-Changed-From-To: olegni->olgeni 
Responsible-Changed-By: remko 
Responsible-Changed-When: Mon Jul 23 11:14:47 UTC 2007 
Responsible-Changed-Why:  
Correct assignment 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110533 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Sun Aug 1 19:32:36 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110533 
Responsible-Changed-From-To: olgeni->mezz 
Responsible-Changed-By: mezz 
Responsible-Changed-When: Sun Aug 1 19:32:55 UTC 2010 
Responsible-Changed-Why:  
me 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110533: commit references a PR
Date: Sun,  1 Aug 2010 19:32:29 +0000 (UTC)

 mezz        2010-08-01 19:32:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/sitecopy         Makefile pkg-plist 
   Log:
   -Add WITHOUT_NLS support. [1]
   -Reduce the COMMENT to under 70 characters, silent the portlint.
   
   PR:             ports/110533 [1]
   Submitted by:   Helge Oldach <ports-neon-sitecopy-mar07@oldach.net> [1]
   Approved by:    maintainer timeout (3 years, 19 Mar 2007)
   Reminded by:    Helge Oldach <ports-neon-sitecopy-mar07@oldach.net>
   
   Revision  Changes    Path
   1.53      +12 -3     ports/www/sitecopy/Makefile
   1.15      +8 -8      ports/www/sitecopy/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"
 
>Unformatted:
