summaryrefslogtreecommitdiff
path: root/sysutils/cdrdao
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/cdrdao')
-rw-r--r--sysutils/cdrdao/Makefile12
-rw-r--r--sysutils/cdrdao/PLIST4
-rw-r--r--sysutils/cdrdao/distinfo15
-rw-r--r--sysutils/cdrdao/patches/patch-aa8
-rw-r--r--sysutils/cdrdao/patches/patch-ab10
-rw-r--r--sysutils/cdrdao/patches/patch-ac64
-rw-r--r--sysutils/cdrdao/patches/patch-ad8
-rw-r--r--sysutils/cdrdao/patches/patch-ae17
8 files changed, 68 insertions, 70 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index e3244cec6be..fbed0541c8a 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/04/16 21:27:36 snj Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/29 08:05:08 dillo Exp $
#
-DISTNAME= ${PKGNAME}.src
-PKGNAME= cdrdao-1.1.7
+DISTNAME= cdrdao-1.1.8
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
@@ -10,17 +9,19 @@ MAINTAINER= david@maxwell.net
HOMEPAGE= http://cdrdao.sourceforge.net/
COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= YES
USE_GNU_TOOLS+= make
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --with-pcctsbin=${PREFIX}/bin
CONFIGURE_ARGS+= --with-pcctsinc=${PREFIX}/include/pccts
-CONFIGURE_ARGS+= --without-posix-threads
CONFIGURE_ARGS+= --with-gtkmm-exec-prefix=/dev/null
# don't pick up an installed libcdda_paranoia
LDFLAGS+= -L../paranoia
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+CONFIGURE_ARGS+= --without-posix-threads
+.endif
+
#override ARCH to avoid picking up a bad ${ARCH} during the build
MAKE_ENV+= ARCH=""
@@ -62,5 +63,6 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \
${PREFIX}/share/examples/cdrdao
+.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/pccts/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrdao/PLIST b/sysutils/cdrdao/PLIST
index b785b6be68d..2479fa59159 100644
--- a/sysutils/cdrdao/PLIST
+++ b/sysutils/cdrdao/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/29 16:47:52 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/29 08:05:08 dillo Exp $
bin/cdrdao
+bin/cue2toc
bin/toc2cue
man/man1/cdrdao.1
+man/man1/cue2toc.1
share/cdrdao/drivers
share/doc/cdrdao/COPYING
share/doc/cdrdao/CREDITS
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index ff81bb6d031..1b1588aa2e2 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/10/29 16:47:52 drochner Exp $
+$NetBSD: distinfo,v 1.7 2004/05/29 08:05:08 dillo Exp $
-SHA1 (cdrdao-1.1.7.src.tar.gz) = d688f8b117de367841958f1ca977100fc4e8484b
-Size (cdrdao-1.1.7.src.tar.gz) = 1433366 bytes
-SHA1 (patch-aa) = 1856f36a9dd0a5d248e94a079a63fafcff045554
-SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa
-SHA1 (patch-ac) = 7392aad2b18b670023396b47715b292d8046b495
-SHA1 (patch-ad) = e10ec407f4c4200e443364077ab6d56e1d3cd2d3
+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 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f
+SHA1 (patch-ad) = 905ad1573a42b0753483e1b494c55a85ae5e5746
+SHA1 (patch-ae) = 42894e1de0bcb47ce65fcc64e4425ca718f7542b
diff --git a/sysutils/cdrdao/patches/patch-aa b/sysutils/cdrdao/patches/patch-aa
index eb9916c513d..bd7de64af03 100644
--- a/sysutils/cdrdao/patches/patch-aa
+++ b/sysutils/cdrdao/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2002/01/07 10:16:45 tron Exp $
+$NetBSD: patch-aa,v 1.4 2004/05/29 08:05:08 dillo Exp $
---- dao/cdrdao.drivers.orig Sun Apr 29 15:42:09 2001
-+++ dao/cdrdao.drivers Mon Jan 7 10:45:34 2002
-@@ -105,6 +105,7 @@
+--- 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
diff --git a/sysutils/cdrdao/patches/patch-ab b/sysutils/cdrdao/patches/patch-ab
index 603997182bd..04eac28d0d1 100644
--- a/sysutils/cdrdao/patches/patch-ab
+++ b/sysutils/cdrdao/patches/patch-ab
@@ -1,11 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2000/07/07 16:25:04 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/29 08:05:08 dillo Exp $
have a default scsi device which is likely to be correct (at least
on single CD systems).
---- dao/main.cc.orig Tue Oct 26 12:13:46 1999
-+++ dao/main.cc Fri Jul 7 12:20:08 2000
-@@ -157,5 +157,9 @@
+--- dao/main.cc.orig 2004-02-12 02:13:31.000000000 +0100
++++ dao/main.cc
+@@ -111,7 +111,11 @@ static int FIFO_BUFFERS = 32;
+
#else
-static const char *SCSI_DEVICE = "0,0,0";
@@ -16,3 +17,4 @@ on single CD systems).
+#endif /* __i386__ */
static int FIFO_BUFFERS = 32;
+ #endif
diff --git a/sysutils/cdrdao/patches/patch-ac b/sysutils/cdrdao/patches/patch-ac
index b2efa4f0c55..e457d54ac6c 100644
--- a/sysutils/cdrdao/patches/patch-ac
+++ b/sysutils/cdrdao/patches/patch-ac
@@ -1,49 +1,23 @@
-$NetBSD: patch-ac,v 1.3 2002/10/29 16:47:53 drochner Exp $
+$NetBSD: patch-ac,v 1.4 2004/05/29 08:05:08 dillo Exp $
---- ./scsilib/include/btorder.h.orig Sun Nov 25 16:35:10 2001
-+++ ./scsilib/include/btorder.h Tue Oct 29 09:33:02 2002
-@@ -63,35 +63,21 @@
+--- scsilib/include/btorder.h.orig 2004-02-10 00:34:00.000000000 +0100
++++ scsilib/include/btorder.h
+@@ -28,6 +28,9 @@
+ #include <sys/types.h> /* try to load isa_defs.h on Solaris */
+ #define _INCL_SYS_TYPES_H
#endif
++#ifdef __NetBSD__
++#include <machine/endian.h>
++#endif
+ #ifndef _MCONFIG_H
+ #include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/
+@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _
+ # if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+ defined(__PPC) || defined(powerpc) || defined(__powerpc__)
--/*
-- * Convert byte-order definitions from xconfig.h into our values
-- * and verify them.
-- */
--#if defined(HAVE_C_BIGENDIAN) && \
-- !defined(WORDS_BIGENDIAN)
--#define WORDS_LITTLEENDIAN
--#define _LITTLE_ENDIAN
--#endif
--
--#if defined(HAVE_C_BIGENDIAN) && \
-- defined(WORDS_BIGENDIAN)
--#define _BIG_ENDIAN
--#endif
--
--#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
--/*
-- * #error will not work for all compilers (e.g. sunos4)
-- * The following line will abort compilation on all compilers
-- * if none of the above is defines. And that's what we want.
-- */
--error Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined
--#endif
-
-
- #if defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL)
- /*
- * Bitorder is already known.
- */
-+
-+#elif defined(__NetBSD__)
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define _BIT_FIELDS_LTOH
-+#else
-+#define _BIT_FIELDS_HTOL
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-+
- #else
- /*
- * Bitorder not yet known.
+-# if defined(__BIG_ENDIAN__)
++# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN
+ # define _BIT_FIELDS_HTOL
+ # else
+ # define _BIT_FIELDS_LTOH
diff --git a/sysutils/cdrdao/patches/patch-ad b/sysutils/cdrdao/patches/patch-ad
index 31859137fc4..a42d0cd64c1 100644
--- a/sysutils/cdrdao/patches/patch-ad
+++ b/sysutils/cdrdao/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2002/08/30 08:19:12 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2004/05/29 08:05:08 dillo Exp $
---- dao/GenericMMC.cc.orig Thu Aug 15 17:54:49 2002
-+++ dao/GenericMMC.cc Thu Aug 15 17:57:53 2002
-@@ -1693,6 +1693,7 @@
+--- dao/GenericMMC.cc.orig 2004-02-12 02:13:30.000000000 +0100
++++ dao/GenericMMC.cc
+@@ -2011,6 +2011,7 @@ CdRawToc *GenericMMC::getRawToc(int sess
}
dataLen = ((reqData[0] << 8) | reqData[1]) + 2;
diff --git a/sysutils/cdrdao/patches/patch-ae b/sysutils/cdrdao/patches/patch-ae
new file mode 100644
index 00000000000..2b24056deb2
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-ae
@@ -0,0 +1,17 @@
+$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;
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 23:18:59 +0000