From owner-freebsd-x11@FreeBSD.ORG Thu Mar 19 20:55:44 2009 Return-Path: Delivered-To: freebsd-x11@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C060610656CD; Thu, 19 Mar 2009 20:55:44 +0000 (UTC) (envelope-from ports-x11-xkeyboard-config-may07@oldach.net) Received: from rigel.oldach.net (rigel.oldach.net [194.8.96.250]) by mx1.freebsd.org (Postfix) with ESMTP id 4EDDE8FC0C; Thu, 19 Mar 2009 20:55:43 +0000 (UTC) (envelope-from ports-x11-xkeyboard-config-may07@oldach.net) Received: from sep.oldach.net (hmo.in-dsl.de [217.197.85.210]) by rigel.oldach.net (8.14.3/8.14.3/hmo30jul04) with ESMTP id n2JKIZvD055616 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 19 Mar 2009 21:18:35 +0100 (CET) (envelope-from ports-x11-xkeyboard-config-may07@oldach.net) Received: from sep.oldach.net (localhost [127.0.0.1]) by sep.oldach.net (8.14.3/8.14.3/hmo26jun05) with ESMTP id n2JKIYOr051497 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 19 Mar 2009 21:18:34 +0100 (CET) (envelope-from ports-x11-xkeyboard-config-may07@oldach.net) Received: (from hmo@localhost) by sep.oldach.net (8.14.3/8.14.3/Submit/hmo26jun05) id n2JKIYHa051496; Thu, 19 Mar 2009 21:18:34 +0100 (CET) (envelope-from ports-x11-xkeyboard-config-may07@oldach.net) Message-Id: <200903192018.n2JKIYHa051496@sep.oldach.net> In-Reply-To: <200903191404.n2JE4Hp7098673@freefall.freebsd.org> from "pav@FreeBSD.org" at "19 Mar 2009 14:04:17" To: pav@FreeBSD.org Date: Thu, 19 Mar 2009 21:18:34 +0100 (CET) From: ports-x11-xkeyboard-config-may07@oldach.net (Helge Oldach) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="ELM87761455:-51039-0_" Content-Transfer-Encoding: 7bit Cc: freebsd-x11@FreeBSD.org Subject: Re: ports/121230: [patch] ports/x11/xkeyboard-config WITHOUT_NLS support X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2009 20:55:46 -0000 --ELM87761455:-51039-0_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hello, pav@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 --ELM87761455:-51039-0_ Content-Type: text/plain; charset=ISO-8859-1 Content-Disposition: attachment; filename=xkeyboard-config-new.diff Content-Description: /tmp/xkeyboard-config-new.diff Content-Transfer-Encoding: 7bit --- 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@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@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 -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/rw --ELM87761455:-51039-0_--