update to cdpack-1.2

change is that the automatically generated README.txt file is now
only generated if requested via the -R flag as opposed to always generating
the file.

Suggested by Hubert.

3 files changed, 25 insertions, 12 deletions

diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile
index 1a977561b44..6de6b75fd0a 100644
--- a/pkgtools/cdpack/Makefile
+++ b/pkgtools/cdpack/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/06/02 02:03:51 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/23 04:08:04 dmcmahill Exp $
 #
 
-DISTNAME=	cdpack-1.1
+DISTNAME=	cdpack-1.2
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/cdpack/files/cdpack.1 b/pkgtools/cdpack/files/cdpack.1
index 83ba6b01392..bf561728531 100644
--- a/pkgtools/cdpack/files/cdpack.1
+++ b/pkgtools/cdpack/files/cdpack.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cdpack.1,v 1.3 2001/06/02 02:03:52 dmcmahill Exp $
+.\" $NetBSD: cdpack.1,v 1.4 2001/06/23 04:08:04 dmcmahill Exp $
 .\"
 .\" Copyright (c) 2001 Dan McMahill, All rights reserved.
 .\"
@@ -37,7 +37,7 @@
 .Nd produce multi-CD binary package images
 .Sh SYNOPSIS
 .Nm ""
-.Op -nvV
+.Op -nRvV
 .Op -x extra_directory
 .Ar packages_directory
 .Ar cd_image_directory
@@ -58,11 +58,9 @@ directory
 .Ar cd_image_directory
 is used as a staging area and the final ISO 9660 images are left in
 that directory.  A file, 
-.Ar README.txt
-, will be left in the root of each CD image along with an index
-file
 .Ar .index
-which lists the contents of each CD.
+, 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 n
 Do not duplicate packages in order to prevent inter-CD dependencies.
@@ -80,6 +78,12 @@ places packages which are lower in the dependency tree on lower
 numbered CD-ROM's and packages which are higher on the higher numbered
 CD-ROM's.  In this fashion, a package on CD number n
 will have all of its dependencies on CD numbers 1 through n
+.It Fl R
+Generate a file,
+.Ar README.txt
+, which will be placed in the root directory of each CD image.  This
+README file contains a small amount of information about the contents
+of the CD set.
 .It Fl v
 Be verbose.  Currently does not change things much.
 .It Fl V
diff --git a/pkgtools/cdpack/files/cdpack.sh b/pkgtools/cdpack/files/cdpack.sh
index 928b66d7dab..f51af1679d3 100755
--- a/pkgtools/cdpack/files/cdpack.sh
+++ b/pkgtools/cdpack/files/cdpack.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cdpack.sh,v 1.2 2001/06/02 02:03:52 dmcmahill Exp $
+# $NetBSD: cdpack.sh,v 1.3 2001/06/23 04:08:04 dmcmahill Exp $
 #
 # Copyright (c) 2001 Dan McMahill, All rights reserved.
 #
@@ -55,7 +55,7 @@ mkdir $TMP
 
 usage(){
 	echo "$prog - generates ISO9660 images for a multi-cd binary package collection"
-	echo "Usage:      $prog [-n] [-v] [-V] [-x dir] [-X dir] packages_directory cdimage_directory"
+	echo "Usage:      $prog [-n] [-R] [-v] [-V] [-x dir] [-X dir] packages_directory cdimage_directory"
 	echo "Example:    $prog /usr/pkgsrc/packages/netbsd-1.5/alpha/All  /images/netbsd-1.5/alpha"
 	echo "Please refer to the manual page for complete documentation."
 }
@@ -79,6 +79,7 @@ fullpath(){
     echo $x
 }
 
+ADD_README=no
 DUP=yes
 VERBOSE=no
 VERSION=no
@@ -94,7 +95,12 @@ do
 	-n) DUP=no
 	    shift
 	    ;;
-	    
+	   
+	# automatically generate a README.txt file for each CD-ROM
+	-R) ADD_README=yes
+	    shift
+	    ;;
+
 	# be verbose 
 	-v) VERBOSE=yes
 	    shift
@@ -377,7 +383,10 @@ ncds=0
 for cdname in `cat $cdlist`
 do
     (cd ${cddir}/${cdname} && cp $indexf .index)
-    (cd ${cddir}/${cdname} && cp $readme README.txt)
+
+    if [ $ADD_README = "yes" ]; then
+       (cd ${cddir}/${cdname} && cp $readme README.txt)
+    fi
 
     if [ $USE_XTRA = "yes" ]; then
 	for f in $extra/*