Date: Mon, 19 Mar 2007 21:00:18 +0100 (CET) From: Helge Oldach <ports-rpm-mar07@oldach.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110534: [patch] archivers/rpm does support WITHOUT_NLS Message-ID: <200703192000.l2JK0IVi081638@sep.oldach.net> Resent-Message-ID: <200703192010.l2JKA2UE035993@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110534
>Category: ports
>Synopsis: [patch] archivers/rpm does support WITHOUT_NLS
>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 20:10: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@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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703192000.l2JK0IVi081638>