On Tue, 29 Nov 2011 21:01:53 +0000 (UTC), Christian Weisgerber wrote: > Sebastian Reitenbach <sebas...@l00-bugdead-prods.de> wrote: > > > attached patch updates cdrtools to 3.00. Patch is mostly based on > > pascal@ work, with some minor tweaks by me. > > That patch reverts my Nov 1 changes to the port and subsequent > commits.
Sorry, the initial patch this is based on was done before Nov 1. Here's an updated diff. Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/cdrtools/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 10 Nov 2011 14:13:06 -0000 1.18 +++ Makefile 29 Nov 2011 21:52:41 -0000 @@ -1,13 +1,12 @@ # $OpenBSD: Makefile,v 1.18 2011/11/10 14:13:06 sthen Exp $ -COMMENT= ISO 9660 filesystem and CD creation tools +COMMENT= ISO 9660 filesystem and CD/DVD/BD creation tools -DISTNAME= cdrtools-2.01 -REVISION = 2 +DISTNAME= cdrtools-3.00 CATEGORIES= sysutils -HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html +HOMEPAGE= http://cdrecord.berlios.de/private/cdrecord.html -# GPL +# mostly CDDL, some components GPL (see COPYING) PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -17,13 +16,18 @@ WANTLIB= c ossaudio MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \ http://spacehopper.org/mirrors/berlios/cdrecord/ + USE_GMAKE= Yes -USE_GROFF = Yes -MAKE_ENV= MAKEPROG=${MAKE_PROGRAM} \ - CCOM=${CC} +MAKE_ENV += MAKEPROG=${MAKE_PROGRAM} +MAKE_FLAGS = GMAKE_NOWARN=true CC=${CC} CC++=${CXX} \ + LDCC="${CC}" LDCC++=${CXX} NO_REGRESS= Yes + +pre-configure: + @perl -pi -e 's/\@echo/echo/g' ${WRKSRC}/RULES/i386-openbsd-cc.rul \ + ${WRKSRC}/RULES/rules.top ${WRKSRC}/RULES/cc-gcc.rul .if ${MACHINE} != "i386" || ${CC} != "cc" do-configure: 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 29 Nov 2011 21:52:41 -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-3.00.tar.gz) = uyHO/vz7t2zySRIOiXj/3Q== +RMD160 (cdrtools-3.00.tar.gz) = nDIjluU6k8q3BaUPEMI9rDuOGSc= +SHA1 (cdrtools-3.00.tar.gz) = LNfRcl4NoiZ7egM8x0QpXW4rxrk= +SHA256 (cdrtools-3.00.tar.gz) = YyZ2Lai4KByakQxm/mmM1NG8XzPDe1no8cgzQ8JfPpg= +SIZE (cdrtools-3.00.tar.gz) = 2479860 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 29 Nov 2011 21:52:41 -0000 @@ -0,0 +1,34 @@ +$OpenBSD$ +--- RULES/cc-gcc.rul.orig Wed May 9 14:25:30 2007 ++++ RULES/cc-gcc.rul Thu Nov 17 16:25:51 2011 +@@ -19,9 +19,9 @@ + # file and include the License file CDDL.Schily.txt from this distribution. + ########################################################################### + +-CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) +-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) +-C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) ++CPPFLAGS+= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) ++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) + COPTS= +@@ -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%) 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: patches/patch-RULES_mk-gmake_id diff -N patches/patch-RULES_mk-gmake_id --- patches/patch-RULES_mk-gmake_id 10 Oct 2009 09:25:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$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 - - ifndef ARCH_DONE - --__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 5) -+__gmake_warn:= : - - _MACHCMD= (mach || uname -p || true) 2> /dev/null - _ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null Index: patches/patch-RULES_rules_cnf =================================================================== RCS file: patches/patch-RULES_rules_cnf diff -N patches/patch-RULES_rules_cnf --- patches/patch-RULES_rules_cnf 17 Feb 2003 15:32:58 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$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): - # - # 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) - - _CCCOM= $(_UNIQ)$(CCCOM) - __CCCOM= $(_CCCOM:$(_UNIQ)=$(HCCCOM)) Index: patches/patch-cdda2wav_local_cnf_in =================================================================== RCS file: /cvs/ports/sysutils/cdrtools/patches/patch-cdda2wav_local_cnf_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-cdda2wav_local_cnf_in --- patches/patch-cdda2wav_local_cnf_in 1 Nov 2011 16:44:19 -0000 1.4 +++ patches/patch-cdda2wav_local_cnf_in 29 Nov 2011 21:52:41 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-cdda2wav_local_cnf_in,v 1.4 2011/11/01 16:44:19 naddy 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: patch-cdda2wav_local_cnf_in,v 1.3 2007/11/11 01:41:11 jakemsr Exp $ +--- cdda2wav/local.cnf.in.orig Tue Oct 18 15:09:55 2011 ++++ cdda2wav/local.cnf.in Tue Oct 18 15:10:47 2011 @@ -43,7 +43,7 @@ HAVE_IOCTL= $(__HAVE_IOCTL:$(_UNIQ)$(HAVE_BSD_OS)$(HAV ############# Sound device support Index: patches/patch-cdda2wav_sndconfig_c =================================================================== RCS file: patches/patch-cdda2wav_sndconfig_c diff -N patches/patch-cdda2wav_sndconfig_c --- patches/patch-cdda2wav_sndconfig_c 11 Nov 2007 01:41:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,56 +0,0 @@ -$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; - -- 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; 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-libschily_getargs_c =================================================================== RCS file: patches/patch-libschily_getargs_c diff -N patches/patch-libschily_getargs_c --- patches/patch-libschily_getargs_c 30 Nov 2004 05:44:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$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) - int *pac; - char *const **pav; -- register const char *argp; -- register const char *fmt; -+ const char *argp; -+ const char *fmt; - BOOL setargs; - 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 29 Nov 2011 21:52:41 -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 @@ +--- libschily/printf.c.orig Tue Oct 18 15:16:34 2011 ++++ libschily/printf.c Tue Oct 18 15:16:44 2011 +@@ -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 29 Nov 2011 21:52:41 -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
