Here's an update of cdrtools for anyone who needs it. I'm not sure
about committing as-is. Any reports or comments (especially about how
to correctly set PERMIT_* for the CDDL+GPL mess) welcome.
Loosely based on Tom Murphy's diff (but that didn't apply cleanly).
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 22 Oct 2009 21:02:42 -0000
@@ -2,20 +2,20 @@
COMMENT= ISO 9660 filesystem and CD creation tools
-DISTNAME= cdrtools-2.01
-PKGNAME= ${DISTNAME}p1
+DISTNAME= cdrtools-2.01.01a66
CATEGORIES= sysutils
-HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html
+HOMEPAGE= http://cdrecord.berlios.de/private/cdrecord.html
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
+# CDDL, GPL, LGPL
+PERMIT_PACKAGE_CDROM= No
PERMIT_PACKAGE_FTP= Yes
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}/${DISTNAME:C/a.*//}
USE_GMAKE= Yes
MAKE_ENV= MAKEPROG=${MAKE_PROGRAM} \
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 22 Oct 2009 21:02:42 -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.01a66.tar.gz) = udQL3fHOdZidCja5OfDD+w==
+RMD160 (cdrtools-2.01.01a66.tar.gz) = 4l6VOftUU7WfgNfupNYL90dUbXI=
+SHA1 (cdrtools-2.01.01a66.tar.gz) = DvMDh4iF86ZYu4bRVNt6yKIdT+Q=
+SHA256 (cdrtools-2.01.01a66.tar.gz) =
MPVMyJ+G7jG8znDVIFLJSd1SBAI2OnAGuyQ/fXtU29w=
+SIZE (cdrtools-2.01.01a66.tar.gz) = 2263250
Index: patches/patch-RULES_cc-gcc_rul
===================================================================
RCS file: patches/patch-RULES_cc-gcc_rul
diff -N patches/patch-RULES_cc-gcc_rul
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-RULES_cc-gcc_rul 22 Oct 2009 21:02:42 -0000
@@ -0,0 +1,54 @@
+$OpenBSD$
+--- RULES/cc-gcc.rul.orig Thu Oct 22 21:30:28 2009
++++ RULES/cc-gcc.rul Thu Oct 22 21:33:31 2009
+@@ -20,7 +20,7 @@
+ ###########################################################################
+
+ CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX)
+-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
++CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
+ C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX)
+
+ CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%)
$(OSDEFS)
+@@ -29,7 +29,7 @@ COPTS=
+ CWOPTS= -Wall -Wtraditional
+ CWOPTS= -Wall -Wno-unknown-pragmas \
+ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
+-COPTOPT= -O
++COPTOPT=
+ COPTDYN= -fpic
+ COPTGPROF= -pg
+ C++OPTS=
+@@ -45,7 +45,7 @@ SHL_SUFFIX= .so.1
+ LIBS_PATH= -L$(OLIBSDIR)
+ LIBS_PATH_STATIC= -L$(OLIBSDIR_STATIC)
+
+-LDFLAGS= $(LDOPTS) $(LDOPTX)
++LDFLAGS+= $(LDOPTS) $(LDOPTX)
+ LDLIBS= $(LIBS) $(LIBX)
+
+ LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
+@@ -54,15 +54,15 @@ LNDYNLIB= @$(RM) $(RM_FORCE) $(PTARGET_BASE).so; $(SYM
+
+ FLOAT_OPTIONS=
+
+-CC= @echo " ==> COMPILING \"$...@\""; gcc
+-CC++ = @echo " ==> COMPILING \"$...@\""; g++
+-LDCC= @echo " ==> LINKING \"$...@\""; gcc
+-LDCC++ = @echo " ==> LINKING \"$...@\""; g++
+-DYNLD= @echo " ==> LINKING dynamic library \"$...@\""; gcc
+-DYNLDC++ = @echo " ==> LINKING dynamic library \"$...@\""; g++
++CC= @echo " ==> COMPILING \"$...@\""; $(CCOM)
++CC++ = @echo " ==> COMPILING \"$...@\""; $(CXX)
++LDCC= @echo " ==> LINKING \"$...@\""; $(CCOM)
++LDCC++ = @echo " ==> LINKING \"$...@\""; $(CXX)
++DYNLD= @echo " ==> LINKING dynamic library \"$...@\""; $(CCOM)
++DYNLDC++ = @echo " ==> LINKING dynamic library \"$...@\""; $(CXX)
+
+ RMDEP= :
+-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$...@\""; $(RMDEP);
gcc -M
++MKDEP= @echo " ==> MAKING DEPENDENCIES \"$...@\""; $(RMDEP);
$(CCOM) -M
+ MKDEP_OUT=
+-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$...@\""; $(RMDEP); g++ -M
++MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$...@\""; $(RMDEP); $(CXX) -M
+ MKC++DEP_OUT=
Index: patches/patch-RULES_i386-openbsd-cc_rul
===================================================================
RCS file: patches/patch-RULES_i386-openbsd-cc_rul
diff -N patches/patch-RULES_i386-openbsd-cc_rul
--- patches/patch-RULES_i386-openbsd-cc_rul 11 Nov 2007 01:41:11 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.3 2007/11/11 01:41:11 jakemsr
Exp $
---- RULES/i386-openbsd-cc.rul.orig Tue Oct 15 13:43:40 2002
-+++ RULES/i386-openbsd-cc.rul Mon Oct 29 03:10:07 2007
-@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
- ###########################################################################
-
- CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
--CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
-+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
-
- CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
- COPTS=
- CWOPTS= -Wall -Wtraditional \
- -Wshadow -Wmissing-prototypes -Wstrict-prototypes
--COPTOPT= -O
-+COPTOPT=
- KDEFINES= -DKERNEL -D_KERNEL
- COPTDYN= -fpic
- COPTGPROF= -pg
-@@ -47,7 +47,7 @@ LIB_KVM=
-
- LIBS_PATH= -L$(OLIBSDIR)
-
--LDFLAGS= $(LDOPTS) $(LDOPTX)
-+LDFLAGS+= $(LDOPTS) $(LDOPTX)
- LDLIBS= $(LIBS) $(LIBX)
-
- #LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
-@@ -57,14 +57,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
-
- FLOAT_OPTIONS=
-
--CC= @echo " ==> COMPILING \"$...@\""; gcc
--LDCC= @echo " ==> LINKING \"$...@\""; gcc
--DYNLD= @echo " ==> LINKING dynamic library \"$...@\""; gcc
-+CC= @echo " ==> COMPILING \"$...@\""; $(CCOM)
-+LDCC= @echo " ==> LINKING \"$...@\""; $(CCOM)
-+DYNLD= @echo " ==> LINKING dynamic library \"$...@\""; $(CCOM)
- RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$...@\""; ranlib
- ARFLAGS= cr
- LORDER= lorder
- TSORT= tsort
-
- RMDEP= :
--MKDEP= @echo " ==> MAKING DEPENDENCIES \"$...@\""; $(RMDEP);
gcc -M
-+MKDEP= @echo " ==> MAKING DEPENDENCIES \"$...@\""; $(RMDEP);
$(CCOM) -M
- MKDEP_OUT=
Index: patches/patch-RULES_mk-gmake_id
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/patches/patch-RULES_mk-gmake_id,v
retrieving revision 1.1
diff -u -p -r1.1 patch-RULES_mk-gmake_id
--- patches/patch-RULES_mk-gmake_id 10 Oct 2009 09:25:11 -0000 1.1
+++ patches/patch-RULES_mk-gmake_id 22 Oct 2009 21:02:42 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-RULES_mk-gmake_id,v 1.1 2009/10/10 09:25:11 espie Exp $
---- RULES/mk-gmake.id.orig Sat Oct 10 11:20:15 2009
-+++ RULES/mk-gmake.id Sat Oct 10 11:20:33 2009
-@@ -37,7 +37,7 @@ MAKEPROG= gmake
-
+$OpenBSD$
+--- RULES/mk-gmake.id.orig Wed Sep 9 13:29:28 2009
++++ RULES/mk-gmake.id Thu Oct 22 21:28:42 2009
+@@ -51,7 +51,7 @@ MAKEPROG= gmake
ifndef ARCH_DONE
--__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2;
sleep 5)
+ ifndef GMAKE_NOWARN
+-__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2;
sleep 2)
+__gmake_warn:= :
+ endif
_MACHCMD= (mach || uname -p || true) 2> /dev/null
- _ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null
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 22 Oct 2009 21:02:42 -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$
+--- RULES/rules1.top.orig Sat Dec 27 19:19:44 2008
++++ RULES/rules1.top Thu Oct 22 21:27:13 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= $(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-RULES_rules_cnf
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/patches/patch-RULES_rules_cnf,v
retrieving revision 1.2
diff -u -p -r1.2 patch-RULES_rules_cnf
--- patches/patch-RULES_rules_cnf 17 Feb 2003 15:32:58 -0000 1.2
+++ patches/patch-RULES_rules_cnf 22 Oct 2009 21:02:42 -0000
@@ -1,15 +1,15 @@
-$OpenBSD: patch-RULES_rules_cnf,v 1.2 2003/02/17 15:32:58 naddy Exp $
---- RULES/rules.cnf.orig Sun Jul 21 01:50:27 2002
-+++ RULES/rules.cnf Sun Jul 21 01:51:20 2002
-@@ -33,8 +33,9 @@ $(OINCSDIR):
+$OpenBSD$
+--- RULES/rules.cnf.orig Fri Aug 1 19:04:08 2008
++++ RULES/rules.cnf Thu Oct 22 21:28:10 2009
+@@ -41,8 +41,9 @@ $(OINCSDIR):
#
# Hack until the <mach>-<os>-*cc.rul files are updated
#
--_HCCCOM= $(OARCH:%-gcc=gcc)
--HCCCOM= $(_HCCCOM:%-cc=cc)
-+#_HCCCOM= $(OARCH:%-gcc=gcc)
-+#HCCCOM= $(_HCCCOM:%-cc=cc)
-+HCCCOM= $(C_ARCH)
+-_HCC_COM= $(OARCH:%-gcc=gcc)
+-HCC_COM= $(_HCC_COM:%-cc=cc)
++#_HCC_COM= $(OARCH:%-gcc=gcc)
++#HCC_COM= $(_HCC_COM:%-cc=cc)
++HCC_COM= $(C_ARCH)
- _CCCOM= $(_UNIQ)$(CCCOM)
- __CCCOM= $(_CCCOM:$(_UNIQ)=$(HCCCOM))
+ _CC_COM= $(_UNIQ)$(CC_COM)
+ __CC_COM= $(_CC_COM:$(_UNIQ)=$(HCC_COM))
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 22 Oct 2009 21:02:42 -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 Thu Oct 22 21:18:53 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 22 Oct 2009 21:02:42 -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 Tue Aug 4 21:10:41 2009
++++ cdda2wav/sndconfig.c Thu Oct 22 21:26:00 2009
+@@ -189,13 +189,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;
+@@ -215,7 +215,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);
+ }
+@@ -229,7 +229,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;
+@@ -240,14 +240,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;
+@@ -257,7 +257,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-include_btorder_h
===================================================================
RCS file: patches/patch-include_btorder_h
diff -N patches/patch-include_btorder_h
--- patches/patch-include_btorder_h 30 Nov 2004 05:44:03 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-include_btorder_h,v 1.2 2004/11/30 05:44:03 jolan Exp $
---- include/btorder.h.orig 2003-06-15 14:41:00.000000000 -0700
-+++ include/btorder.h 2004-01-15 23:45:38.000000000 -0800
-@@ -20,6 +20,13 @@
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#ifdef __OpenBSD__
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define _BIT_FIELDS_LTOH
-+#elif BYTE_ORDER == BIG_ENDIAN
-+#define _BIT_FIELDS_HTOL
-+#endif
-+#endif
-
- #ifndef _BTORDER_H
- #define _BTORDER_H
Index: patches/patch-include_schily_btorder_h
===================================================================
RCS file: patches/patch-include_schily_btorder_h
diff -N patches/patch-include_schily_btorder_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_schily_btorder_h 22 Oct 2009 21:02:42 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- include/schily/btorder.h.orig Thu Oct 22 21:24:44 2009
++++ include/schily/btorder.h Thu Oct 22 21:24:56 2009
+@@ -16,6 +16,13 @@
+ * file and include the License file CDDL.Schily.txt from this distribution.
+ */
+
++#ifdef __OpenBSD__
++#if BYTE_ORDER == LITTLE_ENDIAN
++#define _BIT_FIELDS_LTOH
++#elif BYTE_ORDER == BIG_ENDIAN
++#define _BIT_FIELDS_HTOL
++#endif
++#endif
+
+ #ifndef _SCHILY_BTORDER_H
+ #define _SCHILY_BTORDER_H
Index: patches/patch-libschily_getargs_c
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/patches/patch-libschily_getargs_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libschily_getargs_c
--- patches/patch-libschily_getargs_c 30 Nov 2004 05:44:03 -0000 1.1
+++ patches/patch-libschily_getargs_c 22 Oct 2009 21:02:42 -0000
@@ -1,14 +1,12 @@
-$OpenBSD: patch-libschily_getargs_c,v 1.1 2004/11/30 05:44:03 jolan Exp $
---- libschily/getargs.c.orig Mon Oct 6 04:01:07 2003
-+++ libschily/getargs.c Thu Oct 7 20:48:29 2004
-@@ -266,8 +266,8 @@ LOCAL int
- doflag(pac, pav, argp, fmt, setargs, oargs)
+$OpenBSD$
+--- libschily/getargs.c.orig Fri Jul 10 20:55:36 2009
++++ libschily/getargs.c Thu Oct 22 21:20:59 2009
+@@ -486,7 +486,7 @@ LOCAL int
+ doflag(pac, pav, argp, vfmt, flags, oargs)
int *pac;
char *const **pav;
- register const char *argp;
-- register const char *fmt;
+ const char *argp;
-+ const char *fmt;
- BOOL setargs;
+ void *vfmt;
+ int flags;
va_list oargs;
- {
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 22 Oct 2009 21:02:42 -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 Fri Jul 10 20:55:11 2009
++++ libschily/printf.c Thu Oct 22 21:18:55 2009
+@@ -19,7 +19,7 @@
#ifdef printf
# define __no_undef__
#else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/cdrtools/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 30 Nov 2004 05:44:03 -0000 1.7
+++ pkg/PLIST 22 Oct 2009 21:02:42 -0000
@@ -1,14 +1,14 @@
@comment $OpenBSD: PLIST,v 1.7 2004/11/30 05:44:03 jolan Exp $
@conflict cdrecord-*
-bin/cdda2wav
-bin/cdrecord
-bin/devdump
-bin/isodebug
-bin/isodump
-bin/isoinfo
-bin/isovfy
-bin/mkisofs
-bin/readcd
+...@bin bin/cdda2wav
+...@bin bin/cdrecord
+...@bin bin/devdump
+...@bin bin/isodebug
+...@bin bin/isodump
+...@bin bin/isoinfo
+...@bin bin/isovfy
+...@bin bin/mkisofs
+...@bin bin/readcd
@man man/man1/cdda2wav.1
@man man/man1/cdrecord.1
@man man/man1/devdump.1
