From owner-svn-ports-head@FreeBSD.ORG  Wed Apr 24 19:12:52 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 860F4E37;
 Wed, 24 Apr 2013 19:12:52 +0000 (UTC)
 (envelope-from ehaupt@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 77F1D17E3;
 Wed, 24 Apr 2013 19:12:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OJCqgo087618;
 Wed, 24 Apr 2013 19:12:52 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3OJCqYb087617;
 Wed, 24 Apr 2013 19:12:52 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201304241912.r3OJCqYb087617@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Wed, 24 Apr 2013 19:12:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316470 - head/Tools/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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Apr 2013 19:12:52 -0000

Author: ehaupt
Date: Wed Apr 24 19:12:52 2013
New Revision: 316470
URL: http://svnweb.freebsd.org/changeset/ports/316470

Log:
  Provide an option to not preserve the original file.
  
  Requested by:	eadler

Modified:
  head/Tools/scripts/convert-makefile-header.pl

Modified: head/Tools/scripts/convert-makefile-header.pl
==============================================================================
--- head/Tools/scripts/convert-makefile-header.pl	Wed Apr 24 18:50:57 2013	(r316469)
+++ head/Tools/scripts/convert-makefile-header.pl	Wed Apr 24 19:12:52 2013	(r316470)
@@ -24,6 +24,7 @@ Usage: $bn [OPTION] PORT
                         (make sure the original creator is ok with this)
   -h, --help            this help
   -n, --nowrite         don't change file, just print what would be done
+  -N, --nopreserve      don't preserve original file
 
 _ENOUSAGE
 }
@@ -40,7 +41,6 @@ sub get_nice_people() {
 		'beat',
 		'brooks',
 		'crees',
-		'ehaupt',
 		'eadler',
 		'flo',
 		'flz',
@@ -91,7 +91,7 @@ MAIN: {
 	# get options
 	my $opt={};
 	my $nice_people=get_nice_people();
-	GetOptions($opt, 'help|h', 'rcsonly|r', 'createdby|c', 'nowrite|n');
+	GetOptions($opt, 'help|h', 'rcsonly|r', 'createdby|c', 'nowrite|n', 'nopreserve|N');
 
 	if(defined($opt->{help})) {
 		usage();
@@ -165,7 +165,7 @@ MAIN: {
 
 			if(not defined($opt->{nowrite})) {
 				# move new Makefile
-				`mv $mf $mf.orig`;
+				`mv $mf $mf.orig` if(not defined($opt->{nopreserve}));
 				`mv $mf.tmp_header_rename $mf`;
 				print STDERR "$mf converted.\n";
 			}