This fixes a few bugs and some gcc4-related problems.
fgsch@ (maintainer) suggests I post it here.
Any test reports/comments?
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/cdrdao/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 15 Sep 2007 23:54:16 -0000 1.28
+++ Makefile 23 Oct 2009 12:27:20 -0000
@@ -1,45 +1,53 @@
# $OpenBSD: Makefile,v 1.28 2007/09/15 23:54:16 merdely Exp $
-COMMENT= write audio/data CD-Rs in disk-at-once mode
+COMMENT = write audio/data CD-Rs in disk-at-once mode
-DISTNAME= cdrdao-1.2.0
-CATEGORIES= audio misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
-
-HOMEPAGE= http://cdrdao.sourceforge.net/
-
-MAINTAINER= Federico Schwindt <fg...@openbsd.org>
-
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m stdc++
-
-USE_GMAKE= Yes
-CONFIGURE_STYLE= gnu
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/paranoia ${WRKSRC}/scsilib/conf
-CONFIGURE_ARGS+= --with-posix-threads=no \
- --with-xdao=no
-MAKE_ENV= CCOM="${CC}"
+DISTNAME = cdrdao-1.2.3
+CATEGORIES = audio misc
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
+EXTRACT_SUFX = .tar.bz2
+
+HOMEPAGE = http://cdrdao.sourceforge.net/
+
+MAINTAINER = Federico Schwindt <fg...@openbsd.org>
+
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB = c m stdc++
+
+USE_GMAKE = Yes
+CONFIGURE_STYLE = gnu
+MODGNU_CONFIG_GUESS_DIRS = \
+ ${WRKSRC} ${WRKSRC}/paranoia ${WRKSRC}/scsilib/conf
+CONFIGURE_ARGS += --with-posix-threads=no \
+ --with-xdao=no \
+ --with-scglib
+MAKE_ENV = CCOM="${CC}"
-FLAVORS= audio
-FLAVOR?=
+FLAVORS = audio
+FLAVOR ?=
.if ${FLAVOR:L:Maudio}
-CONFIGURE_ARGS+= --with-lame-lib=${LOCALBASE}/lib \
+CONFIGURE_ARGS += --with-lame-lib=${LOCALBASE}/lib \
--with-lame-include=${LOCALBASE}/include
-BUILD_DEPENDS+= :libmad->=0.15.1bp0:audio/libmad
-LIB_DEPENDS+= ao.>=3::audio/libao \
+BUILD_DEPENDS += :libmad->=0.15.1bp0:audio/libmad
+LIB_DEPENDS += ao.>=3::audio/libao \
mp3lame::audio/lame \
mad.>=2::audio/libmad \
vorbis.>=4::audio/libvorbis
-WANTLIB+= ogg.>=5 vorbisfile.>=4
+WANTLIB += ogg.>=5 vorbisfile.>=4
.else
-CONFIGURE_ARGS+= --with-ogg-support=no \
+CONFIGURE_ARGS += --with-ogg-support=no \
--with-mp3-support=no \
--without-lame
.endif
+
+# distfile has .orig files, confusing update-patches
+post-extract:
+ @cd ${WRKSRC}; find . -name '*.orig' -print0 | xargs -r0 rm
.if ${MACHINE} != "i386" || ${CC} != "cc"
pre-configure:
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/cdrdao/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 5 Apr 2007 17:41:07 -0000 1.5
+++ distinfo 23 Oct 2009 12:27:20 -0000
@@ -1,5 +1,5 @@
-MD5 (cdrdao-1.2.0.tar.gz) = 3Cve96fIlz5ni6SkotnMfg==
-RMD160 (cdrdao-1.2.0.tar.gz) = Axvizg7QiU0QJqkPnOYrMVSEnRQ=
-SHA1 (cdrdao-1.2.0.tar.gz) = DanwroKdulr+fvw0mBzkrR3X0hA=
-SHA256 (cdrdao-1.2.0.tar.gz) = yMMMPdtoKFjFZJUXs0aB2MyaxiXN6se+7GdxwL0FqSY=
-SIZE (cdrdao-1.2.0.tar.gz) = 2041966
+MD5 (cdrdao-1.2.3.tar.bz2) = jRW6YoC7e6L01r4x0os8DA==
+RMD160 (cdrdao-1.2.3.tar.bz2) = oWK98rxNZVgYFtOp48DTuma7ZSM=
+SHA1 (cdrdao-1.2.3.tar.bz2) = cNZUd5WhNCYxx6tWcJ/RlAwq/58=
+SHA256 (cdrdao-1.2.3.tar.bz2) = gZPLj6aZisNixVgH6JrQs8Y+3GsBr66z1QQlGVJ/t14=
+SIZE (cdrdao-1.2.3.tar.bz2) = 1428695
Index: patches/patch-scsilib_RULES_i386-openbsd-cc_rul
===================================================================
RCS file:
/cvs/ports/misc/cdrdao/patches/patch-scsilib_RULES_i386-openbsd-cc_rul,v
retrieving revision 1.2
diff -u -p -r1.2 patch-scsilib_RULES_i386-openbsd-cc_rul
--- patches/patch-scsilib_RULES_i386-openbsd-cc_rul 31 May 2005 19:40:24
-0000 1.2
+++ patches/patch-scsilib_RULES_i386-openbsd-cc_rul 23 Oct 2009 12:27:20
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-scsilib_RULES_i386-openbsd-cc_rul,v 1.2 2005/05/31 19:40:24
millert Exp $
---- scsilib/RULES/i386-openbsd-cc.rul.orig Tue Oct 15 14:43:40 2002
-+++ scsilib/RULES/i386-openbsd-cc.rul Sun May 29 14:12:44 2005
+--- scsilib/RULES/i386-openbsd-cc.rul.orig Tue Oct 15 21:43:40 2002
++++ scsilib/RULES/i386-openbsd-cc.rul Thu Oct 22 21:38:52 2009
@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
###########################################################################
@@ -26,7 +26,7 @@ $OpenBSD: patch-scsilib_RULES_i386-openb
LDLIBS= $(LIBS) $(LIBX)
#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
-@@ -57,14 +57,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGE
+@@ -57,14 +57,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
FLOAT_OPTIONS=
Index: patches/patch-scsilib_RULES_rules1_top
===================================================================
RCS file: /cvs/ports/misc/cdrdao/patches/patch-scsilib_RULES_rules1_top,v
retrieving revision 1.1
diff -u -p -r1.1 patch-scsilib_RULES_rules1_top
--- patches/patch-scsilib_RULES_rules1_top 3 Oct 2001 16:08:48 -0000
1.1
+++ patches/patch-scsilib_RULES_rules1_top 23 Oct 2009 12:27:20 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-scsilib_RULES_rules1_top,v 1.1 2001/10/03 16:08:48 naddy Exp $
---- scsilib/RULES/rules1.top.orig Sun Apr 29 10:44:46 2001
-+++ scsilib/RULES/rules1.top Mon Oct 1 20:04:22 2001
-@@ -186,7 +186,7 @@ __PARCH= $(_PARCH:$(_UNIQ)=$(PARCH_DEF))
- PARCH= $(__PARCH:$(_UNIQ)%=%)
-
+--- scsilib/RULES/rules1.top.orig Sun Jul 11 00:12:30 2004
++++ scsilib/RULES/rules1.top Thu Oct 22 21:38:52 2009
+@@ -249,7 +249,7 @@ include $(_DCC)
+ #
+ ###########################################################################
#OARCH= $(MARCH)$(-O_ARCH)-$(C_ARCH)
-OARCH= $(PARCH)$(-O_ARCH)-$(C_ARCH)
+OARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
XARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
.print:
- echo $(XP_ARCH) $(P_ARCH)
+ echo $(XP_ARCH) $(P_ARCH) $(OARCH) $(XARCH)
Index: patches/patch-scsilib_include_btorder_h
===================================================================
RCS file: /cvs/ports/misc/cdrdao/patches/patch-scsilib_include_btorder_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-scsilib_include_btorder_h
--- patches/patch-scsilib_include_btorder_h 31 May 2005 19:40:24 -0000
1.3
+++ patches/patch-scsilib_include_btorder_h 23 Oct 2009 12:27:20 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-scsilib_include_btorder_h,v 1.3 2005/05/31 19:40:24 millert
Exp $
---- scsilib/include/btorder.h.orig Sun Jun 15 15:41:22 2003
-+++ scsilib/include/btorder.h Sun May 29 10:18:06 2005
+--- scsilib/include/btorder.h.orig Mon Oct 5 12:58:21 2009
++++ scsilib/include/btorder.h Thu Oct 22 21:38:52 2009
@@ -28,6 +28,9 @@
#include <sys/types.h> /* try to load isa_defs.h on
Solaris */
#define _INCL_SYS_TYPES_H
@@ -11,7 +11,7 @@ $OpenBSD: patch-scsilib_include_btorder_
#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 _
+@@ -109,7 +112,7 @@ error Only one of _BIT_FIELDS_LTOH or _BIT_FIELDS_HTO
# if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
defined(__PPC) || defined(powerpc) || defined(__powerpc__)
Index: pkg/PFRAG.audio
===================================================================
RCS file: /cvs/ports/misc/cdrdao/pkg/PFRAG.audio,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.audio
--- pkg/PFRAG.audio 4 Jun 2005 23:12:31 -0000 1.1
+++ pkg/PFRAG.audio 23 Oct 2009 12:27:20 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.audio,v 1.1 2005/06/04 23:12:31 fgsch Exp $
-bin/toc2mp3
+...@bin bin/toc2mp3
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/misc/cdrdao/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 4 Jun 2005 23:11:51 -0000 1.7
+++ pkg/PLIST 23 Oct 2009 12:27:20 -0000
@@ -1,11 +1,13 @@
@comment $OpenBSD: PLIST,v 1.7 2005/06/04 23:11:51 fgsch Exp $
-bin/cdrdao
-bin/cue2toc
-bin/toc2cddb
-bin/toc2cue
+...@bin bin/cdrdao
+...@bin bin/cue2toc
+...@bin bin/toc2cddb
+...@bin bin/toc2cue
%%audio%%
@man man/man1/cdrdao.1
@man man/man1/cue2toc.1
+...@man man/man1/toc2cddb.1
+...@man man/man1/toc2cue.1
share/cdrdao/
share/cdrdao/drivers
share/doc/cdrdao/
