Date: Wed, 20 Mar 2013 17:15:49 GMT From: "r4721@tormail.org" <r4721@tormail.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177148: [patch] fix packing list of x11/xkeyboard-config with NLS=off Message-ID: <201303201715.r2KHFnpR090324@red.freebsd.org> Resent-Message-ID: <201303201720.r2KHK23D045444@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177148
>Category: ports
>Synopsis: [patch] fix packing list of x11/xkeyboard-config with NLS=off
>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: Wed Mar 20 17:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: r4721@tormail.org
>Release:
>Organization:
>Environment:
>Description:
the packing list of x11/xkeyboard is incorrect for nls=off case.
=== Checking filesystem state
list of extra files and directories in / (not present before this port was installed but present after it was deinstalled)
2498738 8 drwxr-xr-x 3 root wheel 512 Mar 20 16:31 usr/local/share/locale/crh
2498739 8 drwxr-xr-x 2 root wheel 512 Mar 20 16:31 usr/local/share/locale/crh/LC_MESSAGES
2498742 8 drwxr-xr-x 3 root wheel 512 Mar 20 16:31 usr/local/share/locale/ky
2498743 8 drwxr-xr-x 2 root wheel 512 Mar 20 16:31 usr/local/share/locale/ky/LC_MESSAGES
2498746 8 drwxr-xr-x 3 root wheel 512 Mar 20 16:31 usr/local/share/locale/rw
2498747 8 drwxr-xr-x 2 root wheel 512 Mar 20 16:31 usr/local/share/locale/rw/LC_MESSAGES
the attached patch fixes this and some other cleanups.
* convert to new header style
* small whitespace fix
* change to optionsng
* add reinplace to get nls really off (configure was using nls if found, even if --disable-nls)
* fix out of order and incorrect packing list
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: x11/xkeyboard-config/Makefile
===================================================================
--- x11/xkeyboard-config/Makefile (revision 314729)
+++ x11/xkeyboard-config/Makefile (working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xkeyboard-config
-# Date Created: Dec 20 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= xkeyboard-config
PORTVERSION= 2.5.1
@@ -16,8 +12,8 @@
BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \
xsltproc:${PORTSDIR}/textproc/libxslt
+
XORG_CAT= data
-
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= intlhack gnomehack
@@ -30,7 +26,12 @@
MAN7= xkeyboard-config.7
-.if defined(WITHOUT_NLS)
+OPTIONS_DEFINE= NLS
+OPTIONS_DEFAULT=NLS
+
+.include <bsd.port.options.mk>
+
+.if !${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --disable-nls
CONFIGURE_ENV+= MSGFMT="/bin/echo '(GNU '" \
XGETTEXT="/bin/echo '(GNU '" \
@@ -45,6 +46,9 @@
post-patch:
@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
${WRKSRC}/rules/merge.sh
+.if !${PORT_OPTIONS:MNLS}
+ @${REINPLACE_CMD} -e 's|USE_NLS=yes|USE_NLS=no|g' ${WRKSRC}/configure
+.endif
post-install:
${MKDIR} /var/lib/xkb
Index: x11/xkeyboard-config/pkg-plist
===================================================================
--- x11/xkeyboard-config/pkg-plist (revision 314729)
+++ x11/xkeyboard-config/pkg-plist (working copy)
@@ -371,8 +371,8 @@
%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ky
%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/crh
@exec mkdir -p /var/lib/xkb
-@dirrmtry share/locale/crh
@dirrm share/X11/xkb/types
@dirrm share/X11/xkb/symbols/xfree68_vndr
@dirrm share/X11/xkb/symbols/sun_vndr
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303201715.r2KHFnpR090324>