From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 8 18:40:06 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6C511065674 for ; Mon, 8 Nov 2010 18:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7D0C38FC26 for ; Mon, 8 Nov 2010 18:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oA8Ie6A5060060 for ; Mon, 8 Nov 2010 18:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oA8Ie6Vg060057; Mon, 8 Nov 2010 18:40:06 GMT (envelope-from gnats) Resent-Date: Mon, 8 Nov 2010 18:40:06 GMT Resent-Message-Id: <201011081840.oA8Ie6Vg060057@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, Tom Judge Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9E9F106566C; Mon, 8 Nov 2010 18:36:49 +0000 (UTC) (envelope-from tom@tomjudge.com) Received: from tomjudge.vm.bytemark.co.uk (tomjudge.vm.bytemark.co.uk [80.68.91.100]) by mx1.freebsd.org (Postfix) with ESMTP id 8A2608FC12; Mon, 8 Nov 2010 18:36:49 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by tomjudge.vm.bytemark.co.uk (Postfix) with ESMTP id 978F0DCB3B; Mon, 8 Nov 2010 18:36:48 +0000 (GMT) Received: from tomjudge.vm.bytemark.co.uk ([127.0.0.1]) by localhost (tomjudge.vm.bytemark.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eEv0aIQvo4G5; Mon, 8 Nov 2010 18:36:46 +0000 (GMT) Received: from tinderbox.home.tomjudge.com (unknown [192.168.200.5]) by tomjudge.vm.bytemark.co.uk (Postfix) with SMTP id B1D0548BE0; Mon, 8 Nov 2010 18:36:44 +0000 (GMT) Received: by tinderbox.home.tomjudge.com (sSMTP sendmail emulation); Mon, 08 Nov 2010 18:38:50 +0000 Message-Id: <20101108183644.B1D0548BE0@tomjudge.vm.bytemark.co.uk> Date: Mon, 08 Nov 2010 18:38:50 +0000 From: "Tom Judge" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jpaetzel@FreeBSD.org Subject: ports/152059: devel/pear/bsd.pear.mk: Fix a plist generation bug when no files are installed into a directory. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Tom Judge List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2010 18:40:07 -0000 >Number: 152059 >Category: ports >Synopsis: devel/pear/bsd.pear.mk: Fix a plist generation bug when no files are installed into a directory. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 08 18:40:06 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Tom Judge >Release: FreeBSD 8.1-STABLE amd64 >Organization: >Environment: System: FreeBSD tinderbox.home.tomjudge.com 8.1-STABLE FreeBSD 8.1-STABLE #0 r213720: Tue Oct 12 14:02:02 UTC 2010 tj@tinderbox.home.tomjudge.com:/usr/obj/usr/src/sys/GENERIC amd64 >Description: When using bsd.pear.mk for pear modules it is possible to generate a plist missing some @rmdir statements. Consider the following: TESTS= Latin1Test.php locale/en_GB/LC_MESSAGES/test.mo \ locale/en_GB/LC_MESSAGES/test.php locale/en_GB/LC_MESSAGES/test.po \ locale/en_GB/LC_MESSAGES/test2.mo locale/en_GB/LC_MESSAGES/test2.po \ locale/es_ES/LC_MESSAGES/test.mo locale/es_ES/LC_MESSAGES/test.po \ locale/fr_FR/LC_MESSAGES/test.mo locale/fr_FR/LC_MESSAGES/test.php \ locale/fr_FR/LC_MESSAGES/test.po locale/fr_FR/LC_MESSAGES/test2.mo \ locale/fr_FR/LC_MESSAGES/test2.php locale/fr_FR/LC_MESSAGES/test2.po The current code will generate @rmdir's for: locale/en_GB/LC_MESSAGES locale/es_ES/LC_MESSAGES locale/fr_FR/LC_MESSAGES But not for: locale/en_GB locale/es_ES locale/fr_FR locale The attached patch fixes the DIRFILTER to generate the missing @rmdir's. >How-To-Repeat: >Fix: --- bsd.pear.mk.dir-fix.txt begins here --- --- bsd.pear.mk.orig 2010-11-08 16:32:03.000000000 +0000 +++ bsd.pear.mk 2010-11-08 18:19:57.000000000 +0000 @@ -97,7 +97,19 @@ @${FALSE} .endif -DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' | ${SORT} -ru +DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \ + | ( while read r; do \ + C=1; \ + while [ $$C = 1 ]; do \ + echo $$r; \ + if echo $$r | ${GREP} '/' > /dev/null; then \ + r=`${DIRNAME} $$r`; \ + else \ + C=0; \ + fi; \ + done; \ + done \ + ) | ${SORT} -ur .if !defined(USE_PHPIZE) do-generate-plist: --- bsd.pear.mk.dir-fix.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted: