default the config file to PKG_SYSCONFDIR/cdrecord.conf unless

overridden by the user via CDRECORD_CONF.

You must move your config file to the new location if you update!

patch man pages and print a MESSAGE if CDRECORD_CONF is not set to
`/etc/default/cdrecord', as required by license.

bump PKGREVISION.

addresses PR pkg/20593 from Steven M. Bellovin.

6 files changed, 92 insertions, 4 deletions

diff --git a/sysutils/cdrecord/MESSAGE.cdrecord.conf b/sysutils/cdrecord/MESSAGE.cdrecord.conf
new file mode 100644
index 00000000000..e710d5e0ccf
--- /dev/null
+++ b/sysutils/cdrecord/MESSAGE.cdrecord.conf
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE.cdrecord.conf,v 1.1 2003/03/08 08:16:58 grant Exp $
+
+Note: The location of the ${PKGNAME_NOREV} `defaults' file has been set to
+
+	${CDRECORD_CONF}
+
+This is the pkgsrc standard config file location, NOT the ${PKGNAME_NOREV}
+standard location, which is /etc/default/cdrecord.
+
+The reason for this is that pkgsrc packages should not use configuration
+files outside ${LOCALBASE} unless they are explicitly set by the user.
+
+===========================================================================
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index df221b22664..7b95c871e9e 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.46 2003/02/13 06:35:45 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2003/03/08 08:16:58 grant Exp $
 
 DISTNAME=	cdrtools-2.0
 PKGNAME=	cdrecord-2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/
 
 MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
-COMMENT=	This program allows you to create CD's on a CD-Recorder
+COMMENT=	This program allows you to create CDs on a CD-Recorder
 
 CONFLICTS=	mkisofs-[0-9]*
 
@@ -29,6 +29,27 @@ MAKE_ENV+=      MAKEPROG="gmake"
 MAKE_ENV+=	COPTX="${CFLAGS}"
 MAKE_ENV+=	LDOPTX="${LDFLAGS}"
 
+# allow us to override the default /etc/default/cdrecord by patching
+# the documentation appropriately. Additionally, we also provide a
+# MESSAGE stating the reasons we do this, as required by the license.
+CDRECORD_CONF?=	${PKG_SYSCONFDIR}/cdrecord.conf
+
+.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
+MESSAGE_SRC+=	MESSAGE.cdrecord.conf
+MESSAGE_SUBST+=	PKGNAME_NOREV=${PKGNAME_NOREV}
+MESSAGE_SUBST+=	CDRECORD_CONF=${CDRECORD_CONF}
+.endif
+
+CDRECORD_CONF_FILES=	cdrecord/defaults.c cdrecord/cdrecord.1
+CDRECORD_CONF_FILES+=	readcd/readcd.1
+
+post-patch:
+	@cd ${WRKSRC}; for file in ${CDRECORD_CONF_FILES}; do		\
+		${MV} ${WRKSRC}/$$file ${WRKSRC}/$${file}.old &&	\
+		${SED} -e 's|@CDRECORD_CONF@|${CDRECORD_CONF}|'	\
+			${WRKSRC}/$${file}.old > ${WRKSRC}/$$file;	\
+	done
+
 do-configure:
 	cd ${WRKSRC}/RULES;						\
 	for suffix in netbsd-cc.rul netbsd-gcc.rul; do			\
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo
index d3019fab187..79b60a2952f 100644
--- a/sysutils/cdrecord/distinfo
+++ b/sysutils/cdrecord/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2003/01/03 16:27:09 lukem Exp $
+$NetBSD: distinfo,v 1.9 2003/03/08 08:16:58 grant Exp $
 
 SHA1 (cdrtools-2.0.tar.gz) = a6645d541a40a0374d6ebffae699555273e41cb0
 Size (cdrtools-2.0.tar.gz) = 1583252 bytes
@@ -8,3 +8,6 @@ SHA1 (patch-ai) = 38f6bc8a9deee6861d5589dcf65dcd4968614457
 SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b
 SHA1 (patch-ba) = 8d7038282ba5a6b133544cc8e440f6e12a475990
 SHA1 (patch-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9
+SHA1 (patch-ca) = 5dbc3d3f248781627b6d6100808c70db60e83bd4
+SHA1 (patch-cb) = 8119e171e7308c0bb095b6a1d760473d8cc89120
+SHA1 (patch-cc) = a14098dd14e0b58d3fed1167341a22167eea7c19
diff --git a/sysutils/cdrecord/patches/patch-ca b/sysutils/cdrecord/patches/patch-ca
new file mode 100644
index 00000000000..0df50707d4a
--- /dev/null
+++ b/sysutils/cdrecord/patches/patch-ca
@@ -0,0 +1,13 @@
+$NetBSD: patch-ca,v 1.1 2003/03/08 08:16:59 grant Exp $
+
+--- cdrecord/defaults.c.orig	Thu Aug 15 03:52:00 2002
++++ cdrecord/defaults.c
+@@ -53,7 +53,7 @@ open_cdrdefaults()
+ 	 * don't contribute work and don't give support, they are causing extra
+ 	 * work for me and this way slow down the cdrecord development.
+ 	 */
+-	return (defltopen("/etc/default/cdrecord"));
++	return (defltopen("@CDRECORD_CONF@"));
+ }
+ 
+ EXPORT void
diff --git a/sysutils/cdrecord/patches/patch-cb b/sysutils/cdrecord/patches/patch-cb
new file mode 100644
index 00000000000..88a2ea95c19
--- /dev/null
+++ b/sysutils/cdrecord/patches/patch-cb
@@ -0,0 +1,24 @@
+$NetBSD: patch-cb,v 1.1 2003/03/08 08:16:59 grant Exp $
+
+--- cdrecord/cdrecord.1.orig	Sat Mar  8 18:45:54 2003
++++ cdrecord/cdrecord.1
+@@ -1418,8 +1418,8 @@ login shell.
+ 
+ .SH FILES
+ .TP
+-/etc/default/cdrecord
+-Default values can be set for the following options in /etc/default/cdrecord.
++@CDRECORD_CONF@
++Default values can be set for the following options in @CDRECORD_CONF@.
+ For example:
+ .SM CDR_FIFOSIZE=8m
+ or
+@@ -1428,7 +1428,7 @@ or
+ .TP
+ CDR_DEVICE
+ This may either hold a device identifier that is suitable to the open
+-call of the SCSI transport library or a label in the file /etc/default/cdrecord 
++call of the SCSI transport library or a label in the file @CDRECORD_CONF@
+ that allows to identify a specific drive on the system.
+ .TP
+ CDR_SPEED
diff --git a/sysutils/cdrecord/patches/patch-cc b/sysutils/cdrecord/patches/patch-cc
new file mode 100644
index 00000000000..795fe862e6e
--- /dev/null
+++ b/sysutils/cdrecord/patches/patch-cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-cc,v 1.1 2003/03/08 08:16:59 grant Exp $
+
+--- readcd/readcd.1.orig	Wed Dec 25 02:28:41 2002
++++ readcd/readcd.1
+@@ -186,7 +186,7 @@ If the argument to the
+ .B dev=
+ option does not contain the characters ',', '/', '@' or ':',
+ it is interpreted as an label name that may be found in the file
+-/etc/default/cdrecord (see FILES section).
++@CDRECORD_CONF@ (see FILES section).
+ .TP
+ .BI timeout= #
+ Set the default SCSI command timeout value to