From herbert@oslo.ath.cx  Fri Apr  9 16:03:48 2004
Return-Path: <herbert@oslo.ath.cx>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 51DD416A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Apr 2004 16:03:48 -0700 (PDT)
Received: from mx-00.sil.at (mx-00.sil.at [62.116.68.196])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5FB5F43D5F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Apr 2004 16:03:47 -0700 (PDT)
	(envelope-from herbert@oslo.ath.cx)
Received: (qmail-ldap/ctrl 69684 invoked from network); 9 Apr 2004 23:03:45 -0000
Received: from unknown (HELO oslo.ath.cx) (u006671@[213.47.80.26])
          (envelope-sender <herbert@oslo.ath.cx>)
          by mx-00.sil.at (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP
          for <FreeBSD-gnats-submit@freebsd.org>; 9 Apr 2004 23:03:45 -0000
Message-Id: <20040409225908.DB5C42C5E@stavanger.norge>
Date: Sat, 10 Apr 2004 00:59:08 +0200 (CEST)
From: "Herbert J. Skuhra" <herbert.skuhra@gmx.at>
Reply-To: "Herbert J. Skuhra" <herbert.skuhra@gmx.at>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: net/centericq - add WITH_GG and WITHOUT_NLS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65381
>Category:       ports
>Synopsis:       net/centericq - add WITH_GG and WITHOUT_NLS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 09 16:10:15 PDT 2004
>Closed-Date:    Mon Apr 12 03:44:02 PDT 2004
>Last-Modified:  Mon Apr 12 03:44:02 PDT 2004
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 5.2.1-RELEASE-p4 i386
>Organization:
BSD User Group Austria
>Environment:
System: FreeBSD stavanger.norge 5.2.1-RELEASE-p4 FreeBSD 5.2.1-RELEASE-p4 #0: Sat Apr 3 20:57:37 CEST 2004 herbert@stavanger.norge:/usr/obj/usr/src/sys/PC1 i386

>Description:

Add WITH_GG and disable Gadu-Gadu by default.
Add WITHOUT_NLS to disable native language support.

>How-To-Repeat:
	
>Fix:

Here is the patch:

diff -ruN centericq.bak/Makefile centericq/Makefile
--- centericq.bak/Makefile	Fri Apr  9 23:37:46 2004
+++ centericq/Makefile	Sat Apr 10 00:25:30 2004
@@ -1,4 +1,3 @@
-# ex:ts=8
 # New ports collection makefile for:   	centericq
 # Date created:                        	25 December 1999
 # Whom:                                 Chris Piazza <cpiazza@FreeBSD.org>
@@ -17,7 +16,6 @@
 
 USE_ICONV=	yes
 USE_OPENSSL=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
@@ -25,6 +23,14 @@
 LDFLAGS+=	-L${LOCALBASE}/lib -lstdc++
 CONFIGURE_ARGS=	--with-openssl --disable-konst
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 .if defined(WITH_MULTIBYTE)
 CONFIGURE_ARGS+=	--enable-locales-fix
 .else
@@ -63,6 +69,10 @@
 
 .if !defined(WITH_LJ)
 CONFIGURE_ARGS+=	--disable-lj
+.endif
+
+.if !defined(WITH_GG)
+CONFIGURE_ARGS+=	--disable-gg
 .endif
 
 MAN1=	cicqconv.1 cicqsync.1
diff -ruN centericq.bak/pkg-plist centericq/pkg-plist
--- centericq.bak/pkg-plist	Fri Apr  9 23:37:46 2004
+++ centericq/pkg-plist	Fri Apr  9 23:51:43 2004
@@ -19,21 +19,21 @@
 %%DATADIR%%/online.wav
 %%DATADIR%%/sms.wav
 %%DATADIR%%/url.wav
-share/locale/bg/LC_MESSAGES/centericq.mo
-share/locale/cs/LC_MESSAGES/centericq.mo
-share/locale/de/LC_MESSAGES/centericq.mo
-share/locale/es/LC_MESSAGES/centericq.mo
-share/locale/fr/LC_MESSAGES/centericq.mo
-share/locale/hu/LC_MESSAGES/centericq.mo
-share/locale/it/LC_MESSAGES/centericq.mo
-share/locale/ms/LC_MESSAGES/centericq.mo
-share/locale/nl/LC_MESSAGES/centericq.mo
-share/locale/pl/LC_MESSAGES/centericq.mo
-share/locale/pt_BR/LC_MESSAGES/centericq.mo
-share/locale/ro/LC_MESSAGES/centericq.mo
-share/locale/ru/LC_MESSAGES/centericq.mo
-share/locale/sv/LC_MESSAGES/centericq.mo
-share/locale/uk/LC_MESSAGES/centericq.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/de/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/es/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/it/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/centericq.mo
+%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
 @dirrm include/libicq2000/libicq2000
 @dirrm include/libicq2000

>Release-Note:
>Audit-Trail:

From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
To: freebsd-gnats-submit@FreeBSD.org, herbert.skuhra@gmx.at
Cc: clsung@dragon2.net
Subject: Re: ports/65381: net/centericq - add WITH_GG and WITHOUT_NLS
Date: Sat, 10 Apr 2004 16:57:26 +0200

 Dear maintainer of net/centericq, could you please review the patch in 
 the above PR?
 
 Regards,
    Volker / vs@freebsd.org
 
State-Changed-From-To: open->feedback 
State-Changed-By: vs 
State-Changed-When: Sat Apr 10 08:04:21 PDT 2004 
State-Changed-Why:  
Forwarded PR to current maintainer. 

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

From: Cheng-Lung Sung <clsung@dragon2.net>
To: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
Cc: freebsd-gnats-submit@FreeBSD.org, herbert.skuhra@gmx.at
Subject: Re: ports/65381: net/centericq - add WITH_GG and WITHOUT_NLS
Date: Mon, 12 Apr 2004 13:29:08 +0800

 --FCuugMFkClbJLl1L
 Content-Type: text/plain; charset=big5
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 I think this PR is ok.
 
 clsung
 On Sat, Apr 10, 2004 at 04:57:26PM +0200, Volker Stolz wrote:
 > Dear maintainer of net/centericq, could you please review the patch in=20
 > the above PR?
 >=20
 > Regards,
 >   Volker / vs@freebsd.org
 
 --FCuugMFkClbJLl1L
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (FreeBSD)
 
 iD8DBQFAeikk+AeJ85Vui8ERApPcAKCHhLZMWv6ExcafWh7WWwmRn8Iq0ACfWBar
 SSAsSmktya2SVzC3URjDdMY=
 =ys5m
 -----END PGP SIGNATURE-----
 
 --FCuugMFkClbJLl1L--
State-Changed-From-To: feedback->open 
State-Changed-By: vs 
State-Changed-When: Mon Apr 12 03:03:38 PDT 2004 
State-Changed-Why:  
Feedback received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65381 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Mon Apr 12 03:43:51 PDT 2004 
State-Changed-Why:  
Committed, thanks! 

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