summaryrefslogtreecommitdiff
path: root/sysutils/cdrdao
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2005-06-04 19:01:46 +0000
committeradrianp <adrianp@pkgsrc.org>2005-06-04 19:01:46 +0000
commit831ba1aba174a76fdaa11c14e3c8742130ab460a (patch)
treec9a426448c1ccc0c0c285c25edaef72f29ada6da /sysutils/cdrdao
parentac04443c88b68e0f5b236b6442c39b810428f8a2 (diff)
downloadpkgsrc-831ba1aba174a76fdaa11c14e3c8742130ab460a.tar.gz
- Merge gcdmaster and cdrdao files but keep them as separate packages
Diffstat (limited to 'sysutils/cdrdao')
-rw-r--r--sysutils/cdrdao/Makefile46
-rw-r--r--sysutils/cdrdao/Makefile.common37
-rw-r--r--sysutils/cdrdao/PLIST.cdrdao42
-rw-r--r--sysutils/cdrdao/PLIST.gcdmaster5
-rw-r--r--sysutils/cdrdao/distinfo4
-rw-r--r--sysutils/cdrdao/patches/patch-ai13
-rw-r--r--sysutils/cdrdao/patches/patch-aj21
7 files changed, 133 insertions, 35 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index b94bcf95a76..30e0d891dbc 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,39 +1,21 @@
-# $NetBSD: Makefile,v 1.23 2005/05/28 21:50:19 tron Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/04 19:05:38 adrianp Exp $
-DISTNAME= cdrdao-1.2.0
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
+.include "../../sysutils/cdrdao/Makefile.common"
-MAINTAINER= david@maxwell.net
-HOMEPAGE= http://cdrdao.sourceforge.net/
-COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
+PKGNAME= cdrdao-${CDRDAO_VER}
-PKG_INSTALLATION_TYPES= overwrite pkgviews
+COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_LANGUAGES= c c++
-CONFIGURE_ARGS+= --with-pcctsbin=${PREFIX}/bin
-CONFIGURE_ARGS+= --with-pcctsinc=${PREFIX}/include/pccts
-CONFIGURE_ARGS+= --with-gtkmm-exec-prefix=/dev/null
-# don't pick up an installed libcdda_paranoia
-LDFLAGS+= -L../paranoia
+PKGDIR= ${.CURDIR}/../../sysutils/cdrdao
+FILESDIR= ${PKGDIR}/files
+PATCHDIR= ${PKGDIR}/patches
+DISTINFO_FILE= ${PKGDIR}/distinfo
+PLIST_SRC= ${PKGDIR}/PLIST.cdrdao
+CONFIGURE_ARGS+= --without-xdao
.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=""
-
-
-post-configure:
- cd ${WRKSRC}/scsilib/RULES ; \
- ${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
- ${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
- ${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
- ${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
+.endif
post-install:
${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao
@@ -57,9 +39,5 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \
${PREFIX}/share/examples/cdrdao
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/pccts/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrdao/Makefile.common b/sysutils/cdrdao/Makefile.common
new file mode 100644
index 00000000000..00f5e82d6e6
--- /dev/null
+++ b/sysutils/cdrdao/Makefile.common
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile.common,v 1.1 2005/06/04 19:05:38 adrianp Exp $
+
+DISTNAME= cdrdao-${CDRDAO_VER}
+PKGREVISION= 1
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
+
+MAINTAINER= david@maxwell.net
+HOMEPAGE= http://cdrdao.sourceforge.net/
+COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
+
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
+CDRDAO_VER= 1.2.0
+GNU_CONFIGURE= YES
+USE_TOOLS+= gmake
+USE_LANGUAGES= c c++
+CONFIGURE_ARGS+= --with-pcctsbin=${PREFIX}/bin
+CONFIGURE_ARGS+= --with-pcctsinc=${PREFIX}/include/pccts
+CONFIGURE_ARGS+= --with-gtkmm-exec-prefix=/dev/null
+# don't pick up an installed libcdda_paranoia
+LDFLAGS+= -L../paranoia
+
+# override ARCH to avoid picking up a bad ${ARCH} during the build
+MAKE_ENV+= ARCH=""
+
+post-configure:
+ cd ${WRKSRC}/scsilib/RULES ; \
+ ${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
+ ${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
+ ${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
+ ${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
+
+.include "../../audio/libao/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/pccts/buildlink3.mk"
diff --git a/sysutils/cdrdao/PLIST.cdrdao b/sysutils/cdrdao/PLIST.cdrdao
new file mode 100644
index 00000000000..d6f20413510
--- /dev/null
+++ b/sysutils/cdrdao/PLIST.cdrdao
@@ -0,0 +1,42 @@
+@comment $NetBSD: PLIST.cdrdao,v 1.1 2005/06/04 19:05:38 adrianp Exp $
+bin/cdrdao
+bin/cue2toc
+bin/toc2cddb
+bin/toc2cue
+man/man1/cdrdao.1
+man/man1/cue2toc.1
+share/cdrdao/drivers
+share/doc/cdrdao/README
+share/doc/cdrdao/README.PlexDAE
+share/doc/cdrdao/testtocs/cdtext.toc
+share/doc/cdrdao/testtocs/data1.toc
+share/doc/cdrdao/testtocs/data2.toc
+share/doc/cdrdao/testtocs/data3.toc
+share/doc/cdrdao/testtocs/data4.toc
+share/doc/cdrdao/testtocs/data5.toc
+share/doc/cdrdao/testtocs/data6.toc
+share/doc/cdrdao/testtocs/data7.toc
+share/doc/cdrdao/testtocs/mode1_rw.toc
+share/doc/cdrdao/testtocs/mode1_rw_raw.toc
+share/doc/cdrdao/testtocs/t1.toc
+share/doc/cdrdao/testtocs/t2.toc
+share/doc/cdrdao/testtocs/t3.toc
+share/doc/cdrdao/testtocs/t4.toc
+share/doc/cdrdao/testtocs/t5.toc
+share/doc/cdrdao/testtocs/t6.toc
+share/doc/cdrdao/testtocs/t7.toc
+share/doc/cdrdao/testtocs/t8.toc
+share/doc/cdrdao/testtocs/t9.toc
+share/examples/cdrdao/mp32dao.pl
+share/examples/cdrdao/psxcopy/Makefile
+share/examples/cdrdao/psxcopy/README
+share/examples/cdrdao/psxcopy/cdjob.c
+share/examples/cdrdao/psxcopy/psxdump.c
+share/examples/cdrdao/psxcopy/read-psx
+share/examples/cdrdao/psxcopy/write-psx
+share/examples/cdrdao/wav2dao.pl
+@dirrm share/examples/cdrdao/psxcopy
+@dirrm share/examples/cdrdao
+@dirrm share/doc/cdrdao/testtocs
+@dirrm share/doc/cdrdao
+@dirrm share/cdrdao
diff --git a/sysutils/cdrdao/PLIST.gcdmaster b/sysutils/cdrdao/PLIST.gcdmaster
new file mode 100644
index 00000000000..d7b5e24807b
--- /dev/null
+++ b/sysutils/cdrdao/PLIST.gcdmaster
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.gcdmaster,v 1.1 2005/06/04 19:05:38 adrianp Exp $
+bin/gcdmaster
+man/man1/gcdmaster.1
+share/applications/gcdmaster.desktop
+share/pixmaps/gcdmaster.png
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 7289481c33f..1dffa31866c 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/05/27 08:39:26 adrianp Exp $
+$NetBSD: distinfo,v 1.13 2005/06/04 19:05:38 adrianp Exp $
SHA1 (cdrdao-1.2.0.tar.gz) = 0da9f0ae829dba5afe7efc34981ce4ad1dd7d210
RMD160 (cdrdao-1.2.0.tar.gz) = 031be2ce0ed0894d1026a90f9ce62b3154849d14
@@ -11,3 +11,5 @@ SHA1 (patch-ae) = 0d352c9815401131b8d6ec8ecf5ecc8e1a572b45
SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca
SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a
SHA1 (patch-ah) = 1ec8be46c29c4af2f5fdecccae5b2aa4a7f9893f
+SHA1 (patch-ai) = 84f868e768b6eb44e506972cc73ad4795b7b1aaa
+SHA1 (patch-aj) = 233ffacfe7ccecba0ac6118b18357771465a20dd
diff --git a/sysutils/cdrdao/patches/patch-ai b/sysutils/cdrdao/patches/patch-ai
new file mode 100644
index 00000000000..7c18f898f0f
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/06/04 19:05:38 adrianp Exp $
+
+--- configure.orig 2005-06-04 15:19:02.000000000 +0100
++++ configure
+@@ -10514,7 +10514,7 @@ _ACEOF
+ esac
+
+ case "$host" in
+- *-linux-* | *-freebsd[456]* | *-solaris*)
++ *-linux-* | *-freebsd[456]* | *-solaris* | *-netbsd*)
+ sound_if_obj=SoundIF-ao.o
+ ;;
+
diff --git a/sysutils/cdrdao/patches/patch-aj b/sysutils/cdrdao/patches/patch-aj
new file mode 100644
index 00000000000..7aecc5d9af9
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.1 2005/06/04 19:05:38 adrianp Exp $
+
+--- xdao/SoundIF-solaris.cc.orig 2004-07-04 22:05:21.000000000 +0200
++++ xdao/SoundIF-solaris.cc
+@@ -42,6 +42,7 @@
+ * Sound interface for Solaris. Thanks to Tobias Oetiker <oetiker@ee.ethz.ch>.
+ */
+
++#include <sys/types.h>
+ #include <sys/audioio.h>
+ #include <stdio.h>
+ #include <assert.h>
+@@ -194,7 +195,7 @@ int SoundIFImpl::setupDevice()
+ auinf.play.sample_rate=44100;
+ auinf.play.channels=2;
+ auinf.play.precision=16;
+- auinf.play.encoding=AUDIO_ENCODING_LINEAR;
++ auinf.play.encoding=AUDIO_ENCODING_SLINEAR_BE;
+
+ if (ioctl(dspFd_, AUDIO_SETINFO, &auinf) < 0) {
+ message(-1, _("Cannot setup audio interface: %s"), strerror(errno));