Hi,
I have a diff to update cdtools to 2.01.01apha60 if anyone is
interested. It compiles, it appears to work.
I use it primarily for burning UDF dual-layer DVDs. (mkisofs -r -J
-udf -iso-level 3 ...)
CVS diff is below.
Regards,
Tom
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 11 Nov 2007 01:41:11 -0000 1.14
+++ Makefile 1 Jul 2009 11:08:34 -0000
@@ -2,7 +2,7 @@
COMMENT= ISO 9660 filesystem and CD creation tools
-DISTNAME= cdrtools-2.01
+DISTNAME= cdrtools-2.01.01a60
PKGNAME= ${DISTNAME}p1
CATEGORIES= sysutils
HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html
@@ -14,7 +14,10 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c ossaudio
-MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/
+MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/
+
+WRKDIST = $(WRKDIR)/cdrtools-2.01.01
+MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/conf
USE_GMAKE= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 5 Apr 2007 17:26:11 -0000 1.7
+++ distinfo 1 Jul 2009 11:08:34 -0000
@@ -1,5 +1,5 @@
-MD5 (cdrtools-2.01.tar.gz) = b1iILfukxhXi69gaVl98+g==
-RMD160 (cdrtools-2.01.tar.gz) = bSEDiRh4mQL/d0/Nqsd4Coy0a74=
-SHA1 (cdrtools-2.01.tar.gz) = tnShidN189FEf0hEwqlidRuTP8E=
-SHA256 (cdrtools-2.01.tar.gz) = FDyuPVXzHZb+qjE84suSDBltd+vLyiooD/ygHinXX1c=
-SIZE (cdrtools-2.01.tar.gz) = 1736017
+MD5 (cdrtools-2.01.01a60.tar.gz) = 62a2c475d3efefb1792f5ca20dfbb557
+RMD160 (cdrtools-2.01.01a60.tar.gz) = b02bf5673f6336f47948f8e8baa3e4fb299dcfc9
+SHA1 (cdrtools-2.01.01a60.tar.gz) = d09f0f4c6d396059444d4b10bdd60fb059820f1d
+SHA256 (cdrtools-2.01.01a60.tar.gz) =
f96631d200e9f0f2a0bdcf100dba67ed5191d1f2a7124977c589f3d34a35a803
+SIZE (cdrtools-2.01.01a60.tar.gz) = 2224720
Index: patches/patch-RULES_rules1_top
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/patches/patch-RULES_rules1_top,v
retrieving revision 1.3
diff -u -p -r1.3 patch-RULES_rules1_top
--- patches/patch-RULES_rules1_top 30 Nov 2004 05:44:03 -0000 1.3
+++ patches/patch-RULES_rules1_top 1 Jul 2009 11:08:34 -0000
@@ -1,16 +1,16 @@
-$OpenBSD: patch-RULES_rules1_top,v 1.3 2004/11/30 05:44:03 jolan Exp $
---- RULES/rules1.top.orig 2004-01-22 16:55:16.000000000 -0800
-+++ RULES/rules1.top 2004-03-08 19:45:37.000000000 -0800
-@@ -226,7 +226,7 @@ PARCH= $(__PARCH:$(_UNIQ)%=%)
- # See notes about $(SRCROOT)/ vs. $(SRCROOTSL) above.
- #
- ###########################################################################
+$OpenBSD$ tdm4
+--- RULES/rules1.top.orig Wed Jul 1 11:42:16 2009
++++ RULES/rules1.top Wed Jul 1 11:43:21 2009
+@@ -249,7 +249,7 @@ $(SRCROOTSL)incs/Dnull: $(SRCROOTSL)incs
+
+ include $(SRCROOTSL)incs/Dnull
+
-_DCC= $(SRCROOTSL)incs/Dcc.$(PARCH)$(-O_ARCH)
+_DCC= $(SRCROOTSL)incs/Dcc.$(K_ARCH)$(-O_ARCH)
$(_DCC):
- sh $(SRCROOTSL)conf/cc-config.sh $(C_ARCH) $@
-@@ -249,7 +249,7 @@ include $(_DCC)
+ sh $(SRCROOTSL)conf/cc-config.sh $(C_ARCH:%64=%) $(CCOM_DEF) $@
+@@ -272,7 +272,7 @@ include $(_DCC)
#
###########################################################################
#OARCH= $(MARCH)$(-O_ARCH)-$(C_ARCH)
Index: patches/patch-cdda2wav_local_cnf_in
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/patches/patch-cdda2wav_local_cnf_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-cdda2wav_local_cnf_in
--- patches/patch-cdda2wav_local_cnf_in 11 Nov 2007 01:41:11 -0000 1.3
+++ patches/patch-cdda2wav_local_cnf_in 1 Jul 2009 11:08:34 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-cdda2wav_local_cnf_in,v 1.3 2007/11/11 01:41:11 jakemsr Exp $
---- cdda2wav/local.cnf.in.orig Thu Sep 4 01:35:46 2003
-+++ cdda2wav/local.cnf.in Mon Oct 29 03:18:42 2007
+$OpenBSD$
+--- cdda2wav/local.cnf.in.orig Tue Oct 21 22:10:05 2008
++++ cdda2wav/local.cnf.in Wed Jul 1 11:03:20 2009
@@ -43,7 +43,7 @@ HAVE_IOCTL= $(__HAVE_IOCTL:$(_UNIQ)$(HAVE_BSD_OS)$(HAV
############# Sound device support
@@ -10,10 +10,11 @@ $OpenBSD: patch-cdda2wav_local_cnf_in,v
SUN_SOUND_DEV= '"/dev/audio"'
HAVE_OSS= @HAVE_OSS@
-@@ -137,5 +137,5 @@ $(WANT_INFOFILES) $(WANT_MD5) -DAUX_DEVICE=$(AUX_DEVIC
+@@ -137,6 +137,6 @@ $(WANT_INFOFILES) $(WANT_MD5) -DAUX_DEVICE=$(AUX_DEVIC
LIBS += @LIBS@
--version_...@cdrtools_version@_$(O_ARCH)_$(OSREL)_$(K_ARCH)_$(P_ARCH)
+-#version_...@cdrtools_version@_$(O_ARCH)_$(OSREL)_$(K_ARCH)_$(P_ARCH)
+version_...@cdrtools_version@_$(O_ARCH)_$(OSREL)_$(K_ARCH)
+ VERSION_OS=_$(O_ARCH)_$(OSREL)_$(K_ARCH)_$(P_ARCH)
CUR_VERSION='"$(VERSION_OS)"'
Index: patches/patch-cdda2wav_sndconfig_c
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/patches/patch-cdda2wav_sndconfig_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-cdda2wav_sndconfig_c
--- patches/patch-cdda2wav_sndconfig_c 11 Nov 2007 01:41:11 -0000 1.1
+++ patches/patch-cdda2wav_sndconfig_c 1 Jul 2009 11:08:34 -0000
@@ -1,56 +1,63 @@
-$OpenBSD: patch-cdda2wav_sndconfig_c,v 1.1 2007/11/11 01:41:11 jakemsr Exp $
---- cdda2wav/sndconfig.c.orig Mon Oct 29 03:51:04 2007
-+++ cdda2wav/sndconfig.c Mon Oct 29 03:59:12 2007
-@@ -163,11 +163,11 @@ int init_soundcard(rate, bits)
- (MY_LITTLE_ENDIAN ? AFMT_S16_LE : AFMT_S16_BE);
- int mask;
+$OpenBSD$
+--- cdda2wav/sndconfig.c.orig Sun Jan 4 16:40:08 2009
++++ cdda2wav/sndconfig.c Wed Jul 1 11:07:52 2009
+@@ -192,13 +192,13 @@ init_soundcard(rate, bits)
+ int mask;
-- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_GETBLKSIZE, &dummy) ==
-1) {
-+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_GETBLKSIZE, &dummy) == -1) {
- fprintf(stderr, "Cannot get blocksize for %s\n", snd_device);
- global.echo = 0;
- }
-- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_SYNC, NULL) == -1) {
-+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_SYNC, NULL) == -1) {
- fprintf(stderr, "Cannot sync for %s\n", snd_device);
- global.echo = 0;
- }
-@@ -180,7 +180,7 @@ int init_soundcard(rate, bits)
- #endif
-
- /* check, if the sound device can do the requested format */
-- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_GETFMTS, &mask) == -1) {
-+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_GETFMTS, &mask) == -1) {
- perror("fatal error:");
- return -1;
- }
-@@ -191,25 +191,25 @@ int init_soundcard(rate, bits)
- myformat = AFMT_U8;
- }
- }
-- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_SETFMT, &myformat) ==
-1) {
-+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_SETFMT, &myformat) == -1) {
- fprintf(stderr, "Cannot set %d bits/sample for %s\n",bits,
snd_device);
- global.echo = 0;
- }
-
- /* limited sound devices may not support stereo */
- if (stereo
-- && ioctl(global.soundcard_fd, (int)SNDCTL_DSP_STEREO, &stereo) ==
-1) {
-+ && ioctl(global.soundcard_fd, SNDCTL_DSP_STEREO, &stereo) == -1) {
- fprintf(stderr, "Cannot set stereo mode for %s\n", snd_device);
- stereo = 0;
- }
- if (!stereo
-- && ioctl(global.soundcard_fd, (int)SNDCTL_DSP_STEREO,
&stereo) == -1) {
-+ && ioctl(global.soundcard_fd, SNDCTL_DSP_STEREO, &stereo) == -1) {
- fprintf(stderr, "Cannot set mono mode for %s\n", snd_device);
- global.echo = 0;
- }
-
- /* set the sample rate */
-- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_SPEED, &garbled_rate) ==
-1) {
-+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_SPEED, &garbled_rate) == -1) {
- fprintf(stderr, "Cannot set rate %d.%2d Hz for %s\n",
- (int)rate, (int)(rate*100)%100, snd_device);
- global.echo = 0;
+ if (ioctl(global.soundcard_fd,
+- (int)SNDCTL_DSP_GETBLKSIZE, &dummy) == -1) {
++ SNDCTL_DSP_GETBLKSIZE, &dummy) == -1) {
+ errmsg("Cannot get blocksize for %s.\n",
+ snd_device);
+ global.echo = 0;
+ }
+ if (ioctl(global.soundcard_fd,
+- (int)SNDCTL_DSP_SYNC, NULL) == -1) {
++ SNDCTL_DSP_SYNC, NULL) == -1) {
+ errmsg("Cannot sync for %s.\n",
+ snd_device);
+ global.echo = 0;
+@@ -218,7 +218,7 @@ init_soundcard(rate, bits)
+ * requested format
+ */
+ if (ioctl(global.soundcard_fd,
+- (int)SNDCTL_DSP_GETFMTS, &mask) == -1) {
++ SNDCTL_DSP_GETFMTS, &mask) == -1) {
+ errmsg("Fatal error in
ioctl(SNDCTL_DSP_GETFMTS).\n");
+ return (-1);
+ }
+@@ -232,7 +232,7 @@ init_soundcard(rate, bits)
+ }
+ }
+ if (ioctl(global.soundcard_fd,
+- (int)SNDCTL_DSP_SETFMT, &myformat) == -1) {
++ SNDCTL_DSP_SETFMT, &myformat) == -1) {
+ errmsg("Cannot set %d bits/sample for %s.\n",
+ bits, snd_device);
+ global.echo = 0;
+@@ -243,14 +243,14 @@ init_soundcard(rate, bits)
+ */
+ if (stereo &&
+ ioctl(global.soundcard_fd,
+- (int)SNDCTL_DSP_STEREO, &stereo) == -1) {
++ SNDCTL_DSP_STEREO, &stereo) == -1) {
+ errmsg("Cannot set stereo mode for %s.\n",
+ snd_device);
+ stereo = 0;
+ }
+ if (!stereo &&
+ ioctl(global.soundcard_fd,
+- (int)SNDCTL_DSP_STEREO, &stereo) == -1) {
++ SNDCTL_DSP_STEREO, &stereo) == -1) {
+ errmsg("Cannot set mono mode for %s.\n",
+ snd_device);
+ global.echo = 0;
+@@ -260,7 +260,7 @@ init_soundcard(rate, bits)
+ * set the sample rate
+ */
+ if (ioctl(global.soundcard_fd,
+- (int)SNDCTL_DSP_SPEED, &garbled_rate) == -1) {
++ SNDCTL_DSP_SPEED, &garbled_rate) == -1) {
+ errmsg("Cannot set rate %d.%2d Hz for %s.\n",
+ (int)rate, (int)(rate*100)%100,
+ snd_device);
Index: patches/patch-libschily_printf_c
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/patches/patch-libschily_printf_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libschily_printf_c
--- patches/patch-libschily_printf_c 17 Feb 2003 15:32:58 -0000 1.1
+++ patches/patch-libschily_printf_c 1 Jul 2009 11:08:34 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libschily_printf_c,v 1.1 2003/02/17 15:32:58 naddy Exp $
---- libschily/printf.c.orig Sun Nov 10 23:19:50 2002
-+++ libschily/printf.c Sun Nov 10 23:20:22 2002
-@@ -23,7 +23,7 @@
+$OpenBSD$
+--- libschily/printf.c.orig Wed Jul 1 11:15:07 2009
++++ libschily/printf.c Wed Jul 1 11:15:31 2009
+@@ -19,7 +19,7 @@
#ifdef printf
# define __no_undef__
#else
