Module Name: src
Committed By: christos
Date: Sat Oct 8 19:28:40 UTC 2011
Modified Files:
src/external/bsd/am-utils/dist: amd2netbsd
src/external/bsd/bind/dist: bind2netbsd
src/external/bsd/byacc: byacc2netbsd
src/external/bsd/cron: cron2netbsd
src/external/bsd/file: file2netbsd
src/external/bsd/flex: flex2netbsd
src/external/bsd/libbind/dist: libbind2netbsd
src/external/bsd/libpcap/dist: libpcap2netbsd
src/external/bsd/ntp: ntp2netbsd
src/external/bsd/openldap: openldap2netbsd
src/external/bsd/tcpdump/dist: tcpdump2netbsd
src/external/gpl3/gdb: gdb2netbsd
src/external/ibm-public/postfix: postfix2netbsd
src/external/mit/lua/dist: lua2netbsd
Log Message:
use cleantags, instead of home grown copy.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/amd2netbsd
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/bind2netbsd
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/byacc2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/cron/cron2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/file/file2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/flex2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libbind/dist/libbind2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libpcap/dist/libpcap2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ntp/ntp2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/openldap2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/tcpdump/dist/tcpdump2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/gdb2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/postfix2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/mit/lua/dist/lua2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/dist/amd2netbsd
diff -u src/external/bsd/am-utils/dist/amd2netbsd:1.2 src/external/bsd/am-utils/dist/amd2netbsd:1.3
--- src/external/bsd/am-utils/dist/amd2netbsd:1.2 Fri Mar 20 16:30:52 2009
+++ src/external/bsd/am-utils/dist/amd2netbsd Sat Oct 8 15:28:38 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: amd2netbsd,v 1.2 2009/03/20 20:30:52 christos Exp $
+# $NetBSD: amd2netbsd,v 1.3 2011/10/08 19:28:38 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -86,13 +86,7 @@ cd $d
rm -f doc/am-utils.dvi doc/am-utils.info* doc/am-utils.ps
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- < $f > /tmp/amd1f$$ && mv /tmp/amd1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
### Add our NetBSD RCS Id
find $d -type f -name '*.[chly]' -print | while read c; do
Index: src/external/bsd/bind/dist/bind2netbsd
diff -u src/external/bsd/bind/dist/bind2netbsd:1.4 src/external/bsd/bind/dist/bind2netbsd:1.5
--- src/external/bsd/bind/dist/bind2netbsd:1.4 Fri Aug 6 06:58:03 2010
+++ src/external/bsd/bind/dist/bind2netbsd Sat Oct 8 15:28:38 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: bind2netbsd,v 1.4 2010/08/06 10:58:03 christos Exp $
+# $NetBSD: bind2netbsd,v 1.5 2011/10/08 19:28:38 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -76,14 +76,7 @@ cd $r
pax -rw * $d
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header|Revision)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- -e 's/\$\(Revision.*\) \$/\1/' \
- < $f > /tmp/bind1f$$ && mv /tmp/bind1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
### Add our NetBSD RCS Id
find $d -type f -name '*.[chly]' -print | while read c; do
Index: src/external/bsd/byacc/byacc2netbsd
diff -u src/external/bsd/byacc/byacc2netbsd:1.3 src/external/bsd/byacc/byacc2netbsd:1.4
--- src/external/bsd/byacc/byacc2netbsd:1.3 Sat Sep 10 17:32:25 2011
+++ src/external/bsd/byacc/byacc2netbsd Sat Oct 8 15:28:39 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: byacc2netbsd,v 1.3 2011/09/10 21:32:25 christos Exp $
+# $NetBSD: byacc2netbsd,v 1.4 2011/10/08 19:28:39 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -76,14 +76,7 @@ cd $r
pax -rw * $d
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header|Revision)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- -e 's/\$\(Revision.*\) \$/\1/' \
- < $f > /tmp/byacc1f$$ && mv /tmp/byacc1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
### Add our NetBSD RCS Id
find $d -type f -name '*.[chly]' -print | while read c; do
Index: src/external/bsd/cron/cron2netbsd
diff -u src/external/bsd/cron/cron2netbsd:1.1 src/external/bsd/cron/cron2netbsd:1.2
--- src/external/bsd/cron/cron2netbsd:1.1 Thu May 6 19:19:56 2010
+++ src/external/bsd/cron/cron2netbsd Sat Oct 8 15:28:39 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: cron2netbsd,v 1.1 2010/05/06 23:19:56 christos Exp $
+# $NetBSD: cron2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -78,13 +78,7 @@ cd $d
rm -f bitstring.h bitstring.3 putman.sh
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- < $f > /tmp/cron1f$$ && mv /tmp/cron1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
echo "cleaning up CVS residue."
(
Index: src/external/bsd/file/file2netbsd
diff -u src/external/bsd/file/file2netbsd:1.1 src/external/bsd/file/file2netbsd:1.2
--- src/external/bsd/file/file2netbsd:1.1 Fri Sep 16 16:38:12 2011
+++ src/external/bsd/file/file2netbsd Sat Oct 8 15:28:39 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: file2netbsd,v 1.1 2011/09/16 20:38:12 christos Exp $
+# $NetBSD: file2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
#
# Copyright (c) 2003, 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -47,16 +47,7 @@ file_vers="$(awk -F', ' '/AC_INIT\(/ { p
find "$FILE" -name .cvsignore -delete
### Remove the $'s around RCS tags
-find "$FILE" -type f -print | xargs egrep -l '\$(Id|Date|Header|Log|Revision)'\
- | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Date.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- -e 's/\$\(Log.*\) \$/\1/' \
- -e 's/\$\(Revision.*\) \$/\1/' \
- $f > /tmp/file2$$ && mv /tmp/file2$$ $f && \
- echo removed RCS tag from $f
-done
+cleantags $d
### Add NetBSD RCS Id
find "$FILE" -type f -name '*.[chly]' -print | while read c; do
Index: src/external/bsd/flex/flex2netbsd
diff -u src/external/bsd/flex/flex2netbsd:1.1 src/external/bsd/flex/flex2netbsd:1.2
--- src/external/bsd/flex/flex2netbsd:1.1 Sun Oct 25 21:34:43 2009
+++ src/external/bsd/flex/flex2netbsd Sat Oct 8 15:28:39 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: flex2netbsd,v 1.1 2009/10/26 01:34:43 christos Exp $
+# $NetBSD: flex2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -75,14 +75,7 @@ cd $r
pax -rw * $d
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header|Revision)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- -e 's/\$\(Revision.*\) \$/\1/' \
- < $f > /tmp/flex1f$$ && mv /tmp/flex1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
### Add our NetBSD RCS Id
find $d -type f -name '*.[chly]' -print | while read c; do
Index: src/external/bsd/libbind/dist/libbind2netbsd
diff -u src/external/bsd/libbind/dist/libbind2netbsd:1.1 src/external/bsd/libbind/dist/libbind2netbsd:1.2
--- src/external/bsd/libbind/dist/libbind2netbsd:1.1 Sun Apr 12 11:39:53 2009
+++ src/external/bsd/libbind/dist/libbind2netbsd Sat Oct 8 15:28:39 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: libbind2netbsd,v 1.1 2009/04/12 15:39:53 christos Exp $
+# $NetBSD: libbind2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -76,14 +76,7 @@ cd $r
pax -rw * $d
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header|Revision)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- -e 's/\$\(Revision.*\) \$/\1/' \
- < $f > /tmp/bind1f$$ && mv /tmp/bind1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
### Add our NetBSD RCS Id
find $d -type f -name '*.[chly]' -print | while read c; do
Index: src/external/bsd/libpcap/dist/libpcap2netbsd
diff -u src/external/bsd/libpcap/dist/libpcap2netbsd:1.1 src/external/bsd/libpcap/dist/libpcap2netbsd:1.2
--- src/external/bsd/libpcap/dist/libpcap2netbsd:1.1 Sat Dec 4 20:28:28 2010
+++ src/external/bsd/libpcap/dist/libpcap2netbsd Sat Oct 8 15:28:39 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: libpcap2netbsd,v 1.1 2010/12/05 01:28:28 christos Exp $
+# $NetBSD: libpcap2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -74,13 +74,7 @@ cd $r
pax -rw * $d
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- < $f > /tmp/amd1f$$ && mv /tmp/amd1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
### Clean up any CVS directories that might be around.
echo "cleaning up CVS residue."
Index: src/external/bsd/ntp/ntp2netbsd
diff -u src/external/bsd/ntp/ntp2netbsd:1.1 src/external/bsd/ntp/ntp2netbsd:1.2
--- src/external/bsd/ntp/ntp2netbsd:1.1 Sun Dec 13 12:13:48 2009
+++ src/external/bsd/ntp/ntp2netbsd Sat Oct 8 15:28:39 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: ntp2netbsd,v 1.1 2009/12/13 17:13:48 kardel Exp $
+# $NetBSD: ntp2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
#
# Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -99,13 +99,7 @@ rm -r ports html/pic
find $d -name '.cvsignore*' -exec rm {} \;
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- < $f > /tmp/ntp1f$$ && mv /tmp/ntp1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
### Add our NetBSD RCS Id
find $d -name '*.[chly]' -print | while read c; do
Index: src/external/bsd/openldap/openldap2netbsd
diff -u src/external/bsd/openldap/openldap2netbsd:1.1 src/external/bsd/openldap/openldap2netbsd:1.2
--- src/external/bsd/openldap/openldap2netbsd:1.1 Mon Mar 8 01:42:31 2010
+++ src/external/bsd/openldap/openldap2netbsd Sat Oct 8 15:28:38 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: openldap2netbsd,v 1.1 2010/03/08 06:42:31 lukem Exp $
+# $NetBSD: openldap2netbsd,v 1.2 2011/10/08 19:28:38 christos Exp $
#
# Copyright (c) 1998, 1999, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,16 +33,7 @@
d=. #XXX
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|OpenLDAP|FreeBSD|OpenBSD)' | \
-while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(OpenLDAP.*\) \$/\1/' \
- -e 's/\$\(FreeBSD.*\) \$/\1/' \
- -e 's/\$\(OpenBSD.*\) \$/\1/' \
- < $f > /tmp/openldap1f$$ && mv /tmp/openldap1f$$ $f && \
- echo removed \$RCS tag from $f
-done
-
+cleantags $d
### Add our NetBSD RCS Id
find $d -name '*.[chly]' -print | while read c; do
sed 1q < $c | grep -q '\$NetBSD' || (
Index: src/external/bsd/tcpdump/dist/tcpdump2netbsd
diff -u src/external/bsd/tcpdump/dist/tcpdump2netbsd:1.1 src/external/bsd/tcpdump/dist/tcpdump2netbsd:1.2
--- src/external/bsd/tcpdump/dist/tcpdump2netbsd:1.1 Sun Dec 5 00:14:00 2010
+++ src/external/bsd/tcpdump/dist/tcpdump2netbsd Sat Oct 8 15:28:39 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: tcpdump2netbsd,v 1.1 2010/12/05 05:14:00 christos Exp $
+# $NetBSD: tcpdump2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -74,13 +74,7 @@ cd $r
pax -rw * $d
### Remove the $'s around RCS tags
-find $d -type f -print | xargs egrep -l '\$(Id|Created|Header)' | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- < $f > /tmp/amd1f$$ && mv /tmp/amd1f$$ $f && \
- echo removed \$RCS tag from $f
-done
+cleantags $d
### Clean up any CVS directories that might be around.
echo "cleaning up CVS residue."
Index: src/external/gpl3/gdb/gdb2netbsd
diff -u src/external/gpl3/gdb/gdb2netbsd:1.1 src/external/gpl3/gdb/gdb2netbsd:1.2
--- src/external/gpl3/gdb/gdb2netbsd:1.1 Sat Sep 24 16:52:37 2011
+++ src/external/gpl3/gdb/gdb2netbsd Sat Oct 8 15:28:40 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: gdb2netbsd,v 1.1 2011/09/24 20:52:37 christos Exp $
+# $NetBSD: gdb2netbsd,v 1.2 2011/10/08 19:28:40 christos Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -42,24 +42,7 @@ fi
FILE="$1"
### Remove the $'s around RCS tags
-find "$FILE" -type f -print | xargs egrep -l '\$(Author|Date|Header|Id|LocalId|Locker|Log|Name|RCSfile|Revision|Source|State|NetBSD)'\
- | while read f; do
- sed \
- -e 's/\$\(Author.*\) \$/\1/' \
- -e 's/\$\(Date.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- -e 's/\$\(Id.*\) \$/\1/' \
- -e 's/\$\(LocalId.*\) \$/\1/' \
- -e 's/\$\(Locker.*\) \$/\1/' \
- -e 's/\$\(Log.*\) \$/\1/' \
- -e 's/\$\(Name.*\) \$/\1/' \
- -e 's/\$\(RCSfile.*\) \$/\1/' \
- -e 's/\$\(Revision.*\) \$/\1/' \
- -e 's/\$\(Source.*\) \$/\1/' \
- -e 's/\$\(State.*\) \$/\1/' \
- -e 's/\$\(NetBSD.*\) \$/\1/' \
- $f > /tmp/gdb2$$ && mv /tmp/gdb2$$ $f
-done
+cleantags "$FILE"
echo You can import now. Use the following command:
echo cvs import src/external/gpl3/gdb/dist FSF gdb-X-Y-Z
Index: src/external/ibm-public/postfix/postfix2netbsd
diff -u src/external/ibm-public/postfix/postfix2netbsd:1.2 src/external/ibm-public/postfix/postfix2netbsd:1.3
--- src/external/ibm-public/postfix/postfix2netbsd:1.2 Sun Jul 31 05:54:57 2011
+++ src/external/ibm-public/postfix/postfix2netbsd Sat Oct 8 15:28:40 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: postfix2netbsd,v 1.2 2011/07/31 09:54:57 tron Exp $
+# $NetBSD: postfix2netbsd,v 1.3 2011/10/08 19:28:40 christos Exp $
#
# Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -59,15 +59,7 @@ find . -type l | while read t; do
done
### Remove the $'s around RCS tags
-find . -type f -print | xargs egrep -l '\$(Id|Created|Header|Revision|Source)' | while read f; do
- sed -e 's/\$\(Id.*\) ?\$/\1/' \
- -e 's/\$\(Created.*\) \$/\1/' \
- -e 's/\$\(Header.*\) \$/\1/' \
- -e 's/\$\(Revision.*\) ?\$/\1/' \
- -e 's/\$\(Source.*\) ?\$/\1/' \
- $f > /tmp/postfix2$$ && mv /tmp/postfix2$$ $f && \
- echo "removed RCS tag from $f"
-done
+cleantags .
### Add our NetBSD RCS Id
find . -type f -name '*.[chly]' -print | while read c; do
Index: src/external/mit/lua/dist/lua2netbsd
diff -u src/external/mit/lua/dist/lua2netbsd:1.1 src/external/mit/lua/dist/lua2netbsd:1.2
--- src/external/mit/lua/dist/lua2netbsd:1.1 Sun Oct 31 07:18:20 2010
+++ src/external/mit/lua/dist/lua2netbsd Sat Oct 8 15:28:40 2011
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: lua2netbsd,v 1.1 2010/10/31 11:18:20 mbalmer Exp $
+# $NetBSD: lua2netbsd,v 1.2 2011/10/08 19:28:40 christos Exp $
# adapted from dist/ipf/ipf2netbsd:
# NetBSD: ipf2netbsd,v 1.23 2010/04/17 22:05:53 darrenr Exp $
#
@@ -31,17 +31,7 @@
# lua2netbsd: prepare a Lua source tree for NeBSD.
### Remove the $'s around various RCSIDs
-find src -type f -print | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- $f > /tmp/lua2f$$ && mv /tmp/lua2f$$ $f && \
- echo removed RCS tag from $f
-done
-
-find doc -type f -name '*.[0-9]' -print | while read f; do
- sed -e 's/\$\(Id.*\) \$/\1/' \
- $f > /tmp/lua2f$$ && mv /tmp/lua2f$$ $f && \
- echo removed RCS tag from $f
-done
+cleantags src doc
### Add our NetBSD RCS Id
find src -type f -name '*.[ch]' -print | while read c; do
