Attachment 138359 Details for Bug 184289 – stage_plist_sub.mk

stage_plist_sub.mk

stage_plist_sub.mk (text/plain), 2.26 KB, created by Mathieu Arnold on 2013-11-25 18:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2013-11-25 18:10:00 UTC

Size: 2.26 KB

patch

obsolete

>Index: Mk/Scripts/check-stagedir.sh
>===================================================================
>--- Mk/Scripts/check-stagedir.sh	(revision 334863)
>+++ Mk/Scripts/check-stagedir.sh	(working copy)
>@@ -24,7 +24,7 @@
> # validate environment
> envfault=
> for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE \
>-    TMPPLIST DATADIR DOCSDIR EXAMPLESDIR
>+    TMPPLIST DOCSDIR EXAMPLESDIR PLIST_SUB
> do
>     if ! ( eval ": \${${i}?}" ) 2>/dev/null ; then
> 		envfault="${envfault}${envfault:+" "}${i}"
>@@ -93,6 +93,19 @@
> 	done
> } > ${WRKDIR}/.mtree
> 
>+for i in $PLIST_SUB
>+do
>+	echo $i
>+done | awk -F= '{print length($2), $1, $2 | "sort -nr" }' | while read l k v
>+do
>+	if [ $l -ne 0 ]
>+	then
>+		echo "s,${v},%%${k}%%,g;"
>+	fi
>+done > ${WRKDIR}/.plist_sub
>+
>+sed_plist_sub=`cat ${WRKDIR}/.plist_sub`
>+
> ### HANDLE FILES
> find ${STAGEDIR} -type f -o -type l | sort | sed -e "s,${STAGEDIR},," >${WRKDIR}/.staged-files
> comm -13 ${WRKDIR}/.plist-files ${WRKDIR}/.staged-files \
>@@ -99,8 +112,8 @@
> 	| sed \
> 	-e "s,${DOCSDIR},%%PORTDOCS%%%%DOCSDIR%%,g" \
> 	-e "s,${EXAMPLESDIR},%%PORTEXAMPLES%%%%EXAMPLESDIR%%,g" \
>-	-e "s,${DATADIR},%%DATADIR%%,g" \
>-	-e "s,${PREFIX}/,,g" | grep -v "^share/licenses" || [ $? = 1 ]
>+	-e "s,${PREFIX}/,,g" \
>+	-e "${sed_plist_sub}" | grep -v "^share/licenses" || [ $? = 1 ]
> 
> ### HANDLE DIRS
> cat ${WRKDIR}/.plist-dirs-unsorted ${WRKDIR}/.mtree | sort -u >${WRKDIR}/.traced-dirs
>@@ -109,7 +122,7 @@
> 	| sort -r | sed \
> 	-e "s,$.*$${DOCSDIR},%%PORTDOCS%%\1%%DOCSDIR%%,g" \
> 	-e "s,$.*$${EXAMPLESDIR},%%PORTEXAMPLES%%\1%%EXAMPLESDIR%%,g" \
>-	-e "s,${DATADIR},%%DATADIR%%,g" \
> 	-e "s,${PREFIX}/,,g" \
>+	-e "${sed_plist_sub}" \
> 	-e 's,^,@dirrmtry ,' \
> 	-e 's,@dirrmtry $/.*$,@unexec rmdir >/dev/null 2>\&1 \1 || :,' | grep -v "^@dirrmtry share/licenses" || [ $? = 1 ]
>Index: Mk/bsd.stage.mk
>===================================================================
>--- Mk/bsd.stage.mk	(revision 334863)
>+++ Mk/bsd.stage.mk	(working copy)
>@@ -19,9 +19,9 @@
> 		WRKSRC=${WRKSRC} \
> 		MTREE_FILE=${MTREE_FILE} \
> 		TMPPLIST=${TMPPLIST} \
>-		DATADIR=${DATADIR} \
> 		DOCSDIR=${DOCSDIR} \
>-		EXAMPLESDIR=${EXAMPLESDIR}
>+		EXAMPLESDIR=${EXAMPLESDIR} \
>+		PLIST_SUB="${PLIST_SUB:NPREFIX=*:NLOCALBASE=*:NOSREL=*:NLIB32DIR=*:NDOCSDIR=*:NEXAMPLESDIR=*}"
> 
> .if !target(stage-dir)
> stage-dir:

Actions: View

Attachments on bug 184289: 138359