Module Name: src
Committed By: rillig
Date: Sun Sep 8 10:02:00 UTC 2024
Modified Files:
src/crypto/external/bsd/openssh: openssh2netbsd
src/external/bsd/byacc: byacc2netbsd
src/external/bsd/flex: flex2netbsd
src/external/bsd/ipf: ipf2netbsd
src/external/bsd/libbind/dist: libbind2netbsd
src/external/bsd/libpcap: libpcap2netbsd
src/external/bsd/ntp: ntp2netbsd
src/external/gpl3/binutils: binutils2netbsd
src/external/gpl3/binutils.old: binutils2netbsd
src/external/gpl3/gcc: gcc2netbsd
src/external/gpl3/gdb: gdb2netbsd
src/external/gpl3/gdb.old: gdb2netbsd
src/external/mpl/bind: bind2netbsd
src/sys/dev/pci/bktr: bktr2netbsd
Log Message:
normalize wording in import helpers
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/openssh2netbsd
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/byacc2netbsd
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/flex2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/ipf2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libbind/dist/libbind2netbsd
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/libpcap2netbsd
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/ntp2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/binutils2netbsd
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils.old/binutils2netbsd
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/gcc2netbsd
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/gdb2netbsd
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb.old/gdb2netbsd
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/bind2netbsd
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/bktr/bktr2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/openssh2netbsd
diff -u src/crypto/external/bsd/openssh/openssh2netbsd:1.5 src/crypto/external/bsd/openssh/openssh2netbsd:1.6
--- src/crypto/external/bsd/openssh/openssh2netbsd:1.5 Mon Jul 8 22:33:43 2024
+++ src/crypto/external/bsd/openssh/openssh2netbsd Sun Sep 8 10:01:58 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: openssh2netbsd,v 1.5 2024/07/08 22:33:43 christos Exp $
+# $NetBSD: openssh2netbsd,v 1.6 2024/09/08 10:01:58 rillig Exp $
#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# openssh2netbsd: convert a openssh source tree into netbsd openssh tree
+# openssh2netbsd: convert an openssh source tree into netbsd openssh tree
if [ -z "$1" ]; then
echo "Usage: $0 <dir>" 1>&2
Index: src/external/bsd/byacc/byacc2netbsd
diff -u src/external/bsd/byacc/byacc2netbsd:1.5 src/external/bsd/byacc/byacc2netbsd:1.6
--- src/external/bsd/byacc/byacc2netbsd:1.5 Mon Jun 5 18:54:30 2017
+++ src/external/bsd/byacc/byacc2netbsd Sun Sep 8 10:01:58 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: byacc2netbsd,v 1.5 2017/06/05 18:54:30 christos Exp $
+# $NetBSD: byacc2netbsd,v 1.6 2024/09/08 10:01:58 rillig Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# byacc2netbsd: convert a byacc tree into a
+# byacc2netbsd: convert a byacc source tree into a
# netbsd byacc source tree, under src/external/bsd/byacc/dist,
# based on byacc2netbsd by Bernd Ernesti and changes by Simon Burge
#
Index: src/external/bsd/flex/flex2netbsd
diff -u src/external/bsd/flex/flex2netbsd:1.5 src/external/bsd/flex/flex2netbsd:1.6
--- src/external/bsd/flex/flex2netbsd:1.5 Sat Jan 7 15:45:14 2017
+++ src/external/bsd/flex/flex2netbsd Sun Sep 8 10:01:58 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: flex2netbsd,v 1.5 2017/01/07 15:45:14 christos Exp $
+# $NetBSD: flex2netbsd,v 1.6 2024/09/08 10:01:58 rillig Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# flex2netbsd: convert a flex tree into a
+# flex2netbsd: convert a flex source tree into a
# netbsd flex source tree, under src/external/bsd/flex/dist,
# based on flex2netbsd by Bernd Ernesti and changes by Simon Burge
#
Index: src/external/bsd/ipf/ipf2netbsd
diff -u src/external/bsd/ipf/ipf2netbsd:1.2 src/external/bsd/ipf/ipf2netbsd:1.3
--- src/external/bsd/ipf/ipf2netbsd:1.2 Fri Mar 23 23:14:34 2012
+++ src/external/bsd/ipf/ipf2netbsd Sun Sep 8 10:01:59 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: ipf2netbsd,v 1.2 2012/03/23 23:14:34 christos Exp $
+# $NetBSD: ipf2netbsd,v 1.3 2024/09/08 10:01:59 rillig Exp $
#
# Copyright (c) 1999 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# ipf2netbsd: convert a ipf source tree into a netbsd ipf source tree,
+# ipf2netbsd: convert an ipf source tree into a netbsd ipf source tree,
# under src/dist/ipf, src/sys/dist/ipf/netinet, src/sys/lkm/netinet/if_ipl
# and src/regress/sys/kern/ipf
Index: src/external/bsd/libbind/dist/libbind2netbsd
diff -u src/external/bsd/libbind/dist/libbind2netbsd:1.2 src/external/bsd/libbind/dist/libbind2netbsd:1.3
--- src/external/bsd/libbind/dist/libbind2netbsd:1.2 Sat Oct 8 19:28:39 2011
+++ src/external/bsd/libbind/dist/libbind2netbsd Sun Sep 8 10:01:59 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: libbind2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
+# $NetBSD: libbind2netbsd,v 1.3 2024/09/08 10:01:59 rillig Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# libbind2netbsd: convert abind tree into a
+# libbind2netbsd: convert a bind source tree into a
# netbsd libbind source tree, under src/external/bsd,
# based on bind2netbsd by Bernd Ernesti and changes by Simon Burge
#
Index: src/external/bsd/libpcap/libpcap2netbsd
diff -u src/external/bsd/libpcap/libpcap2netbsd:1.3 src/external/bsd/libpcap/libpcap2netbsd:1.4
--- src/external/bsd/libpcap/libpcap2netbsd:1.3 Mon Sep 2 15:33:36 2024
+++ src/external/bsd/libpcap/libpcap2netbsd Sun Sep 8 10:01:59 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: libpcap2netbsd,v 1.3 2024/09/02 15:33:36 christos Exp $
+# $NetBSD: libpcap2netbsd,v 1.4 2024/09/08 10:01:59 rillig Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,8 +26,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# libpcap2netbsd: convert an libpcap source tree into a
-# netbsd libpcap source tree, under src/dist,
+# libpcap2netbsd: convert a libpcap source tree into a
+# netbsd libpcap source tree, under src/dist.
#
# Rough instructions for importing new libpcap release:
#
Index: src/external/bsd/ntp/ntp2netbsd
diff -u src/external/bsd/ntp/ntp2netbsd:1.9 src/external/bsd/ntp/ntp2netbsd:1.10
--- src/external/bsd/ntp/ntp2netbsd:1.9 Sun Aug 18 20:49:59 2024
+++ src/external/bsd/ntp/ntp2netbsd Sun Sep 8 10:01:59 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: ntp2netbsd,v 1.9 2024/08/18 20:49:59 christos Exp $
+# $NetBSD: ntp2netbsd,v 1.10 2024/09/08 10:01:59 rillig Exp $
#
# Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# ntp2netbsd: convert a ntp source tree into a
+# ntp2netbsd: convert an ntp source tree into a
# netbsd ntp source tree, under src/dist,
# based on bind2netbsd by Bernd Ernesti
#
Index: src/external/gpl3/binutils/binutils2netbsd
diff -u src/external/gpl3/binutils/binutils2netbsd:1.2 src/external/gpl3/binutils/binutils2netbsd:1.3
--- src/external/gpl3/binutils/binutils2netbsd:1.2 Fri Apr 3 23:46:43 2020
+++ src/external/gpl3/binutils/binutils2netbsd Sun Sep 8 10:01:59 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: binutils2netbsd,v 1.2 2020/04/03 23:46:43 christos Exp $
+# $NetBSD: binutils2netbsd,v 1.3 2024/09/08 10:01:59 rillig Exp $
#
# Copyright (c) 2016 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# binutils2netbsd: convert a file source tree into a
+# binutils2netbsd: convert a binutils source tree into a
# format suitable for import. Works on first arg dir.
# You can run this only once if you want it to work.
#
Index: src/external/gpl3/binutils.old/binutils2netbsd
diff -u src/external/gpl3/binutils.old/binutils2netbsd:1.6 src/external/gpl3/binutils.old/binutils2netbsd:1.7
--- src/external/gpl3/binutils.old/binutils2netbsd:1.6 Sat Jun 29 16:35:40 2024
+++ src/external/gpl3/binutils.old/binutils2netbsd Sun Sep 8 10:01:59 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: binutils2netbsd,v 1.6 2024/06/29 16:35:40 christos Exp $
+# $NetBSD: binutils2netbsd,v 1.7 2024/09/08 10:01:59 rillig Exp $
#
# Copyright (c) 2016 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# binutils2netbsd: convert a file source tree into a
+# binutils2netbsd: convert a binutils source tree into a
# format suitable for import. Works on first arg dir.
# You can run this only once if you want it to work.
#
Index: src/external/gpl3/gcc/gcc2netbsd
diff -u src/external/gpl3/gcc/gcc2netbsd:1.8 src/external/gpl3/gcc/gcc2netbsd:1.9
--- src/external/gpl3/gcc/gcc2netbsd:1.8 Tue Jun 2 08:03:59 2020
+++ src/external/gpl3/gcc/gcc2netbsd Sun Sep 8 10:01:59 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: gcc2netbsd,v 1.8 2020/06/02 08:03:59 mrg Exp $
+# $NetBSD: gcc2netbsd,v 1.9 2024/09/08 10:01:59 rillig Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# gcc2netbsd: convert a file source tree into a
+# gcc2netbsd: convert a gcc source tree into a
# format suitable for import. Works on first arg dir.
# You can run this only once if you want it to work.
#
Index: src/external/gpl3/gdb/gdb2netbsd
diff -u src/external/gpl3/gdb/gdb2netbsd:1.3 src/external/gpl3/gdb/gdb2netbsd:1.4
--- src/external/gpl3/gdb/gdb2netbsd:1.3 Tue Sep 15 02:05:15 2020
+++ src/external/gpl3/gdb/gdb2netbsd Sun Sep 8 10:01:59 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: gdb2netbsd,v 1.3 2020/09/15 02:05:15 christos Exp $
+# $NetBSD: gdb2netbsd,v 1.4 2024/09/08 10:01:59 rillig Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# gdb2netbsd: convert a file source tree into a
+# gdb2netbsd: convert a gdb source tree into a
# format suitable for import. Works on current dir.
# You can run this only once if you want it to work.
#
Index: src/external/gpl3/gdb.old/gdb2netbsd
diff -u src/external/gpl3/gdb.old/gdb2netbsd:1.10 src/external/gpl3/gdb.old/gdb2netbsd:1.11
--- src/external/gpl3/gdb.old/gdb2netbsd:1.10 Mon Aug 12 20:30:04 2024
+++ src/external/gpl3/gdb.old/gdb2netbsd Sun Sep 8 10:02:00 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: gdb2netbsd,v 1.10 2024/08/12 20:30:04 christos Exp $
+# $NetBSD: gdb2netbsd,v 1.11 2024/09/08 10:02:00 rillig Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# gdb2netbsd: convert a file source tree into a
+# gdb2netbsd: convert a gdb source tree into a
# format suitable for import. Works on current dir.
# You can run this only once if you want it to work.
#
Index: src/external/mpl/bind/bind2netbsd
diff -u src/external/mpl/bind/bind2netbsd:1.6 src/external/mpl/bind/bind2netbsd:1.7
--- src/external/mpl/bind/bind2netbsd:1.6 Sun May 24 19:46:10 2020
+++ src/external/mpl/bind/bind2netbsd Sun Sep 8 10:02:00 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: bind2netbsd,v 1.6 2020/05/24 19:46:10 christos Exp $
+# $NetBSD: bind2netbsd,v 1.7 2024/09/08 10:02:00 rillig Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# bind2netbsd: convert a bind tree into a
+# bind2netbsd: convert a bind source tree into a
# netbsd bind source tree, under src/external/mpl/bind/dist,
# based on bind2netbsd by Bernd Ernesti and changes by Simon Burge
#
Index: src/sys/dev/pci/bktr/bktr2netbsd
diff -u src/sys/dev/pci/bktr/bktr2netbsd:1.6 src/sys/dev/pci/bktr/bktr2netbsd:1.7
--- src/sys/dev/pci/bktr/bktr2netbsd:1.6 Wed Apr 30 13:10:59 2008
+++ src/sys/dev/pci/bktr/bktr2netbsd Sun Sep 8 10:02:00 2024
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: bktr2netbsd,v 1.6 2008/04/30 13:10:59 martin Exp $
+# $NetBSD: bktr2netbsd,v 1.7 2024/09/08 10:02:00 rillig Exp $
#
# Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# bktr2netbsd: convert sourceforge bktr source directory tree into
+# bktr2netbsd: convert sourceforge bktr source tree into
# netbsd bktr source tree, under sys/dev/pci/bktr
# originally based on bind2netbsd by Bernd Ernesti
