svn commit: r377696 - head/Mk/Scripts

Bryan Drewery bdrewery at FreeBSD.org
Thu Jan 22 21:05:52 UTC 2015


Author: bdrewery
Date: Thu Jan 22 21:05:51 2015
New Revision: 377696
URL: https://svnweb.freebsd.org/changeset/ports/377696
QAT: https://qat.redports.org/buildarchive/r377696/

Log:
  Don't replace PREFIX anywhere in the plist line, only do it for the beginning.
  
  With hat:	portmgr
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Mk/Scripts/check-stagedir.sh

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Thu Jan 22 20:02:15 2015	(r377695)
+++ head/Mk/Scripts/check-stagedir.sh	Thu Jan 22 21:05:51 2015	(r377696)
@@ -92,15 +92,15 @@ setup_plist_seds() {
 	sed_plist_sub=$(echo "${PLIST_SUB_SED}" | /bin/sh ${SCRIPTSDIR}/plist_sub_sed_sort.sh)
 	unset PLIST_SUB_SED
 	# Used for generate_plist
-	sed_files_gen="s!${PREFIX}/!!g; ${sed_plist_sub} \
+	sed_files_gen="s!^${PREFIX}/!!g; ${sed_plist_sub} \
 	    ${sed_portdocsexamples} /^share\/licenses/d;"
-	sed_dirs_gen="s!${PREFIX}/!!g; ${sed_plist_sub} s,^, at dir ,; \
+	sed_dirs_gen="s!^${PREFIX}/!!g; ${sed_plist_sub} s,^, at dir ,; \
 	    ${sed_portdocsexamples} \
 	    /^@dir share\/licenses/d;"
 
 	# These prevent ignoring DOCS/EXAMPLES dirs with sed_portdocsexamples
-	sed_files="s!${PREFIX}/!!g; ${sed_plist_sub} /^share\/licenses/d;"
-	sed_dirs="s!${PREFIX}/!!g; ${sed_plist_sub} s,^, at dir ,; \
+	sed_files="s!^${PREFIX}/!!g; ${sed_plist_sub} /^share\/licenses/d;"
+	sed_dirs="s!^${PREFIX}/!!g; ${sed_plist_sub} s,^, at dir ,; \
 	    /^@dir share\/licenses/d;"
 
 }


More information about the svn-ports-all mailing list