From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 20 19:40:59 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3E8DC19F;
 Thu, 20 Dec 2012 19:40:59 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 229598FC0A;
 Thu, 20 Dec 2012 19:40:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKJex4m009490;
 Thu, 20 Dec 2012 19:40:59 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKJex5p009489;
 Thu, 20 Dec 2012 19:40:59 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212201940.qBKJex5p009489@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 19:40:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244505 - projects/portbuild/pxedust
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 19:40:59 -0000

Author: linimon (doc,ports committer)
Date: Thu Dec 20 19:40:58 2012
New Revision: 244505
URL: http://svnweb.freebsd.org/changeset/base/244505

Log:
  Add a convenience function.  Really instead this should be etcmerge or
  something.

Modified:
  projects/portbuild/pxedust/pxedust

Modified: projects/portbuild/pxedust/pxedust
==============================================================================
--- projects/portbuild/pxedust/pxedust	Thu Dec 20 19:30:34 2012	(r244504)
+++ projects/portbuild/pxedust/pxedust	Thu Dec 20 19:40:58 2012	(r244505)
@@ -39,7 +39,9 @@ COMMON_ENV="TARGET=${TARGET} TARGET_ARCH
 
 KERNCONF="PACKAGE_NODE_${TARGET}"
 
-LOGFILE="`pwd -P`/diff.out"
+WHEREFROM="`pwd -P`"
+LOGFILE="${WHEREFROM}/diff.out"
+FIXUP="${WHEREFROM}/fixup.sh"
 
 # using a src directory, populate a dst directory, or note differences
 setup () {
@@ -172,4 +174,7 @@ echo "finished."
 echo "  be sure to check ${LOGFILE} for things that have to be adjusted manually:"
 ls -al ${LOGFILE}
 
+grep "^diff" ${LOGFILE} | sed -e "s/^diff/cp -p/" > ${FIXUP}
+echo "  if the < files are a strict superset of the > files, you can just run 'sh ${FIXUP}' ."
+
 exit 0