Date: Fri, 27 Sep 2013 09:29:54 GMT From: Olli Hauer <ohauer@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/182435: [patch] Mk/bsd.stage.mk add support for ETCDIR and WWWDIR to makeplist Message-ID: <201309270929.r8R9TsAx027223@freefall.freebsd.org> Resent-Message-ID: <201309270930.r8R9U0PZ027305@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182435
>Category: ports
>Synopsis: [patch] Mk/bsd.stage.mk add support for ETCDIR and WWWDIR to makeplist
>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: Fri Sep 27 09:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Olli Hauer
>Release:
>Organization:
>Environment:
>Description:
make makeplist should support ETCDIR and WWWDIR
>How-To-Repeat:
>Fix:
--- bsd.stage.mk.diff begins here ---
Index: Mk/bsd.stage.mk
===================================================================
--- Mk/bsd.stage.mk (revision 328434)
+++ Mk/bsd.stage.mk (working copy)
@@ -85,7 +85,9 @@
@${FIND} ${STAGEDIR} -type f -o -type l | ${SORT} | ${SED} -e "s,${STAGEDIR},,g" \
-e "s,${DOCSDIR},%%PORTDOCS%%%%DOCSDIR%%,g" \
-e "s,${EXAMPLESDIR},%%PORTEXAMPLES%%%%EXAMPLESDIR%%,g" \
+ -e "s,${ETCDIR},%%ETCDIR%%,g" \
-e "s,${DATADIR},%%DATADIR%%,g" \
+ -e "s,${WWWDIR},%%WWWDIR%%,g" \
-e "s,${PREFIX}/,,g" | ${GREP} -v "^share/licenses" || ${TRUE}
@${FIND} ${STAGEDIR} -type d | ${SED} -e "s,${STAGEDIR},,g" \
| while read line; do \
@@ -95,7 +97,9 @@
done | ${SORT} -r | ${SED} \
-e "s,\(.*\)${DOCSDIR},%%PORTDOCS%%\1%%DOCSDIR%%,g" \
-e "s,\(.*\)${EXAMPLESDIR},%%PORTEXAMPLES%%\1%%EXAMPLESDIR%%,g" \
+ -e "s,${ETCDIR},%%ETCDIR%%,g" \
-e "s,${DATADIR},%%DATADIR%%,g" \
+ -e "s,${WWWDIR},%%WWWDIR%%,g" \
-e "s,${PREFIX}/,,g" | ${GREP} -v "^@dirrmtry share/licenses" || ${TRUE}
.endif
@@ -137,7 +141,9 @@
done | ${SED} \
-e "s,${DOCSDIR},%%PORTDOCS%%%%DOCSDIR%%,g" \
-e "s,${EXAMPLESDIR},%%PORTEXAMPLES%%%%EXAMPLESDIR%%,g" \
+ -e "s,${ETCDIR},%%ETCDIR%%,g" \
-e "s,${DATADIR},%%DATADIR%%,g" \
+ -e "s,${WWWDIR},%%WWWDIR%%,g" \
-e "s,${PREFIX}/,,g" | ${GREP} -v "^share/licenses" || ${TRUE}
@${FIND} ${STAGEDIR} -type d | ${SED} -e "s,${STAGEDIR},,g" \
| while read line; do \
@@ -148,6 +154,8 @@
done | ${SORT} -r | ${SED} \
-e "s,\(.*\)${DOCSDIR},%%PORTDOCS%%\1%%DOCSDIR%%,g" \
-e "s,\(.*\)${EXAMPLESDIR},%%PORTEXAMPLES%%\1%%EXAMPLESDIR%%,g" \
+ -e "s,${ETCDIR},%%ETCDIR%%,g" \
-e "s,${DATADIR},%%DATADIR%%,g" \
+ -e "s,${WWWDIR},%%WWWDIR%%,g" \
-e "s,${PREFIX}/,,g" | ${GREP} -v "^@dirrmtry share/licenses" || ${TRUE}
.endif
--- bsd.stage.mk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309270929.r8R9TsAx027223>