From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 20 17:20:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A945FD36 for ; Wed, 20 Mar 2013 17:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 83283723 for ; Wed, 20 Mar 2013 17:20:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2KHK2Ko045445 for ; Wed, 20 Mar 2013 17:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2KHK23D045444; Wed, 20 Mar 2013 17:20:02 GMT (envelope-from gnats) Resent-Date: Wed, 20 Mar 2013 17:20:02 GMT Resent-Message-Id: <201303201720.r2KHK23D045444@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "r4721@tormail.org" Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E383AB08 for ; Wed, 20 Mar 2013 17:15:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id D187B6E4 for ; Wed, 20 Mar 2013 17:15:52 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2KHFn7t090325 for ; Wed, 20 Mar 2013 17:15:49 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r2KHFnpR090324; Wed, 20 Mar 2013 17:15:49 GMT (envelope-from nobody) Message-Id: <201303201715.r2KHFnpR090324@red.freebsd.org> Date: Wed, 20 Mar 2013 17:15:49 GMT From: "r4721@tormail.org" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/177148: [patch] fix packing list of x11/xkeyboard-config with NLS=off X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Mar 2013 17:20:02 -0000 >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 -# +# Created by Florent Thoumie # $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 + +.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: