-remove dependency on mkhybrid - it is part of cdrecord/mkisofs now

-fix build problem - incompatible arguments to /bin/test
-update to 0.1.42. Changes since 0.1.39:
It is now possible to specify additional switches for mkisofs/cdrecord. Added
desktop entry, updated da.po, updated README.irix, updated README.hp-ux.html
and a couple of minor bugfixes.
Added a del all button in the audio files view, a minor UI change, updated
da.po, some spelling fixes. No big or important changes, but I might as well
release it now in case I don't have time later (and it makes me feel like I've
done something besides watching tv today ;). I really, really should be working
on my getting M.Sc. thesis done.
A pile of bugfixes. cdparanoia interface improvments. ja.po update. The audio
view now show the total time. See the Changelog for more info.

5 files changed, 31 insertions, 6 deletions

diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 22b13112295..2f4db5c9cb6 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2001/02/17 17:42:13 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/03/10 11:46:52 drochner Exp $
 #
 
-DISTNAME=	gcombust-0.1.39
+DISTNAME=	gcombust-0.1.42
 CATEGORIES=	x11 sysutils
 MASTER_SITES=	${HOMEPAGE}
 
@@ -9,7 +9,6 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.abo.fi/~jmunsin/gcombust/
 COMMENT=	Graphical frontend for CD mastering (mkhybrid, cdrecord, ...)
 
-DEPENDS+=	mkhybrid-*:../mkhybrid
 DEPENDS+=	cdrecord>=1.9:../cdrecord
 DEPENDS+=	cdlabelgen-*:../../graphics/cdlabelgen
 DEPENDS+=	gv-*:../../print/gv
diff --git a/sysutils/gcombust/files/md5 b/sysutils/gcombust/files/md5
index a89dd1395d0..228711b4625 100644
--- a/sysutils/gcombust/files/md5
+++ b/sysutils/gcombust/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.16 2001/01/05 19:59:49 rh Exp $
+$NetBSD: md5,v 1.17 2001/03/10 11:46:53 drochner Exp $
 
-MD5 (gcombust-0.1.39.tar.gz) = 7c364be7e3d4ebff58ace64f9481e4e0
+SHA1 (gcombust-0.1.42.tar.gz) = bc6782ae48338fa709eb70f3352c6764180f4b35
diff --git a/sysutils/gcombust/files/patch-sum b/sysutils/gcombust/files/patch-sum
new file mode 100644
index 00000000000..d776048e804
--- /dev/null
+++ b/sysutils/gcombust/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.3 2001/03/10 11:46:53 drochner Exp $
+
+SHA1 (patch-aa) = fa286f135553e7339e2dc97fbb343f68c43114ef
diff --git a/sysutils/gcombust/patches/patch-aa b/sysutils/gcombust/patches/patch-aa
new file mode 100644
index 00000000000..bb48e14af27
--- /dev/null
+++ b/sysutils/gcombust/patches/patch-aa
@@ -0,0 +1,21 @@
+$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 \
diff --git a/sysutils/gcombust/pkg/PLIST b/sysutils/gcombust/pkg/PLIST
index 9ac2ae950e3..69acf9c21c9 100644
--- a/sysutils/gcombust/pkg/PLIST
+++ b/sysutils/gcombust/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2001/01/05 19:59:49 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/03/10 11:46:54 drochner 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/de/LC_MESSAGES/gcombust.mo
@@ -11,3 +12,4 @@ share/locale/ko/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/pixmaps/gcombust.xpm