[pkgsrc/trunk]: pkgsrc/sysutils/cdrtools Instead of patch+SUBST just use SUBS...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/64ff71c5dd7a
branches:  trunk
changeset: 529674:64ff71c5dd7a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 08 23:04:54 2007 +0000

description:
Instead of patch+SUBST just use SUBST (as done in pkgsrc-wip version
of the package).

diffstat:

 sysutils/cdrtools/Makefile         |  12 ++++--
 sysutils/cdrtools/distinfo         |  10 +----
 sysutils/cdrtools/patches/patch-ca |  13 -------
 sysutils/cdrtools/patches/patch-cb |  67 --------------------------------------
 sysutils/cdrtools/patches/patch-cc |  13 -------
 sysutils/cdrtools/patches/patch-ck |  13 -------
 sysutils/cdrtools/patches/patch-cl |  39 ----------------------
 sysutils/cdrtools/patches/patch-cm |  13 -------
 8 files changed, 10 insertions(+), 170 deletions(-)

diffs (233 lines):

diff -r 561552e73d72 -r 64ff71c5dd7a sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile        Fri Jun 08 23:04:35 2007 +0000
+++ b/sysutils/cdrtools/Makefile        Fri Jun 08 23:04:54 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/05/29 15:32:16 obache Exp $
+# $NetBSD: Makefile,v 1.15 2007/06/08 23:04:54 wiz Exp $
 
 DISTNAME=      cdrtools-2.01.01a27
 PKGNAME=       cdrtools-2.01.01.27
@@ -51,9 +51,13 @@
 
 SUBST_CLASSES+=                fix
 SUBST_STAGE.fix=       post-patch
-SUBST_FILES.fix=       cdrecord/defaults.c cdrecord/cdrecord.1 \
-                       readcd/readcd.1
-SUBST_SED.fix=         -e "s,@CDRECORD_CONF@,${CDRECORD_CONF},g"
+SUBST_FILES.fix=       btcflash/btcflash.1
+SUBST_FILES.fix+=      cdrecord/cdrecord.1
+SUBST_FILES.fix+=      cdrecord/defaults.c
+SUBST_FILES.fix+=      mkisofs/diag/isoinfo.8
+SUBST_FILES.fix+=      readcd/readcd.1
+SUBST_FILES.fix+=      scgcheck/scgcheck.1
+SUBST_SED.fix=         -e "s,/etc/default/cdrecord,${CDRECORD_CONF},g"
 SUBST_MESSAGE.fix=     Fixing paths.
 
 post-extract:
diff -r 561552e73d72 -r 64ff71c5dd7a sysutils/cdrtools/distinfo
--- a/sysutils/cdrtools/distinfo        Fri Jun 08 23:04:35 2007 +0000
+++ b/sysutils/cdrtools/distinfo        Fri Jun 08 23:04:54 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/05/29 15:32:16 obache Exp $
+$NetBSD: distinfo,v 1.7 2007/06/08 23:04:54 wiz Exp $
 
 SHA1 (cdrtools-2.01.01a27.tar.bz2) = fcb9bcdb697e474f2e60889fe64571b06442ffb4
 RMD160 (cdrtools-2.01.01a27.tar.bz2) = c009cf067318da565a66420009406265df12b645
@@ -10,14 +10,8 @@
 SHA1 (patch-aj) = 8f5c57f7b5ebc4ae9188212c9599d0431f0ce785
 SHA1 (patch-ba) = 8a1d6b7703e0885fe080e4a71aeabd0bb4302381
 SHA1 (patch-bb) = d9a94fc48430988b86b6a4a08a01e6a7ed95669f
-SHA1 (patch-ca) = b7a2f9a511852cca018a090086e46d299e4e1ce0
-SHA1 (patch-cb) = 39e5ab3ef417d32fa5ef9f9dd1313193ce647162
-SHA1 (patch-cc) = 709590dbb45c37e3a6b07322167f38c95fcb2fdf
 SHA1 (patch-cd) = 9477e87b3e4a52d18532e276f5507975611dd727
 SHA1 (patch-ce) = a57b73b2edac23903439136c874a1e2d0f895e70
 SHA1 (patch-cf) = 73fc95f53b85f637d4eb81a8b79355863c539ba7
-SHA1 (patch-cg) = d59b660609a2928e872bcde8393ad6eec51798bd
+SHA1 (patch-cg) = cf65297ee7736a140dd9dfc7f2f395a3471ac30e
 SHA1 (patch-cj) = d1ebb5950ef434ff9b0e42d03e41e1bd247874d9
