From owner-svn-ports-all@FreeBSD.ORG  Thu Jan 22 21:05:52 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C0C5C8FA;
 Thu, 22 Jan 2015 21:05:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD0E63E4;
 Thu, 22 Jan 2015 21:05:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0ML5qQK010700;
 Thu, 22 Jan 2015 21:05:52 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0ML5q3U010699;
 Thu, 22 Jan 2015 21:05:52 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201501222105.t0ML5q3U010699@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 22 Jan 2015 21:05:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377696 - head/Mk/Scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jan 2015 21:05:52 -0000

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,^,@dir ,; \
+	sed_dirs_gen="s!^${PREFIX}/!!g; ${sed_plist_sub} s,^,@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,^,@dir ,; \
+	sed_files="s!^${PREFIX}/!!g; ${sed_plist_sub} /^share\/licenses/d;"
+	sed_dirs="s!^${PREFIX}/!!g; ${sed_plist_sub} s,^,@dir ,; \
 	    /^@dir share\/licenses/d;"
 
 }