Update gcombust to 0.1.49. Changes are tons of bugfixes, most notably

gcombust now works together with cdrecord-1.10.  This release also
comes with several user interface enhancements and more translations.

4 files changed, 17 insertions, 38 deletions

diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 2683bb0f6c5..2339eab2bb5 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2002/03/13 17:37:42 fredb Exp $
+# $NetBSD: Makefile,v 1.27 2002/03/16 02:24:19 rh Exp $
 #
 
-DISTNAME=	gcombust-0.1.42
-PKGREVISION=	1
+DISTNAME=	gcombust-0.1.49
 CATEGORIES=	x11 sysutils
 MASTER_SITES=	${HOMEPAGE}
 
@@ -10,13 +9,11 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.abo.fi/~jmunsin/gcombust/
 COMMENT=	Graphical frontend for CD mastering (mkhybrid, cdrecord, ...)
 
-DEPENDS+=	cdrecord>=1.9:../cdrecord
+DEPENDS+=	cdrecord>=1.10:../../sysutils/cdrecord
 DEPENDS+=	cdlabelgen-[0-9]*:../../graphics/cdlabelgen
 DEPENDS+=	gv-[0-9]*:../../print/gv
 DEPENDS+=	gtk+>=1.2.4:../../x11/gtk
 
-CONFLICTS=	cdrecord-1.9a*	# won't work with old alpha versions
-
 GNU_CONFIGURE=	YES
 USE_LIBINTL=	YES
 
diff --git a/sysutils/gcombust/PLIST b/sysutils/gcombust/PLIST
index ce5a50cf219..fb2612e75f7 100644
--- a/sysutils/gcombust/PLIST
+++ b/sysutils/gcombust/PLIST
@@ -1,15 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/16 02:24:19 rh Exp $
 bin/gcombust
 share/gnome/apps/Applications/gcombust.desktop
-share/locale/sv/LC_MESSAGES/gcombust.mo
-share/locale/es/LC_MESSAGES/gcombust.mo
+share/locale/da/LC_MESSAGES/gcombust.mo
 share/locale/de/LC_MESSAGES/gcombust.mo
-share/locale/no/LC_MESSAGES/gcombust.mo
-share/locale/ja/LC_MESSAGES/gcombust.mo
+share/locale/es/LC_MESSAGES/gcombust.mo
 share/locale/fr/LC_MESSAGES/gcombust.mo
+share/locale/gl/LC_MESSAGES/gcombust.mo
+share/locale/hr/LC_MESSAGES/gcombust.mo
 share/locale/hu/LC_MESSAGES/gcombust.mo
+share/locale/it/LC_MESSAGES/gcombust.mo
+share/locale/ja/LC_MESSAGES/gcombust.mo
 share/locale/ko/LC_MESSAGES/gcombust.mo
+share/locale/nl/LC_MESSAGES/gcombust.mo
+share/locale/no/LC_MESSAGES/gcombust.mo
 share/locale/ru/LC_MESSAGES/gcombust.mo
-share/locale/da/LC_MESSAGES/gcombust.mo
-share/locale/it/LC_MESSAGES/gcombust.mo
+share/locale/sk/LC_MESSAGES/gcombust.mo
+share/locale/sv/LC_MESSAGES/gcombust.mo
 share/pixmaps/gcombust.xpm
diff --git a/sysutils/gcombust/distinfo b/sysutils/gcombust/distinfo
index b31aed1f867..507f7fd2607 100644
--- a/sysutils/gcombust/distinfo
+++ b/sysutils/gcombust/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/06/11 17:46:17 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2002/03/16 02:24:19 rh Exp $
 
-SHA1 (gcombust-0.1.42.tar.gz) = bc6782ae48338fa709eb70f3352c6764180f4b35
-Size (gcombust-0.1.42.tar.gz) = 556248 bytes
-SHA1 (patch-aa) = fa286f135553e7339e2dc97fbb343f68c43114ef
+SHA1 (gcombust-0.1.49.tar.gz) = 0d89c2af5a575e91a82d05ee9ed282f7d9e2905b
+Size (gcombust-0.1.49.tar.gz) = 777203 bytes
 SHA1 (patch-ab) = 437e15e09601345b75afac2f9d6b3e755e4c936d
diff --git a/sysutils/gcombust/patches/patch-aa b/sysutils/gcombust/patches/patch-aa
deleted file mode 100644
index bb48e14af27..00000000000
--- a/sysutils/gcombust/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/03/10 11:46:53 drochner Exp $
-
---- po/Makefile.in.in.orig	Tue Nov 14 20:06:57 2000
-+++ po/Makefile.in.in
-@@ -66,14 +66,14 @@
- 	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
- 
- .po.mo:
--	@if test '$(MSGFMT)' == 'no'; then \
-+	@if test '$(MSGFMT)' = 'no'; then \
- 	  echo "note: gettext not installed; can't rebuild po files"; \
- 	else \
- 	  $(MSGFMT) -o $@ $< ; \
- 	fi
- 
- .po.gmo:
--	@if test '$(MSGFMT)' == 'no'; then \
-+	@if test '$(MSGFMT)' = 'no'; then \
- 	  echo "note: gettext not installed; can't rebuild po files"; \
- 	else \
- 	  file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \