update to cdpack-1.4.1.

This update adds a prominant message at the end of the run explicitly stating
which class of NO_BIN_ON_{FTP,CDROM} pkgs have been included or excluded
from the set. This should help prevent accidental license violations.

Suggested by Hubert Feyrer in private email.

3 files changed, 54 insertions, 8 deletions

diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile
index a0d59cfd6f9..6f4ab951f71 100644
--- a/pkgtools/cdpack/Makefile
+++ b/pkgtools/cdpack/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/05/19 07:59:46 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2002/05/22 22:30:43 dmcmahill Exp $
 #
 
-DISTNAME=	cdpack-1.4
+DISTNAME=	cdpack-1.4.1
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/cdpack/files/cdpack.1 b/pkgtools/cdpack/files/cdpack.1
index f502bbfecef..6d1ffabf5fa 100644
--- a/pkgtools/cdpack/files/cdpack.1
+++ b/pkgtools/cdpack/files/cdpack.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cdpack.1,v 1.7 2002/05/19 07:59:47 dmcmahill Exp $
+.\" $NetBSD: cdpack.1,v 1.8 2002/05/22 22:30:44 dmcmahill Exp $
 .\"
 .\" Copyright (c) 2001 Dan McMahill, All rights reserved.
 .\"
@@ -65,15 +65,21 @@ that directory.  A file,
 which lists the contents of each CD will be left in the root
 directory of each CD image.
 .Bl -tag -width "-x directory "
-.It Fl a
+.It Fl ac
 Include binary packages marked as NO_BIN_ON_CDROM on the CD set.
 The default is to omit any
 packages which were marked as NO_BIN_ON_CDROM.  This option should
 only be used when making a CD set for personal use and not for
 distribution unless you are sure you have not violated any licenses.
+.It Fl af
+Include binary packages marked as NO_BIN_ON_FTP on the CD set.
+This option is enabled by default.
 .It Fl d
 Enable debugging by not deleting temporary files at the end of the
 run.  These files are left in TMPDIR.
+.It Fl ec
+Exclude packages marked as NO_BIN_ON_CDROM from the CD set.  This is
+the default.
 .It Fl ef
 Exclude packages marked as NO_BIN_ON_FTP from the CD set.  The default
 is to allow packages which are NO_BIN_ON_FTP.
diff --git a/pkgtools/cdpack/files/cdpack.sh b/pkgtools/cdpack/files/cdpack.sh
index 6179760b92c..381075a49bf 100755
--- a/pkgtools/cdpack/files/cdpack.sh
+++ b/pkgtools/cdpack/files/cdpack.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cdpack.sh,v 1.5 2002/05/19 07:59:47 dmcmahill Exp $
+# $NetBSD: cdpack.sh,v 1.6 2002/05/22 22:30:45 dmcmahill Exp $
 #
 # Copyright (c) 2001, 2002 Dan McMahill, All rights reserved.
 #
@@ -104,7 +104,12 @@ do
     case "$1"
     in
 	# allow NO_BIN_ON_CDROM packages
-	-a) ALLOW_NO_BIN_ON_CDROM=yes
+	-ac) ALLOW_NO_BIN_ON_CDROM=yes
+	    shift
+	    ;;
+
+	# allow NO_BIN_ON_FTP packages
+	-af) ALLOW_NO_BIN_ON_FTP=yes
 	    shift
 	    ;;
 
@@ -113,6 +118,11 @@ do
 	    shift
 	    ;;
 
+	# exclude NO_BIN_ON_CDROM packages
+	-ec) ALLOW_NO_BIN_ON_CDROM=no
+	    shift
+	    ;;
+
 	# exclude NO_BIN_ON_FTP packages
 	-ef) ALLOW_NO_BIN_ON_FTP=no
 	    shift
@@ -281,22 +291,26 @@ do
 		# check to see if we're allowed to add this package to the CD set
 		NO_BIN_ON_CDROM=`awk -F "=" '/NO_BIN_ON_CDROM/ {print $2}' $TMP/+BUILD_INFO`
 		if [ ! -z "$NO_BIN_ON_CDROM" ]; then
-		    echo "$pkg:  NO_BIN_ON_CDROM=$NO_BIN_ON_CDROM" >> $restricted
 		    if [ "$ALLOW_NO_BIN_ON_CDROM" = "no" ]; then
+		    	echo "EXCLUDED $pkgname:  NO_BIN_ON_CDROM=$NO_BIN_ON_CDROM" >> $restricted
 			if [ "$VERBOSE" = "yes" ]; then
 			    echo "Excluding $pkg because NO_BIN_ON_CDROM=$NO_BIN_ON_CDROM"
 			    echo "$pkgname" >> $exclude
 			fi
+		    else
+		    	echo "INCLUDED $pkgname:  NO_BIN_ON_CDROM=$NO_BIN_ON_CDROM" >> $restricted
 		    fi
 		fi
 		NO_BIN_ON_FTP=`awk -F "=" '/NO_BIN_ON_FTP/ {print $2}' $TMP/+BUILD_INFO`
 		if [ ! -z "$NO_BIN_ON_FTP" ]; then
-		    echo "$pkg:  NO_BIN_ON_FTP=$NO_BIN_ON_FTP" >> $restricted
 		    if [ "$ALLOW_NO_BIN_ON_FTP" = "no" ]; then
+		        echo "EXCLUDED $pkgname:  NO_BIN_ON_FTP=$NO_BIN_ON_FTP" >> $restricted
 			if [ "$VERBOSE" = "yes" ]; then
 			    echo "Excluding $pkg because NO_BIN_ON_FTP=$NO_BIN_ON_FTP"
 			    echo "$pkgname" >> $exclude
 			fi
+		    else
+		        echo "INCLUDED $pkgname:  NO_BIN_ON_FTP=$NO_BIN_ON_FTP" >> $restricted
 		    fi
 		fi
 
@@ -561,6 +575,32 @@ if [ -f $warnings ]; then
 	cat $warnings
 fi
 
+echo "-------------------------------------------------------"
+echo "* Please note:  This CD set was created with          *"
+echo "*                                                     *"
+if [ "$ALLOW_NO_BIN_ON_CDROM" = "no" ]; then
+    echo "*   - NO_BIN_ON_CDROM packages excluded.              *"
+else
+    echo "*   - NO_BIN_ON_CDROM packages INCLUDED.  Please      *"
+    echo "*     verify that you will not violate any licenses   *"
+    echo "*     with this CD set.  Refer to the /.restricted    *"
+    echo "*     file which has been placed on each CD in the    *"
+    echo "*     set for details.                                *"
+fi
+echo "*                                                     *"
+if [ "$ALLOW_NO_BIN_ON_FTP" = "no" ]; then
+    echo "*   - NO_BIN_ON_FTP packages excluded.                *"
+else
+    echo "*   - NO_BIN_ON_FTP packages INCLUDED.  You should    *"
+    echo "*     not make this CD set available via FTP as it    *"
+    echo "*     would violate the license on one or more        *"
+    echo "*     packages.  Refer to the /.restricted file       *"
+    echo "*     which has been placed on each CD in the         *"
+    echo "*     set for details.                                *"
+fi
+echo "*                                                     *"
+echo "-------------------------------------------------------"
+
 echo " "
 echo "$prog finished: `date`" 
 echo " "