From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 8 18:00:11 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EFD416A4D1 for ; Tue, 8 Mar 2005 18:00:11 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 103B643D5F for ; Tue, 8 Mar 2005 18:00:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j28I08Uh034383 for ; Tue, 8 Mar 2005 18:00:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j28I08W9034382; Tue, 8 Mar 2005 18:00:08 GMT (envelope-from gnats) Resent-Date: Tue, 8 Mar 2005 18:00:08 GMT Resent-Message-Id: <200503081800.j28I08W9034382@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, Jilles Tjoelker Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18B0C16A4CE for ; Tue, 8 Mar 2005 17:50:18 +0000 (GMT) Received: from mailhost.stack.nl (vaak.stack.nl [131.155.140.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45E1C43D46 for ; Tue, 8 Mar 2005 17:50:16 +0000 (GMT) (envelope-from jilles@stack.nl) Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132]) by mailhost.stack.nl (Postfix) with ESMTP id 552391F3AC for ; Tue, 8 Mar 2005 18:50:14 +0100 (CET) Received: by turtle.stack.nl (Postfix, from userid 1677) id 48AC81DAAA; Tue, 8 Mar 2005 18:50:14 +0100 (CET) Message-Id: <20050308175014.48AC81DAAA@turtle.stack.nl> Date: Tue, 8 Mar 2005 18:50:14 +0100 (CET) From: Jilles Tjoelker To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/78597: [PATCH] bsd.port.mk's add-plist-docs fails if port not installed X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jilles Tjoelker List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2005 18:00:11 -0000 >Number: 78597 >Category: ports >Synopsis: [PATCH] bsd.port.mk's add-plist-docs fails if port not installed >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Mar 08 18:00:08 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jilles Tjoelker >Release: FreeBSD 5.3-RELEASE-p2 i386 >Organization: MCGV Stack >Environment: System: FreeBSD turtle.stack.nl 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #5: Thu Dec 2 17:25:55 CET 2004 jilles@snail.stack.nl:/usr/obj/usr/src/sys/SNAIL i386 >Description: Cannot generate-plist and add-plist-docs if the port is not installed and uses PORTDOCS. This results in a few "@echo: not found" error messages and a plist without documentation files. >How-To-Repeat: Attempt to make generate-plist and add-plist-docs on a non-installed port that uses PORTDOCS, such as mbone/xspeakfree, mbone/udpcast or java/javamail. jilles@turtle /home/jilles% (cd /usr/ports/mbone/xspeakfree && make -dl generate-plist TMPPLIST=/home/jilles/tmp/test-plist) echo "===> Generating temporary packing list" ===> Generating temporary packing list [snip] jilles@turtle /home/jilles% (cd /usr/ports/mbone/xspeakfree && make -dl add-plist-docs TMPPLIST=/home/jilles/tmp/test-plist) if /usr/bin/egrep -qe '^@cw?d' /home/jilles/tmp/test-plist && [ "`/usr/bin/sed -En -e '/^@cw?d[ ]*/s,,,p' /home/jilles/tmp/test-plist | /usr/bin/tail -n 1`" != "/usr/X11R6" ]; then echo "@cwd /usr/X11R6" >> /home/jilles/tmp/test-plist; fi if [ ! -e /usr/X11R6/share/doc/xspeakfree/BUGS ]; then @echo /usr/X11R6/share/doc/xspeakfree/BUGS | /usr/bin/sed -e 's,^/usr/X11R6/,,' >> /home/jilles/tmp/test-plist; fi @echo: not found if [ ! -e /usr/X11R6/share/doc/xspeakfree/HISTORY ]; then @echo /usr/X11R6/share/doc/xspeakfree/HISTORY | /usr/bin/sed -e 's,^/usr/X11R6/,,' >> /home/jilles/tmp/test-plist; fi @echo: not found if [ ! -e /usr/X11R6/share/doc/xspeakfree/INSTALL ]; then @echo /usr/X11R6/share/doc/xspeakfree/INSTALL | /usr/bin/sed -e 's,^/usr/X11R6/,,' >> /home/jilles/tmp/test-plist; fi @echo: not found if [ ! -e /usr/X11R6/share/doc/xspeakfree/LICENSE ]; then @echo /usr/X11R6/share/doc/xspeakfree/LICENSE | /usr/bin/sed -e 's,^/usr/X11R6/,,' >> /home/jilles/tmp/test-plist; fi @echo: not found if [ ! -e /usr/X11R6/share/doc/xspeakfree/README ]; then @echo /usr/X11R6/share/doc/xspeakfree/README | /usr/bin/sed -e 's,^/usr/X11R6/,,' >> /home/jilles/tmp/test-plist; fi @echo: not found if [ ! -e /usr/X11R6/share/doc/xspeakfree/TODO ]; then @echo /usr/X11R6/share/doc/xspeakfree/TODO | /usr/bin/sed -e 's,^/usr/X11R6/,,' >> /home/jilles/tmp/test-plist; fi @echo: not found /usr/bin/find -P /usr/X11R6/share/doc/xspeakfree/BUGS /usr/X11R6/share/doc/xspeakfree/HISTORY /usr/X11R6/share/doc/xspeakfree/INSTALL /usr/X11R6/share/doc/xspeakfree/LICENSE /usr/X11R6/share/doc/xspeakfree/README /usr/X11R6/share/doc/xspeakfree/TODO ! -type d 2>/dev/null | /usr/bin/sed -ne 's,^/usr/X11R6/,,p' >> /home/jilles/tmp/test-plist /usr/bin/find -P -d /usr/X11R6/share/doc/xspeakfree/BUGS /usr/X11R6/share/doc/xspeakfree/HISTORY /usr/X11R6/share/doc/xspeakfree/INSTALL /usr/X11R6/share/doc/xspeakfree/LICENSE /usr/X11R6/share/doc/xspeakfree/README /usr/X11R6/share/doc/xspeakfree/TODO -type d 2>/dev/null | /usr/bin/sed -ne 's,^/usr/X11R6/,@dirrm ,p' >> /home/jilles/tmp/test-plist echo "@dirrm share/doc/xspeakfree" >> /home/jilles/tmp/test-plist jilles@turtle /home/jilles% >Fix: Apply the attached patch. The resulting plist often still has multiple @dirrm lines for the same directory but for many purposes it should be usable. --- bsd.port.mk.patch begins here --- --- ports/Mk/bsd.port.mk.orig Thu Mar 3 21:58:36 2005 +++ ports/Mk/bsd.port.mk Tue Mar 8 18:15:24 2005 @@ -4803,7 +4803,7 @@ fi .for x in ${PORTDOCS} @if [ ! -e ${DOCSDIR}/${x} ]; then \ - @${ECHO_CMD} ${DOCSDIR}/${x} | \ + ${ECHO_CMD} ${DOCSDIR}/${x} | \ ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \ fi .endfor --- bsd.port.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: