Date: Mon, 25 Nov 2013 18:04:00 +0100 (CET) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/184287: Fixup makeplist for directories. Message-ID: <20131125170400.2526414269C@aragorn.in.absolight.net> Resent-Message-ID: <201311251710.rAPHA0iS070827@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184287
>Category: ports
>Synopsis: Fixup makeplist for directories.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 25 17:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
Without, it'll generate :
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%
With :
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
>How-To-Repeat:
>Fix:
Index: Mk/Scripts/check-stagedir.sh
===================================================================
--- Mk/Scripts/check-stagedir.sh (revision 334863)
+++ Mk/Scripts/check-stagedir.sh (working copy)
@@ -107,9 +107,9 @@
find ${STAGEDIR} -type d | sed -e "s,^${STAGEDIR},,;/^$/d" | sort >${WRKDIR}/.staged-dirs
comm -13 ${WRKDIR}/.traced-dirs ${WRKDIR}/.staged-dirs \
| sort -r | sed \
+ -e 's,^,@dirrmtry ,' \
-e "s,\(.*\)${DOCSDIR},%%PORTDOCS%%\1%%DOCSDIR%%,g" \
-e "s,\(.*\)${EXAMPLESDIR},%%PORTEXAMPLES%%\1%%EXAMPLESDIR%%,g" \
-e "s,${DATADIR},%%DATADIR%%,g" \
-e "s,${PREFIX}/,,g" \
- -e 's,^,@dirrmtry ,' \
-e 's,@dirrmtry \(/.*\),@unexec rmdir >/dev/null 2>\&1 \1 || :,' | grep -v "^@dirrmtry share/licenses" || [ $? = 1 ]
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131125170400.2526414269C>