Update to 0.1.33. I also smacked this port into using the system libintl

instead of its own, and cleaned up the DESCR a little bit.

PR:		18913
Submitted by:	Adam <bsdx@looksharp.net>
No response:	maintainer

5 files changed, 25 insertions, 12 deletions

diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 753a4a9b0753..0acdb06c3cd0 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -6,21 +6,24 @@
 #
 
 PORTNAME=	gcombust
-PORTVERSION=	0.1.32
+PORTVERSION=	0.1.33
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.abo.fi/~jmunsin/gcombust/
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		intl.1:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrecord
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrecord \
+		mkisofs:${PORTSDIR}/sysutils/mkisofs \
+		cdlabelgen:${PORTSDIR}/print/cdlabelgen
 
-GNU_CONFIGURE=	yes
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${PREFIX}/bin/gtk12-config
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
+CONFIGURE_ENV+=	GTK_CONFIG=${GTK_CONFIG} CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/include"
 
-# for patch-ab (/dev/cd0a -> /dev/rcd0a)
 post-configure:
 	cd ${WRKSRC}/po && ${MAKE} update-po
 
diff --git a/sysutils/gcombust/distinfo b/sysutils/gcombust/distinfo
index da4dfd095f06..b95353f0c58b 100644
--- a/sysutils/gcombust/distinfo
+++ b/sysutils/gcombust/distinfo
@@ -1 +1 @@
-MD5 (gcombust-0.1.32.tar.gz) = 08364e55ce463a54ccd26904e304be50
+MD5 (gcombust-0.1.33.tar.gz) = ae0dc2e2dce7f084b295be3218c68614
diff --git a/sysutils/gcombust/files/patch-ae b/sysutils/gcombust/files/patch-ae
new file mode 100644
index 000000000000..6f74cd9cfe9f
--- /dev/null
+++ b/sysutils/gcombust/files/patch-ae
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in	Sun Jun 27 16:00:41 1999
++++ po/Makefile.in.in.new	Wed May 31 05:31:52 2000
+@@ -18,7 +18,7 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-datadir = $(prefix)/@DATADIRNAME@
++datadir = @datadir@
+ localedir = $(datadir)/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/sysutils/gcombust/pkg-descr b/sysutils/gcombust/pkg-descr
index 7b36c6851677..5a5c786fe04d 100644
--- a/sysutils/gcombust/pkg-descr
+++ b/sysutils/gcombust/pkg-descr
@@ -5,7 +5,6 @@ would probably be wise to test it with the -dummy option at first to check that
 I haven't made any stupid errors. Also, it prints the command it's executing to
 stdout so you can look at it and maybe spot errors.
 
-
 I love to recieve feedback/comments/ideas/bugreports at:
 	jmunsin@iki.fi (jmunsin@abo.fi)
 
@@ -13,7 +12,4 @@ NOTE: If you decide to do a NLS translation of gcombust, it might be a good
 	idea to mail me about it to make sure noone else is doing one for the
 	same language.
 
-Flames to:
-	/dev/null
-
 WWW: http://www.abo.fi/~jmunsin/gcombust/
diff --git a/sysutils/gcombust/pkg-plist b/sysutils/gcombust/pkg-plist
index ca26994741b0..26c1fd3d1f77 100644
--- a/sysutils/gcombust/pkg-plist
+++ b/sysutils/gcombust/pkg-plist
@@ -4,7 +4,10 @@ share/doc/gcombust/NEWS
 share/locale/de/LC_MESSAGES/gcombust.mo
 share/locale/es/LC_MESSAGES/gcombust.mo
 share/locale/fr/LC_MESSAGES/gcombust.mo
+share/locale/hu/LC_MESSAGES/gcombust.mo
 share/locale/ja/LC_MESSAGES/gcombust.mo
+share/locale/ko/LC_MESSAGES/gcombust.mo
 share/locale/no/LC_MESSAGES/gcombust.mo
+share/locale/ru/LC_MESSAGES/gcombust.mo
 share/locale/sv/LC_MESSAGES/gcombust.mo
 @dirrm share/doc/gcombust