From owner-svn-src-user@FreeBSD.ORG  Mon Oct 31 21:05:19 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 811731065673;
	Mon, 31 Oct 2011 21:05:19 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7124E8FC1D;
	Mon, 31 Oct 2011 21:05:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9VL5JTY034147;
	Mon, 31 Oct 2011 21:05:19 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9VL5JX0034145;
	Mon, 31 Oct 2011 21:05:19 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201110312105.p9VL5JX0034145@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 31 Oct 2011 21:05:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226972 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Oct 2011 21:05:19 -0000

Author: dougb
Date: Mon Oct 31 21:05:19 2011
New Revision: 226972
URL: http://svn.freebsd.org/changeset/base/226972

Log:
  For the preserve files feature use the same naming and installation
  scheme for the new contents file as is done in update_contents()

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Oct 31 20:24:33 2011	(r226971)
+++ user/dougb/portmaster/portmaster	Mon Oct 31 21:05:19 2011	(r226972)
@@ -3751,7 +3751,7 @@ for file in $preserve_port_files; do
 	mv ${preserve_dir}/${file##*/} $file
 	oldmd5="MD5:`md5 -q $file`"
 
-	newcon=`pm_mktemp contents`
+	new_cont=`pm_mktemp contents`
 	while read left right; do
 		case "$left" in
 		@cwd)		short_file="${file#${right}/}" ;;
@@ -3764,9 +3764,10 @@ for file in $preserve_port_files; do
 				fi ;;
 		esac
 		echo "$left $right"
-	done < $pdb/$new_port/+CONTENTS > $newcon
-	mv $newcon $pdb/$new_port/+CONTENTS
-	unset file oldmd5 newcon left right short_file
+	done < $pdb/$new_port/+CONTENTS > $new_cont
+	pm_install_s $new_cont $contents
+	pm_unlink $new_cont
+	unset file oldmd5 new_cont left right short_file
 done
 if [ -n "$preserve_dir" ]; then
 	rmdir $preserve_dir 2>/dev/null