[pkgsrc/pkgsrc-2004Q2]: pkgsrc/sysutils/cdrdao Pullup ticket 42 to the pkgsrc...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2004Q2]: pkgsrc/sysutils/cdrdao Pullup ticket 42 to the pkgsrc...
From: agc <agc%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:13:16 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/3759e0bdff41
branches:  pkgsrc-2004Q2
changeset: 476705:3759e0bdff41
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Jul 06 22:32:27 2004 +0000

description:
Pullup ticket 42 to the pkgsrc-2004Q2 branch, requested by dillo.

        Module Name:    pkgsrc
        Committed By:   dillo
        Date:           Sun Jun 20 19:05:25 UTC 2004

        Modified Files:
                pkgsrc/sysutils/cdrdao: Makefile PLIST distinfo
                pkgsrc/sysutils/cdrdao/patches: patch-ab patch-ad
        Removed Files:
                pkgsrc/sysutils/cdrdao/patches: patch-aa patch-ae

        Log Message:
        update to 1.1.9:

        This release focuses on bug and compile fixes, upgrade to a newer
        scsilib library (from cdrtools 2.01a31), as well as some new cdrdao
        options and features (MMC driver auto-detection, discid command,
        --full-burn option).

and

        Module Name:    pkgsrc
        Committed By:   wiz
        Date:           Sun Jun 27 19:15:37 UTC 2004

        Modified Files:
                pkgsrc/sysutils/cdrdao: Makefile

        Log Message:
        Remove duplicate line in install arg. Reported by Sebastian Prause on tech-pkg.

and

        Module Name:    pkgsrc
        Committed By:   dillo
        Date:           Sun Jun 20 19:05:53 UTC 2004

        Removed Files:
                pkgsrc/sysutils/cdrdao/patches: patch-ag

        Log Message:
        remove file missed in 1.1.9 update

diffstat:

 sysutils/cdrdao/Makefile         |  13 +++----------
 sysutils/cdrdao/PLIST            |   9 ++-------
 sysutils/cdrdao/distinfo         |  13 +++++--------
 sysutils/cdrdao/patches/patch-aa |  12 ------------
 sysutils/cdrdao/patches/patch-ab |   6 +++---
 sysutils/cdrdao/patches/patch-ad |   6 +++---
 sysutils/cdrdao/patches/patch-ae |  17 -----------------
 sysutils/cdrdao/patches/patch-ag |  13 -------------
 8 files changed, 16 insertions(+), 73 deletions(-)

diffs (166 lines):

diff -r 183f7563199b -r 3759e0bdff41 sysutils/cdrdao/Makefile
--- a/sysutils/cdrdao/Makefile  Tue Jul 06 22:21:26 2004 +0000
+++ b/sysutils/cdrdao/Makefile  Tue Jul 06 22:32:27 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/05/29 08:05:08 dillo Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2004/07/06 22:32:27 agc Exp $
 #
 
-DISTNAME=              cdrdao-1.1.8
+DISTNAME=              cdrdao-1.1.9
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
 
@@ -36,13 +36,7 @@
 
 post-install:
                ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao
-               ${INSTALL_MAN} ${WRKSRC}/COPYING \
-                       ${WRKSRC}/README \
-                       ${WRKSRC}/Release-1.1.2 \
-                       ${WRKSRC}/Release-1.1.3 \
-                       ${WRKSRC}/CREDITS \
-                       ${WRKSRC}/README.FreeBSD \
-                       ${WRKSRC}/INSTALL \
+               ${INSTALL_MAN} ${WRKSRC}/README \
                        ${WRKSRC}/README.PlexDAE \
                        ${PREFIX}/share/doc/cdrdao
                ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao/testtocs
