summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/gcdmaster/Makefile29
-rw-r--r--sysutils/gcdmaster/distinfo10
-rw-r--r--sysutils/gcdmaster/patches/patch-ae18
3 files changed, 31 insertions, 26 deletions
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 1bbb16450a4..2ace9bff7e7 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:32 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/06/04 16:43:37 adrianp Exp $
#
-DISTNAME= cdrdao-1.1.9
-PKGNAME= gcdmaster-1.1.9
-PKGREVISION= 1
+DISTNAME= cdrdao-1.2.0
+PKGNAME= gcdmaster-1.2.0
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
@@ -11,9 +11,9 @@ MAINTAINER= david@maxwell.net
HOMEPAGE= http://cdrdao.sourceforge.net/gcdmaster/index.html
COMMENT= GUI for cdrdao with some editing capability
-DEPENDS+= cdrdao-1.1.9:../../sysutils/cdrdao
+DEPENDS+= cdrdao-1.2.0nb1:../../sysutils/cdrdao
-WRKSRC= ${WRKDIR}/cdrdao-1.1.9
+WRKSRC= ${WRKDIR}/cdrdao-1.2.0
USE_X11BASE= YES
GNU_CONFIGURE= YES
USE_DIRS+= gnome1-1.5
@@ -21,11 +21,21 @@ USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-pcctsbin=${LOCALBASE}/bin
CONFIGURE_ARGS+= --with-pcctsinc=${LOCALBASE}/include/pccts
CONFIGURE_ARGS+= --without-posix-threads
+CONFIGURE_ARGS+= --with-xdao
LDFLAGS+= -L../paranoia
-#override ARCH to avoid picking up a bad ${ARCH} during the build
+# override ARCH to avoid picking up a bad ${ARCH} during the build
MAKE_ENV+= ARCH=""
+.include "../../devel/libgnomeuimm26/buildlink3.mk"
+.include "../../devel/libgnomemm26/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libao/buildlink3.mk"
+.include "../../devel/pccts/buildlink3.mk"
+.include "../../x11/gtkmm24/buildlink3.mk"
+
post-configure:
cd ${WRKSRC}/scsilib/RULES ; \
${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
@@ -33,9 +43,4 @@ post-configure:
${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/pccts/buildlink3.mk"
-# gtkmm must be 2.0/2.2
-.include "../../x11/gtkmm/buildlink3.mk"
-.include "../../devel/libgnomeuimm20/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gcdmaster/distinfo b/sysutils/gcdmaster/distinfo
index dbcc169ad41..5f667399243 100644
--- a/sysutils/gcdmaster/distinfo
+++ b/sysutils/gcdmaster/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/06/04 16:43:37 adrianp Exp $
-SHA1 (cdrdao-1.1.9.tar.gz) = e406940bbc2784ba249e3b7198ac7834ebda18f7
-RMD160 (cdrdao-1.1.9.tar.gz) = f420b3b5c39a5c5bf9abee18a0531788e7043d16
-Size (cdrdao-1.1.9.tar.gz) = 1581717 bytes
+SHA1 (cdrdao-1.2.0.tar.gz) = 0da9f0ae829dba5afe7efc34981ce4ad1dd7d210
+RMD160 (cdrdao-1.2.0.tar.gz) = 031be2ce0ed0894d1026a90f9ce62b3154849d14
+Size (cdrdao-1.2.0.tar.gz) = 2041966 bytes
SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa
SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f
SHA1 (patch-ad) = dd79dc63180e9e0d53406b61a940de7c9fecc7be
-SHA1 (patch-ae) = 464a8efdfb2b69c4c2abee4bee902a4795f955b0
+SHA1 (patch-ae) = 84f868e768b6eb44e506972cc73ad4795b7b1aaa
SHA1 (patch-ag) = 0d9b97563e05b113354a37bab78a2f0e579f9844
SHA1 (patch-ah) = 233ffacfe7ccecba0ac6118b18357771465a20dd
diff --git a/sysutils/gcdmaster/patches/patch-ae b/sysutils/gcdmaster/patches/patch-ae
index d7188ab6d92..838433d6c21 100644
--- a/sysutils/gcdmaster/patches/patch-ae
+++ b/sysutils/gcdmaster/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2004/07/06 20:57:45 drochner Exp $
+$NetBSD: patch-ae,v 1.4 2005/06/04 16:43:37 adrianp Exp $
---- configure.orig 2004-07-04 21:55:27.000000000 +0200
+--- configure.orig 2005-06-04 15:19:02.000000000 +0100
+++ configure
-@@ -9885,7 +9885,7 @@ case "$host" in
- sound_if_obj=SoundIF-linux.o
- ;;
+@@ -10514,7 +10514,7 @@ _ACEOF
+ esac
-- *-solaris*)
-+ *-solaris* | *-netbsd*)
- sound_if_obj=SoundIF-solaris.o
- ;;
+ case "$host" in
+- *-linux-* | *-freebsd[456]* | *-solaris*)
++ *-linux-* | *-freebsd[456]* | *-solaris* | *-netbsd*)
+ sound_if_obj=SoundIF-ao.o
+ ;;