Module Name: src
Committed By: dholland
Date: Sat Aug 27 21:53:39 UTC 2022
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/man: mi
src/doc: 3RDPARTY
src/external/bsd: Makefile
Added Files:
src/external/bsd/tradcpp: Makefile README
src/external/bsd/tradcpp/usr.bin: Makefile
Log Message:
Attach tradcpp to the build.
To generate a diff of this commit:
cvs rdiff -u -r1.1311 -r1.1312 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1753 -r1.1754 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1871 -r1.1872 src/doc/3RDPARTY
cvs rdiff -u -r1.75 -r1.76 src/external/bsd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tradcpp/Makefile \
src/external/bsd/tradcpp/README
cvs rdiff -u -r0 -r1.1 src/external/bsd/tradcpp/usr.bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1311 src/distrib/sets/lists/base/mi:1.1312
--- src/distrib/sets/lists/base/mi:1.1311 Wed Aug 17 14:03:05 2022
+++ src/distrib/sets/lists/base/mi Sat Aug 27 21:53:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1311 2022/08/17 14:03:05 kre Exp $
+# $NetBSD: mi,v 1.1312 2022/08/27 21:53:38 dholland Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -881,6 +881,7 @@
./usr/bin/tpm_version base-tpm-bin tpm
./usr/bin/tput base-util-bin
./usr/bin/tr base-util-bin
+./usr/bin/tradcpp base-util-bin
./usr/bin/true base-util-bin
./usr/bin/tset base-util-bin
./usr/bin/tty base-util-bin
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1753 src/distrib/sets/lists/man/mi:1.1754
--- src/distrib/sets/lists/man/mi:1.1753 Fri Aug 12 11:15:40 2022
+++ src/distrib/sets/lists/man/mi Sat Aug 27 21:53:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1753 2022/08/12 11:15:40 riastradh Exp $
+# $NetBSD: mi,v 1.1754 2022/08/27 21:53:38 dholland Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -594,6 +594,7 @@
./usr/share/man/cat1/tpm_version.0 man-tpm-catman tpm,.cat
./usr/share/man/cat1/tput.0 man-util-catman .cat
./usr/share/man/cat1/tr.0 man-util-catman .cat
+./usr/share/man/cat1/tradcpp.0 man-util-catman .cat
./usr/share/man/cat1/true.0 man-util-catman .cat
./usr/share/man/cat1/tset.0 man-util-catman .cat
./usr/share/man/cat1/tty.0 man-util-catman .cat
@@ -3920,6 +3921,7 @@
./usr/share/man/html1/tpm_version.html man-tpm-htmlman tpm,html
./usr/share/man/html1/tput.html man-util-htmlman html
./usr/share/man/html1/tr.html man-util-htmlman html
+./usr/share/man/html1/tradcpp.html man-util-htmlman html
./usr/share/man/html1/true.html man-util-htmlman html
./usr/share/man/html1/tset.html man-util-htmlman html
./usr/share/man/html1/tty.html man-util-htmlman html
@@ -6900,6 +6902,7 @@
./usr/share/man/man1/tpm_version.1 man-tpm-man tpm,.man
./usr/share/man/man1/tput.1 man-util-man .man
./usr/share/man/man1/tr.1 man-util-man .man
+./usr/share/man/man1/tradcpp.1 man-util-man .man
./usr/share/man/man1/true.1 man-util-man .man
./usr/share/man/man1/tset.1 man-util-man .man
./usr/share/man/man1/tty.1 man-util-man .man
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1871 src/doc/3RDPARTY:1.1872
--- src/doc/3RDPARTY:1.1871 Sat Aug 27 14:07:26 2022
+++ src/doc/3RDPARTY Sat Aug 27 21:53:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1871 2022/08/27 14:07:26 christos Exp $
+# $NetBSD: 3RDPARTY,v 1.1872 2022/08/27 21:53:38 dholland Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -1409,6 +1409,18 @@ Location: usr.sbin/traceroute
Notes:
Added changes from a5 -> a12 manually.
+Package: tradcpp
+Version: 0.5.3
+Current Vers: 0.5.3
+Maintainer: David A. Holland <dholl...@netbsd.org>
+Archive Site: https://ftp.netbsd.org/pub/NetBSD/misc/dholland/
+Home Page: https://www.netbsd.org/~dholland/tradcpp/
+Mailing List: tech-toolchain
+Responsible: dholland
+License: BSD (2-clause)
+Location: external/bsd/tradcpp
+Notes:
+
Package: tz
Version: tzcode2022c / tzdata2022bgtz (tzdata2022c)
Current Vers: tzcode2022c / tzdata2022c
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.75 src/external/bsd/Makefile:1.76
--- src/external/bsd/Makefile:1.75 Mon Jun 6 10:56:28 2022
+++ src/external/bsd/Makefile Sat Aug 27 21:53:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2022/06/06 10:56:28 nia Exp $
+# $NetBSD: Makefile,v 1.76 2022/08/27 21:53:38 dholland Exp $
.include <bsd.own.mk>
@@ -44,6 +44,6 @@ SUBDIR+= librtld_db
SUBDIR+= unbound
.endif
-SUBDIR+= blocklist pdisk nvi ppp libnv
+SUBDIR+= blocklist pdisk nvi ppp libnv tradcpp
.include <bsd.subdir.mk>
Added files:
Index: src/external/bsd/tradcpp/Makefile
diff -u /dev/null src/external/bsd/tradcpp/Makefile:1.1
--- /dev/null Sat Aug 27 21:53:39 2022
+++ src/external/bsd/tradcpp/Makefile Sat Aug 27 21:53:38 2022
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2022/08/27 21:53:38 dholland Exp $
+
+SUBDIR= usr.bin
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/tradcpp/README
diff -u /dev/null src/external/bsd/tradcpp/README:1.1
--- /dev/null Sat Aug 27 21:53:39 2022
+++ src/external/bsd/tradcpp/README Sat Aug 27 21:53:38 2022
@@ -0,0 +1,28 @@
+$NetBSD: README,v 1.1 2022/08/27 21:53:38 dholland Exp $
+
+To update tradcpp to a new version:
+
+- Unpack the tradcpp distfile. Unless things have changed a lot
+ upstream, you can import the distribution directory directly as
+ external/bsd/tradcpp/dist without needing to munge or prepare it.
+- Update the build glue/reacharound makefile, if needed. For the
+ moment, we just include the distribution makefile as it's suitable,
+ and therefore things like source lists don't need to be synced. If
+ the distribution makefile becomes unsuitable, this will need to
+ change.
+- cvs import the new dist directory.
+- Merge. (As long as we're stuck using cvs, please avoid committing to
+ the default branch in the tradcpp/dist subtree so this step isn't
+ necessary, as it's a big headache.)
+- Fix any merge conflicts.
+- Commit the merge.
+- Commit any changes to the build glue.
+- Update doc/3RDPARTY with the new version.
+- Add a note to doc/CHANGES about the new version.
+
+Note that this is not the maintenance copy of tradcpp; it is
+maintained in its own hg repository.
+
+Please if possible avoid committing changes to this version; instead,
+please send them upstream. Issuing a new release only takes a few
+minutes and allows the fixes/updates to propagate to pkgsrc.
Index: src/external/bsd/tradcpp/usr.bin/Makefile
diff -u /dev/null src/external/bsd/tradcpp/usr.bin/Makefile:1.1
--- /dev/null Sat Aug 27 21:53:39 2022
+++ src/external/bsd/tradcpp/usr.bin/Makefile Sat Aug 27 21:53:38 2022
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2022/08/27 21:53:38 dholland Exp $
+
+.include <bsd.own.mk>
+
+SRCDIR=${NETBSDSRCDIR}/external/bsd/tradcpp/dist
+.PATH: ${SRCDIR}
+
+BINDIR=/usr/bin
+
+# Use the distributed makefile instead of pasting from it.
+# (It ships a makefile that uses bsd.prog.mk, at least for the
+# time being.)
+
+.include "${SRCDIR}/Makefile"