@@ -55,7 +49,6 @@
                ${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \
                        ${WRKSRC}/contrib/psxcopy-0.2/README \
                        ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \
-                       ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \
                        ${WRKSRC}/contrib/psxcopy-0.2/psxdump.c \
                        ${WRKSRC}/contrib/psxcopy-0.2/read-psx \
                        ${WRKSRC}/contrib/psxcopy-0.2/write-psx \
diff -r 183f7563199b -r 3759e0bdff41 sysutils/cdrdao/PLIST
--- a/sysutils/cdrdao/PLIST     Tue Jul 06 22:21:26 2004 +0000
+++ b/sysutils/cdrdao/PLIST     Tue Jul 06 22:32:27 2004 +0000
@@ -1,18 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/29 08:05:08 dillo Exp $
+@comment $NetBSD: PLIST,v 1.3.2.1 2004/07/06 22:32:27 agc Exp $
 bin/cdrdao
 bin/cue2toc
+bin/toc2cddb
 bin/toc2cue
 man/man1/cdrdao.1
 man/man1/cue2toc.1
 share/cdrdao/drivers
-share/doc/cdrdao/COPYING
-share/doc/cdrdao/CREDITS
-share/doc/cdrdao/INSTALL
 share/doc/cdrdao/README
-share/doc/cdrdao/README.FreeBSD
 share/doc/cdrdao/README.PlexDAE
-share/doc/cdrdao/Release-1.1.2
-share/doc/cdrdao/Release-1.1.3
 share/doc/cdrdao/testtocs/cdtext.toc
 share/doc/cdrdao/testtocs/data1.toc
 share/doc/cdrdao/testtocs/data2.toc
diff -r 183f7563199b -r 3759e0bdff41 sysutils/cdrdao/distinfo
--- a/sysutils/cdrdao/distinfo  Tue Jul 06 22:21:26 2004 +0000
+++ b/sysutils/cdrdao/distinfo  Tue Jul 06 22:32:27 2004 +0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.8 2004/06/08 22:36:09 cube Exp $
+$NetBSD: distinfo,v 1.8.2.1 2004/07/06 22:32:27 agc Exp $
 
-SHA1 (cdrdao-1.1.8.tar.gz) = 6980acbf55817f83964b66205a9e8aa75e595695
-Size (cdrdao-1.1.8.tar.gz) = 1535530 bytes
-SHA1 (patch-aa) = 7a137f1907ae1d44324ee89b86217a40cb2f0e31
-SHA1 (patch-ab) = 88f7f255926204d8a907e2748141a51a3fc3f792
+SHA1 (cdrdao-1.1.9.tar.gz) = e406940bbc2784ba249e3b7198ac7834ebda18f7
+Size (cdrdao-1.1.9.tar.gz) = 1581717 bytes
+SHA1 (patch-ab) = 5cbacba844e1fa3c55634bdbbe3ec8a998d20273
 SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f
-SHA1 (patch-ad) = 905ad1573a42b0753483e1b494c55a85ae5e5746
-SHA1 (patch-ae) = 42894e1de0bcb47ce65fcc64e4425ca718f7542b
-SHA1 (patch-ag) = 79f71410be2de6e23360b48c0adad31d99d7e5bf
+SHA1 (patch-ad) = 2c092aa6755f6029bbd07db9fee03e655081fdb7
diff -r 183f7563199b -r 3759e0bdff41 sysutils/cdrdao/patches/patch-aa
--- a/sysutils/cdrdao/patches/patch-aa  Tue Jul 06 22:21:26 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/05/29 08:05:08 dillo Exp $
-
---- dao/cdrdao.drivers.orig    2002-09-22 18:10:52.000000000 +0200
-+++ dao/cdrdao.drivers
-@@ -157,6 +157,7 @@ W|PLEXTOR|CD-R   PX-R820|generic-mmc
- W|PLEXTOR|CD-R   PX-W1210|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R   PX-W124|generic-mmc
- W|PLEXTOR|CD-R   PX-W1610|generic-mmc|OPT_MMC_CD_TEXT
-+W|PLEXTOR|CD-R   PX-W2410|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R   PX-W4220|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R   PX-W8220|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R   PX-W8432|generic-mmc|OPT_MMC_CD_TEXT
diff -r 183f7563199b -r 3759e0bdff41 sysutils/cdrdao/patches/patch-ab
--- a/sysutils/cdrdao/patches/patch-ab  Tue Jul 06 22:21:26 2004 +0000
+++ b/sysutils/cdrdao/patches/patch-ab  Tue Jul 06 22:32:27 2004 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2004/05/29 08:05:08 dillo Exp $
+$NetBSD: patch-ab,v 1.3.2.1 2004/07/06 22:32:27 agc Exp $
 
 have a default scsi device which is likely to be correct (at least
 on single CD systems).
 
---- dao/main.cc.orig   2004-02-12 02:13:31.000000000 +0100
+--- dao/main.cc.orig   2004-06-05 22:57:34.000000000 +0200
 +++ dao/main.cc
-@@ -111,7 +111,11 @@ static int FIFO_BUFFERS = 32;
+@@ -115,7 +115,11 @@ static int FIFO_BUFFERS = 32;
  
  #else
  
diff -r 183f7563199b -r 3759e0bdff41 sysutils/cdrdao/patches/patch-ad
--- a/sysutils/cdrdao/patches/patch-ad  Tue Jul 06 22:21:26 2004 +0000
+++ b/sysutils/cdrdao/patches/patch-ad  Tue Jul 06 22:32:27 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/05/29 08:05:08 dillo Exp $
+$NetBSD: patch-ad,v 1.2.2.1 2004/07/06 22:32:27 agc Exp $
 
---- dao/GenericMMC.cc.orig     2004-02-12 02:13:30.000000000 +0100
+--- dao/GenericMMC.cc.orig     2004-06-05 21:40:52.000000000 +0200
 +++ dao/GenericMMC.cc
-@@ -2011,6 +2011,7 @@ CdRawToc *GenericMMC::getRawToc(int sess
+@@ -2019,6 +2019,7 @@ CdRawToc *GenericMMC::getRawToc(int sess
    }
  
    dataLen = ((reqData[0] << 8) | reqData[1]) + 2;
diff -r 183f7563199b -r 3759e0bdff41 sysutils/cdrdao/patches/patch-ae
--- a/sysutils/cdrdao/patches/patch-ae  Tue Jul 06 22:21:26 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/05/29 08:05:08 dillo Exp $
-
---- dao/dao.cc.orig    2004-02-12 02:13:31.000000000 +0100
-+++ dao/dao.cc
-@@ -388,10 +388,10 @@ static int writer(const Toc *toc, CdrDri
-         if (cdr->readBufferCapacity(&totalcap, &availcap)) {
-           writerFill = (int)((1.0 - ((double)availcap / (double)totalcap))
-                              * 100.0);
--          message(1, "Wrote %ld of %ld MB (Buffers %3d%% %3d%%).\n",
-+          message(1, "Wrote %ld of %ld MB (Buffers %3d%% %3d%%).\r",
-                   cnt >> 20, total >> 20, buffFill, writerFill);
-         } else {
--          message(1, "Wrote %ld of %ld MB (Buffer %3d%%).\n",
-+          message(1, "Wrote %ld of %ld MB (Buffer %3d%%).\r",
-                   cnt >> 20, total >> 20, buffFill);
-         }
-         lastMb = cntMb;
diff -r 183f7563199b -r 3759e0bdff41 sysutils/cdrdao/patches/patch-ag
--- a/sysutils/cdrdao/patches/patch-ag  Tue Jul 06 22:21:26 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/06/08 22:36:09 cube Exp $
-
---- trackdb/lec.cc.orig        2004-06-08 23:43:27.000000000 +0200
-+++ trackdb/lec.cc
-@@ -278,7 +278,7 @@ static u_int32_t calc_edc(u_int8_t *data
-   u_int32_t crc = 0;
- 
-   while (len--) {
--    crc = CRCTABLE[(crc ^ *data++) & 0xffL] ^ (crc >> 8);
-+    crc = CRCTABLE[(int)((crc ^ *data++) & 0xffL)] ^ (crc >> 8);
-   }
- 
-   return crc;
Prev by Date: [pkgsrc/pkgsrc-2004Q2]: pkgsrc Add a file for recording changes made to the p...
Next by Date: [pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 44 to the pkgsrc-2004Q2 branch, ...
Previous by Thread: [pkgsrc/pkgsrc-2004Q2]: pkgsrc Add a file for recording changes made to the p...
Next by Thread: [pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 44 to the pkgsrc-2004Q2 branch, ...
Indexes:
Home | Main Index | Thread Index | Old Index