From hmo@sep.oldach.net  Mon Mar 19 20:00:21 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 8008516A407
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 20:00:21 +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 05EC213C4BF
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 20:00:20 +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 l2JK0ITS025979
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Mar 2007 21:00:19 +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 l2JK0IdJ081639
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 19 Mar 2007 21:00:18 +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 l2JK0IVi081638;
	Mon, 19 Mar 2007 21:00:18 +0100 (CET)
	(envelope-from hmo)
Message-Id: <200703192000.l2JK0IVi081638@sep.oldach.net>
Date: Mon, 19 Mar 2007 21:00:18 +0100 (CET)
From: Helge Oldach <ports-rpm-mar07@oldach.net>
Reply-To: Helge Oldach <ports-rpm-mar07@oldach.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] archivers/rpm does support WITHOUT_NLS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110534
>Category:       ports
>Synopsis:       [patch] archivers/rpm does support 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:   Mon Mar 19 20:10:02 GMT 2007
>Closed-Date:    Thu Mar 22 22:21:27 GMT 2007
>Last-Modified:  Thu Mar 22 22:30:01 GMT 2007
>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@sep.oldach.net:/usr/obj/usr/src/sys/HMO i386

>Description:

archivers/rpm does support building without NLS, using our standard
WITHOUT_NLS mechanism. The trivial patch below implements this.

>How-To-Repeat:

>Fix:

--- ./Makefile.ctm	Tue Aug 15 00:51:08 2006
+++ ./Makefile	Mon Mar 19 20:53:48 2007
@@ -19,14 +19,21 @@
 
 CONFLICTS=	rpm-4.*
 
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:15
 CONFIGURE_ARGS=	--with-glob
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl -liconv"
 USE_LDCONFIG=	yes
 MAKE_ENV=	OLD_PO_FILE_INPUT=1
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+.endif
 
 MAN1=		gendiff.1
 MAN8=		rpm.8 rpm2cpio.8
--- ./pkg-plist.ctm	Thu Feb 23 16:08:13 2006
+++ ./pkg-plist	Mon Mar 19 20:54:24 2007
@@ -56,19 +56,19 @@
 lib/rpm/vpkg-provides2.sh
 lib/rpmpopt
 lib/rpmrc
-share/locale/cs/LC_MESSAGES/rpm.mo
-share/locale/de/LC_MESSAGES/rpm.mo
-share/locale/fi/LC_MESSAGES/rpm.mo
-share/locale/fr/LC_MESSAGES/rpm.mo
-share/locale/ja/LC_MESSAGES/rpm.mo
-share/locale/pl/LC_MESSAGES/rpm.mo
-share/locale/pt_BR/LC_MESSAGES/rpm.mo
-share/locale/ru/LC_MESSAGES/rpm.mo
-share/locale/sk/LC_MESSAGES/rpm.mo
-share/locale/sl/LC_MESSAGES/rpm.mo
-share/locale/sr/LC_MESSAGES/rpm.mo
-share/locale/sv/LC_MESSAGES/rpm.mo
-share/locale/tr/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/de/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/rpm.mo
 @dirrm lib/rpm
 @dirrm include/rpm
 @dirrmtry src/redhat/SRPMS

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Mar 22 22:12:42 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110534: commit references a PR
Date: Thu, 22 Mar 2007 22:20:44 +0000 (UTC)

 pav         2007-03-22 22:20:38 UTC
 
   FreeBSD ports repository
 
   Modified files:
     archivers/rpm        Makefile pkg-plist 
   Log:
   - Make gettext optional with WITHOUT_NLS knob
   
   PR:             ports/110534
   Submitted by:   Helge Oldach <ports-rpm-mar07@oldach.net>
   
   Revision  Changes    Path
   1.63      +10 -3     ports/archivers/rpm/Makefile
   1.18      +13 -13    ports/archivers/rpm/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:
