diff options
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/gcdmaster/Makefile | 11 | ||||
-rw-r--r-- | sysutils/gcdmaster/PLIST | 11 | ||||
-rw-r--r-- | sysutils/gcdmaster/distinfo | 12 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-ac | 37 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-ad | 10 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-ae | 10 |
6 files changed, 64 insertions, 27 deletions
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile index 1f1eef684c6..08f0515b253 100644 --- a/sysutils/gcdmaster/Makefile +++ b/sysutils/gcdmaster/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2002/09/12 00:25:29 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/10/29 16:50:14 drochner Exp $ # -DISTNAME= cdrdao-1.1.5.src -PKGNAME= gcdmaster-1.1.5 -PKGREVISION= 2 -WRKSRC= ${WRKDIR}/cdrdao-1.1.5 +DISTNAME= cdrdao-1.1.7.src +PKGNAME= gcdmaster-1.1.7 +WRKSRC= ${WRKDIR}/cdrdao-1.1.7 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/} @@ -12,7 +11,7 @@ MAINTAINER= David Maxwell <david@maxwell.net> HOMEPAGE= http://cdrdao.sourceforge.net/gcdmaster/index.html COMMENT= GUI for cdrdao with some editing capability -DEPENDS+= cdrdao-1.1.5:../../sysutils/cdrdao +DEPENDS+= cdrdao-1.1.7:../../sysutils/cdrdao USE_X11BASE= YES GNU_CONFIGURE= YES diff --git a/sysutils/gcdmaster/PLIST b/sysutils/gcdmaster/PLIST index 18f29ec9586..1c0ef6c5c63 100644 --- a/sysutils/gcdmaster/PLIST +++ b/sysutils/gcdmaster/PLIST @@ -1,14 +1,23 @@ -@comment $NetBSD: PLIST,v 1.2 2002/09/12 00:25:29 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/10/29 16:50:14 drochner Exp $ bin/gcdmaster man/man1/xcdrdao.1 share/pixmaps/gcdmaster/gcdmaster.png share/pixmaps/gcdmaster/pixmap_audiocd.png share/pixmaps/gcdmaster/pixmap_copycd.png +share/pixmaps/gcdmaster/pixmap_cursor-tool.xpm share/pixmaps/gcdmaster/pixmap_datacd.png share/pixmaps/gcdmaster/pixmap_dumpcd.png share/pixmaps/gcdmaster/pixmap_help.png share/pixmaps/gcdmaster/pixmap_mixedcd.png share/pixmaps/gcdmaster/pixmap_open.png +share/pixmaps/gcdmaster/pixmap_play-pause.xpm +share/pixmaps/gcdmaster/pixmap_play-start.xpm +share/pixmaps/gcdmaster/pixmap_play-stop.xpm +share/pixmaps/gcdmaster/pixmap_zoom-fit.xpm +share/pixmaps/gcdmaster/pixmap_zoom-in.xpm +share/pixmaps/gcdmaster/pixmap_zoom-out.xpm +share/pixmaps/gcdmaster/pixmap_zoom-selection.xpm +share/pixmaps/gcdmaster/pixmap_zoom-tool.xpm share/gnome/apps/Applications/gcdmaster.desktop @dirrm share/pixmaps/gcdmaster @unexec ${RMDIR} %D/share/gnome/apps/Applications 2> /dev/null || ${TRUE} diff --git a/sysutils/gcdmaster/distinfo b/sysutils/gcdmaster/distinfo index ead5fe880d2..c655efc21a4 100644 --- a/sysutils/gcdmaster/distinfo +++ b/sysutils/gcdmaster/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $ +$NetBSD: distinfo,v 1.2 2002/10/29 16:50:14 drochner Exp $ -SHA1 (cdrdao-1.1.5.src.tar.gz) = f766277957b8d4eeaa7ec1162ded9b0bf04c4c79 -Size (cdrdao-1.1.5.src.tar.gz) = 868001 bytes +SHA1 (cdrdao-1.1.7.src.tar.gz) = d688f8b117de367841958f1ca977100fc4e8484b +Size (cdrdao-1.1.7.src.tar.gz) = 1433366 bytes SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa -SHA1 (patch-ac) = 92e971a906662feea0311c4f274743bbf9667b47 -SHA1 (patch-ad) = 06fbb3835e49718f90649f3043f72aca1fbdb944 -SHA1 (patch-ae) = b1b22431e6beefb32807ffcedf2b266f761ad4f2 +SHA1 (patch-ac) = 7392aad2b18b670023396b47715b292d8046b495 +SHA1 (patch-ad) = 914ee4ce9a22a9b47748c206f96666552bc9bc1e +SHA1 (patch-ae) = 20c1ae7a24751a01454573ee029ca2c7ad484903 SHA1 (patch-af) = 51df1d3323a238280bb218a124db583a5c70345f SHA1 (patch-ag) = 1f98efd2c8ea46bc4ec148fb7170e192d94b7780 diff --git a/sysutils/gcdmaster/patches/patch-ac b/sysutils/gcdmaster/patches/patch-ac index b14b4e5f06e..3ae84979e99 100644 --- a/sysutils/gcdmaster/patches/patch-ac +++ b/sysutils/gcdmaster/patches/patch-ac @@ -1,8 +1,37 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $ +$NetBSD: patch-ac,v 1.2 2002/10/29 16:50:14 drochner Exp $ ---- scsilib/include/btorder.h.orig Sun Apr 29 11:28:21 2001 -+++ scsilib/include/btorder.h Fri May 18 19:04:13 2001 -@@ -54,6 +54,15 @@ +--- ./scsilib/include/btorder.h.orig Sun Nov 25 16:35:10 2001 ++++ ./scsilib/include/btorder.h Tue Oct 29 09:33:02 2002 +@@ -63,35 +63,21 @@ + #endif + + +-/* +- * Convert byte-order definitions from xconfig.h into our values +- * and verify them. +- */ +-#if defined(HAVE_C_BIGENDIAN) && \ +- !defined(WORDS_BIGENDIAN) +-#define WORDS_LITTLEENDIAN +-#define _LITTLE_ENDIAN +-#endif +- +-#if defined(HAVE_C_BIGENDIAN) && \ +- defined(WORDS_BIGENDIAN) +-#define _BIG_ENDIAN +-#endif +- +-#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) +-/* +- * #error will not work for all compilers (e.g. sunos4) +- * The following line will abort compilation on all compilers +- * if none of the above is defines. And that's what we want. +- */ +-error Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined +-#endif + + + #if defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL) /* * Bitorder is already known. */ diff --git a/sysutils/gcdmaster/patches/patch-ad b/sysutils/gcdmaster/patches/patch-ad index a612f5f931d..8d9152ccfc1 100644 --- a/sysutils/gcdmaster/patches/patch-ad +++ b/sysutils/gcdmaster/patches/patch-ad @@ -1,14 +1,14 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $ +$NetBSD: patch-ad,v 1.2 2002/10/29 16:50:15 drochner Exp $ ---- Makefile.in.orig Sun Apr 29 15:42:08 2001 -+++ Makefile.in Sat May 19 13:48:00 2001 +--- Makefile.in.orig Sun Oct 6 20:53:55 2002 ++++ Makefile.in Tue Oct 29 14:09:07 2002 @@ -41,8 +41,8 @@ # # # --SUBDIRS = @scsilib_dir@ edc_ecc trackdb paranoia dao utils @xdao@ +-SUBDIRS = @pccts_target@ @scsilib_dir@ trackdb paranoia dao utils @xdao@ -SUBDIRSINST = trackdb dao utils @xdao@ -+SUBDIRS = @scsilib_dir@ edc_ecc trackdb paranoia dao @xdao@ ++SUBDIRS = @scsilib_dir@ trackdb paranoia dao @xdao@ +SUBDIRSINST = @xdao@ all: diff --git a/sysutils/gcdmaster/patches/patch-ae b/sysutils/gcdmaster/patches/patch-ae index b148f837795..1802f51df1d 100644 --- a/sysutils/gcdmaster/patches/patch-ae +++ b/sysutils/gcdmaster/patches/patch-ae @@ -1,11 +1,11 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $ +$NetBSD: patch-ae,v 1.2 2002/10/29 16:50:15 drochner Exp $ ---- xdao/Makefile.in.orig Sat May 19 13:04:18 2001 -+++ xdao/Makefile.in Sat May 19 13:04:58 2001 -@@ -57,7 +57,7 @@ +--- xdao/Makefile.in.orig Sun Sep 15 18:34:48 2002 ++++ xdao/Makefile.in Tue Oct 29 13:00:56 2002 +@@ -58,7 +58,7 @@ + DeviceList.cc RecordTocSource.cc RecordCDSource.cc \ RecordHDTarget.cc AudioCDView.cc TocEditView.cc GenericChild.cc \ GenericView.cc CdTextDialog.cc \ - gcdmaster.cc Project.cc ProjectChooser.cc ViewSwitcher.cc \ - @sound_if_src@ + SoundIF-linux.cc |