-SHA1 (patch-ck) = 394c92976b7da8d55433ec4c59a6439563b28c56
-SHA1 (patch-cl) = 89aade26d8e2c01b11144c011fde90a2b7ae0a17
-SHA1 (patch-cm) = 405234b554c69733c1bfee19eca2847e97c6f9da
diff -r 561552e73d72 -r 64ff71c5dd7a sysutils/cdrtools/patches/patch-ca
--- a/sysutils/cdrtools/patches/patch-ca        Fri Jun 08 23:04:35 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.2 2007/03/16 22:04:54 bad Exp $
-
---- cdrecord/defaults.c.orig   2006-09-13 17:35:12.000000000 +0200
-+++ cdrecord/defaults.c
-@@ -50,7 +50,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 -r 561552e73d72 -r 64ff71c5dd7a sysutils/cdrtools/patches/patch-cb
--- a/sysutils/cdrtools/patches/patch-cb        Fri Jun 08 23:04:35 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-$NetBSD: patch-cb,v 1.2 2007/03/16 22:04:54 bad Exp $
-
---- cdrecord/cdrecord.1.orig   2006-12-13 23:42:23.000000000 +0100
-+++ cdrecord/cdrecord.1
-@@ -160,7 +160,7 @@ option of 
- described below.
- 
- .PP
--If a file /etc/default/cdrecord exists, the parameter to the
-+If a file @CDRECORD_CONF@ exists, the parameter to the
- .B dev=
- option may also be a drive name label in said file (see FILES section).
- 
-@@ -576,13 +576,13 @@ If no 
- option is present,
- .B cdrecord
- will try to get a drive specific speed value from the file
--.B /etc/default/cdrecord
-+.B @CDRECORD_CONF@
- and if it cannot find one, it will try to get the speed value from the
- .B CDR_SPEED
- environment and later from the 
- .B CDR_SPEED=
- entry in
--.BR /etc/default/cdrecord .
-+.BR @CDRECORD_CONF@ .
- If no speed value could be found, cdrecord uses a drive specific default speed.
- The default for all new (MMC compliant) drives is to use the maximum supported by the drive.
- If you use 
-@@ -786,7 +786,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).
- .sp
- If no 
- .B dev=
-@@ -2009,7 +2009,7 @@ Then write the CD using:
- .TP
- .B 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@.
- .TP
- .B CDR_SPEED
- Sets the default speed value for writing (see also 
-@@ -2072,8 +2072,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
-@@ -2082,7 +2082,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 -r 561552e73d72 -r 64ff71c5dd7a sysutils/cdrtools/patches/patch-cc
--- a/sysutils/cdrtools/patches/patch-cc        Fri Jun 08 23:04:35 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-cc,v 1.2 2007/03/16 22:04:54 bad Exp $
-
---- readcd/readcd.1.orig       2006-11-06 02:02:02.000000000 +0100
-+++ readcd/readcd.1
-@@ -177,7 +177,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).
- .sp
- If no 
- .B dev=
diff -r 561552e73d72 -r 64ff71c5dd7a sysutils/cdrtools/patches/patch-ck
--- a/sysutils/cdrtools/patches/patch-ck        Fri Jun 08 23:04:35 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2007/03/16 22:04:55 bad Exp $
-
---- btcflash/btcflash.1.orig   2006-02-08 23:13:24.000000000 +0100
-+++ btcflash/btcflash.1
-@@ -169,7 +169,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 
diff -r 561552e73d72 -r 64ff71c5dd7a sysutils/cdrtools/patches/patch-cl
--- a/sysutils/cdrtools/patches/patch-cl        Fri Jun 08 23:04:35 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2007/03/16 22:04:55 bad Exp $
-
---- mkisofs/diag/isoinfo.8.orig        2004-06-01 12:50:59.000000000 +0200
-+++ mkisofs/diag/isoinfo.8
-@@ -177,7 +177,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).
- .sp
- The options
- .B \-i
-@@ -250,7 +250,7 @@ sites. Despite the name, the software is
- .TP
- .B 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@.
- .TP
- .B RSH
- If the 
-@@ -288,13 +288,13 @@ 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@.
- .RS
- .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
- Any other label
diff -r 561552e73d72 -r 64ff71c5dd7a sysutils/cdrtools/patches/patch-cm
--- a/sysutils/cdrtools/patches/patch-cm        Fri Jun 08 23:04:35 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-cm,v 1.1 2007/03/16 22:04:55 bad Exp $
-
---- scgcheck/scgcheck.1.orig   2006-05-14 15:32:56.000000000 +0200
-+++ scgcheck/scgcheck.1
-@@ -160,7 +160,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