pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils - Merge gcdmaster and cdrdao files but keep t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6a8861aec696
branches: trunk
changeset: 495208:6a8861aec696
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Sat Jun 04 19:01:46 2005 +0000
description:
- Merge gcdmaster and cdrdao files but keep them as separate packages
diffstat:
sysutils/cdrdao/Makefile | 46 ++++++++-------------------------
sysutils/cdrdao/Makefile.common | 37 +++++++++++++++++++++++++++
sysutils/cdrdao/PLIST.cdrdao | 42 +++++++++++++++++++++++++++++++
sysutils/cdrdao/PLIST.gcdmaster | 5 +++
sysutils/cdrdao/distinfo | 4 ++-
sysutils/cdrdao/patches/patch-ai | 13 +++++++++
sysutils/cdrdao/patches/patch-aj | 21 +++++++++++++++
sysutils/gcdmaster/Makefile | 50 ++++++++++++++----------------------
sysutils/gcdmaster/PLIST | 5 ---
sysutils/gcdmaster/distinfo | 11 --------
sysutils/gcdmaster/patches/patch-ab | 18 -------------
sysutils/gcdmaster/patches/patch-ac | 23 -----------------
sysutils/gcdmaster/patches/patch-ad | 15 -----------
sysutils/gcdmaster/patches/patch-ae | 13 ---------
sysutils/gcdmaster/patches/patch-ag | 22 ----------------
sysutils/gcdmaster/patches/patch-ah | 21 ---------------
16 files changed, 153 insertions(+), 193 deletions(-)
diffs (truncated from 448 to 300 lines):
diff -r c3b5a49a192f -r 6a8861aec696 sysutils/cdrdao/Makefile
--- a/sysutils/cdrdao/Makefile Sat Jun 04 17:47:42 2005 +0000
+++ b/sysutils/cdrdao/Makefile Sat Jun 04 19:01:46 2005 +0000
@@ -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@localhost
-HOMEPAGE= http://cdrdao.sourceforge.net/
+PKGNAME= cdrdao-${CDRDAO_VER}
+
COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-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 @@
${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 -r c3b5a49a192f -r 6a8861aec696 sysutils/cdrdao/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrdao/Makefile.common Sat Jun 04 19:01:46 2005 +0000
@@ -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@localhost
+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 -r c3b5a49a192f -r 6a8861aec696 sysutils/cdrdao/PLIST.cdrdao
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrdao/PLIST.cdrdao Sat Jun 04 19:01:46 2005 +0000
@@ -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 -r c3b5a49a192f -r 6a8861aec696 sysutils/cdrdao/PLIST.gcdmaster
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrdao/PLIST.gcdmaster Sat Jun 04 19:01:46 2005 +0000
@@ -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 -r c3b5a49a192f -r 6a8861aec696 sysutils/cdrdao/distinfo
--- a/sysutils/cdrdao/distinfo Sat Jun 04 17:47:42 2005 +0000
+++ b/sysutils/cdrdao/distinfo Sat Jun 04 19:01:46 2005 +0000
@@ -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-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca
SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a
SHA1 (patch-ah) = 1ec8be46c29c4af2f5fdecccae5b2aa4a7f9893f
+SHA1 (patch-ai) = 84f868e768b6eb44e506972cc73ad4795b7b1aaa
+SHA1 (patch-aj) = 233ffacfe7ccecba0ac6118b18357771465a20dd
diff -r c3b5a49a192f -r 6a8861aec696 sysutils/cdrdao/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrdao/patches/patch-ai Sat Jun 04 19:01:46 2005 +0000
@@ -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 -r c3b5a49a192f -r 6a8861aec696 sysutils/cdrdao/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrdao/patches/patch-aj Sat Jun 04 19:01:46 2005 +0000
@@ -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@localhost>.
+ */
+
++#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));
diff -r c3b5a49a192f -r 6a8861aec696 sysutils/gcdmaster/Makefile
--- a/sysutils/gcdmaster/Makefile Sat Jun 04 17:47:42 2005 +0000
+++ b/sysutils/gcdmaster/Makefile Sat Jun 04 19:01:46 2005 +0000
@@ -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@localhost
-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-${PKGVERSION}:../../sysutils/cdrdao
-DEPENDS+= cdrdao-1.2.0nb1:../../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 -r c3b5a49a192f -r 6a8861aec696 sysutils/gcdmaster/PLIST
--- a/sysutils/gcdmaster/PLIST Sat Jun 04 17:47:42 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/07/06 20:57:45 drochner Exp $
-bin/gcdmaster
-man/man1/gcdmaster.1
-share/applications/gcdmaster.desktop
-share/pixmaps/gcdmaster.png
diff -r c3b5a49a192f -r 6a8861aec696 sysutils/gcdmaster/distinfo
--- a/sysutils/gcdmaster/distinfo Sat Jun 04 17:47:42 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
Home |
Main Index |
Thread Index |
Old Index