From owner-svn-ports-all@FreeBSD.ORG  Tue Oct 30 10:17:54 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 55401E9D;
 Tue, 30 Oct 2012 10:17:54 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 3D6848FC08;
 Tue, 30 Oct 2012 10:17:54 +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 q9UAHswe068734;
 Tue, 30 Oct 2012 10:17:54 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9UAHsVf068732;
 Tue, 30 Oct 2012 10:17:54 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201210301017.q9UAHsVf068732@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Tue, 30 Oct 2012 10:17:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306665 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
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: Tue, 30 Oct 2012 10:17:54 -0000

Author: ehaupt
Date: Tue Oct 30 10:17:53 2012
New Revision: 306665
URL: http://svn.freebsd.org/changeset/ports/306665

Log:
  Use the 'Created by:' header option per default rather than the RCS only
  header.
  
  Suggested by:	adamw
  Feature safe:	yes

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

Modified: head/Tools/scripts/convert-makefile-header.pl
==============================================================================
--- head/Tools/scripts/convert-makefile-header.pl	Tue Oct 30 08:47:53 2012	(r306664)
+++ head/Tools/scripts/convert-makefile-header.pl	Tue Oct 30 10:17:53 2012	(r306665)
@@ -19,8 +19,9 @@ sub usage() {
 	my $bn=basename($0);
 	print(<< "_ENOUSAGE");
 Usage: $bn [OPTION] PORT
-  -c                    use 'created by' header
-  -d                    use simple \$FreeBSD\$ RCS string header (default)
+  -c                    use 'created by' header (default)
+  -r                    use simple \$FreeBSD\$ RCS string header
+                        (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
 
@@ -43,7 +44,7 @@ sub get_creator($) {
 MAIN: {
 	# get options
 	my $opt={};
-	GetOptions($opt, 'help|h', 'default|d', 'createdby|c', 'nowrite|n');
+	GetOptions($opt, 'help|h', 'rcsonly|r', 'createdby|c', 'nowrite|n');
 
 	if(defined($opt->{help})) {
 		usage();
@@ -81,9 +82,9 @@ MAIN: {
 			}
 
 			# write new Makefile
-			if(defined($opt->{default}) || !defined($opt->{createdby})) {
+			if(defined($opt->{rcsonly})) {
 				print $outh "# \$FreeBSD\$\n";
-			} elsif(defined($opt->{createdby})) {
+			} elsif(defined($opt->{createdby}) || !defined($opt->{rcsonly})) {
 				my $creator=get_creator(\@header);
 				if(defined($creator)) {
 					print $outh "# Created by: $creator\n";