- Merge gcdmaster and cdrdao files but keep them as separate packages

13 files changed, 117 insertions, 157 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/gcdmaster/PLIST b/sysutils/cdrdao/PLIST.gcdmaster
index ff5dec7b5e4..d7b5e24807b 100644
--- a/sysutils/gcdmaster/PLIST
+++ b/sysutils/cdrdao/PLIST.gcdmaster
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/07/06 20:57:45 drochner Exp $
+@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
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/gcdmaster/patches/patch-ae b/sysutils/cdrdao/patches/patch-ai
index 838433d6c21..7c18f898f0f 100644
--- a/sysutils/gcdmaster/patches/patch-ae
+++ b/sysutils/cdrdao/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2005/06/04 16:43:37 adrianp Exp $
+$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
diff --git a/sysutils/gcdmaster/patches/patch-ah b/sysutils/cdrdao/patches/patch-aj
index f92d6695499..7aecc5d9af9 100644
--- a/sysutils/gcdmaster/patches/patch-ah
+++ b/sysutils/cdrdao/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2004/07/06 20:57:45 drochner Exp $
+$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
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 2ace9bff7e7..70e1a49508f 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,46 +1,36 @@
-# $NetBSD: Makefile,v 1.23 2005/06/04 16:43:37 adrianp Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/04 19:02:07 adrianp Exp $
 #
 
-DISTNAME=		cdrdao-1.2.0
-PKGNAME=		gcdmaster-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/gcdmaster/index.html
-COMMENT=		GUI for cdrdao with some editing capability
+PKGNAME=		gcdmaster-${CDRDAO_VER}
+COMMENT=		Gnome UI frontend to cdrdao
 
-DEPENDS+=		cdrdao-1.2.0nb1:../../sysutils/cdrdao
+DEPENDS+=		cdrdao-${PKGVERSION}:../../sysutils/cdrdao
+
+PKGDIR=         	${.CURDIR}/../../sysutils/cdrdao
+FILESDIR=       	${PKGDIR}/files
+PATCHDIR=       	${PKGDIR}/patches
+DISTINFO_FILE=  	${PKGDIR}/distinfo
+PLIST_SRC=		${PKGDIR}/PLIST.gcdmaster
+WRKSRC=			${WRKDIR}/cdrdao-${CDRDAO_VER}
 
-WRKSRC=			${WRKDIR}/cdrdao-1.2.0
 USE_X11BASE=		YES
-GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome1-1.5
-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
-MAKE_ENV+=      ARCH=""
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \
+		${PREFIX}/man/man1/gcdmaster.1
+	${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \
+		${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \
+		${PREFIX}/share/pixmaps
 
 .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; \
-	${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 "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gcdmaster/distinfo b/sysutils/gcdmaster/distinfo
deleted file mode 100644
index 5f667399243..00000000000
--- a/sysutils/gcdmaster/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/06/04 16:43:37 adrianp Exp $
-
-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) = 84f868e768b6eb44e506972cc73ad4795b7b1aaa
-SHA1 (patch-ag) = 0d9b97563e05b113354a37bab78a2f0e579f9844
-SHA1 (patch-ah) = 233ffacfe7ccecba0ac6118b18357771465a20dd
diff --git a/sysutils/gcdmaster/patches/patch-ab b/sysutils/gcdmaster/patches/patch-ab
deleted file mode 100644
index 485c964d209..00000000000
--- a/sysutils/gcdmaster/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $
-
-have a default scsi device which is likely to be correct (at least
-on single CD systems).
-
---- dao/main.cc.orig	Tue Oct 26 12:13:46 1999
-+++ dao/main.cc	Fri Jul  7 12:20:08 2000
-@@ -157,5 +157,9 @@
- #else
- 
--static const char *SCSI_DEVICE = "0,0,0";
-+#if	defined (__i386__)
-+static const char *SCSI_DEVICE = "/dev/rcd0d";
-+#else
-+static const char *SCSI_DEVICE = "/dev/rcd0c";
-+#endif /* __i386__ */
- static int FIFO_BUFFERS = 32;
- 
diff --git a/sysutils/gcdmaster/patches/patch-ac b/sysutils/gcdmaster/patches/patch-ac
deleted file mode 100644
index 30a1b106e23..00000000000
--- a/sysutils/gcdmaster/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/07/06 20:57:45 drochner Exp $
-
---- scsilib/include/btorder.h.orig	2004-02-10 00:34:00.000000000 +0100
-+++ scsilib/include/btorder.h
-@@ -28,6 +28,9 @@
- #include <sys/types.h>			/* try to load isa_defs.h on Solaris */
- #define	_INCL_SYS_TYPES_H
- #endif
-+#ifdef __NetBSD__
-+#include <machine/endian.h>
-+#endif
- 
- #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 _
- #	if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
- 	    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
- 
--#		if	defined(__BIG_ENDIAN__)
-+#		if	defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN
- #			define _BIT_FIELDS_HTOL
- #		else
- #			define _BIT_FIELDS_LTOH
diff --git a/sysutils/gcdmaster/patches/patch-ad b/sysutils/gcdmaster/patches/patch-ad
deleted file mode 100644
index 287b0adb7bd..00000000000
--- a/sysutils/gcdmaster/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/07/06 20:57:45 drochner Exp $
-
---- Makefile.in.orig	2004-06-07 01:57:20.000000000 +0200
-+++ Makefile.in
-@@ -195,8 +195,8 @@ thread_libs = @thread_libs@
- @COND_SCSILIB_TRUE@MAYBE_SCSILIB = scsilib
- @COND_PCCTS_FALSE@MAYBE_PCCTS = 
- @COND_PCCTS_TRUE@MAYBE_PCCTS = pccts
--SUBDIRS = $(MAYBE_SCSILIB) $(MAYBE_PCCTS) trackdb utils paranoia dao $(MAYBE_XDAO)
--DIST_SUBDIRS = trackdb utils paranoia dao xdao
-+SUBDIRS = $(MAYBE_SCSILIB) trackdb paranoia dao $(MAYBE_XDAO)
-+DIST_SUBDIRS = xdao
- EXTRA_DIST = \
- 	AUTHORS		\
- 	ChangeLog	\
diff --git a/sysutils/gcdmaster/patches/patch-ag b/sysutils/gcdmaster/patches/patch-ag
deleted file mode 100644
index 96b33fc71f0..00000000000
--- a/sysutils/gcdmaster/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/07/06 20:57:45 drochner Exp $
-
---- dao/Makefile.in.orig	2004-07-04 21:35:51.000000000 +0200
-+++ dao/Makefile.in
-@@ -598,7 +598,7 @@ distdir: $(DISTFILES)
- 	done
- check-am: all-am
- check: check-am
--all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(DATA)
-+all-am: Makefile $(LIBRARIES) #$(PROGRAMS) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(drivertabledir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-@@ -609,7 +609,7 @@ install-data: install-data-am
- uninstall: uninstall-am
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+#	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- 
- installcheck: installcheck-am
- install-strip: