ports/121230: [patch] ports/x11/xkeyboard-config WITHOUT_NLS support

[Helge Oldach]

Hello,

pav at FreeBSD.org wrote on Thu, 19 Mar 2009 15:04:17 +0100 (CET):
> Synopsis: [patch] ports/x11/xkeyboard-config WITHOUT_NLS support
> 
> State-Changed-From-To: open->feedback
> State-Changed-By: pav
> State-Changed-When: Thu Mar 19 13:53:04 UTC 2009
> State-Changed-Why: 
> This patch is ineffective:
> 
> - port still installs gettext catalogues (.mo files)

It doesn't, on my box. Actually the .mo files show up in pkg-plist and
hence in +CONTENTS, but that is essentially cosmetic and can be easily
corrected. Please see attached revised patch.

> - gettext dependency is already inherited from the direct dependencies

Is it? I cannot spot that as well here.

+REQUIRED_BY simply contains

	xorg-server-1.5.3_7,1
	xf86-video-vesa-2.1.0
	xf86-input-mouse-1.4.0_3
	xf86-video-intel-2.5.1
	xf86-input-keyboard-1.3.2
	xorg-drivers-7.4
	xorg-7.4

here, neither of which requires gettext.

Helge
-------------- next part --------------
--- Makefile.ctm	2008-10-15 23:32:55.000000000 +0200
+++ Makefile	2009-03-19 21:03:48.000000000 +0100
@@ -17,10 +17,8 @@
 BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intlhack
-USE_GETTEXT=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
@@ -28,6 +26,18 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls --with-included-gettext
+CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
+		XGETTEXT="/bin/echo '(GNU '" \
+		MSGMERGE="/bin/echo '(GNU '"
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_ICONV=	yes
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 post-install:
 	${MKDIR} /var/lib/xkb
 	${LN} -sf /var/lib/xkb ${PREFIX}/share/X11/xkb/compiled
--- pkg-plist.ctm	2008-10-15 23:32:55.000000000 +0200
+++ pkg-plist	2009-03-19 21:05:42.000000000 +0100
@@ -296,34 +296,34 @@
 share/X11/xkb/types/pc
 share/X11/xkb/types/README
 share/X11/xkb/xkbcomp
-share/locale/af/LC_MESSAGES/xkeyboard-config.mo
-share/locale/az/LC_MESSAGES/xkeyboard-config.mo
-share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
-share/locale/cs/LC_MESSAGES/xkeyboard-config.mo
-share/locale/da/LC_MESSAGES/xkeyboard-config.mo
-share/locale/el/LC_MESSAGES/xkeyboard-config.mo
-share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo
-share/locale/es/LC_MESSAGES/xkeyboard-config.mo
-share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
-share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
-share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
-share/locale/it/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
-share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
-share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sl/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sq/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sr/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sr at Latn/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sv/LC_MESSAGES/xkeyboard-config.mo
-share/locale/tr/LC_MESSAGES/xkeyboard-config.mo
-share/locale/uk/LC_MESSAGES/xkeyboard-config.mo
-share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
-share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
-share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/af/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sr at Latn/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 @exec mkdir -p /var/lib/xkb
 @dirrm share/X11/xkb/compat
 @dirrm share/X11/xkb/geometry/digital_vndr
@@ -352,5 +352,5 @@
 @dirrm share/X11/xkb
 @dirrmtry share/X11
 @dirrmtry /var/lib/xkb
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw