- Update to 0.5.0.

- Add OPTIONS to enable CJK and/or DVD dependancies.

Submitted by:	maintainer

5 files changed, 42 insertions, 18 deletions

diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 1a370f67b13c..ec95a4d48839 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		gnomebaker
-PORTVERSION=		0.4.2
+PORTVERSION=		0.5.0
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomebaker
@@ -14,12 +14,8 @@ DIST_SUBDIR=		gnome2
 MAINTAINER=		dominique.goncalves@gmail.com
 COMMENT=		A CD/DVD recording GUI for Gnome
 
-RUN_DEPENDS=		cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk \
-			cdrdao:${PORTSDIR}/sysutils/cdrdao
-
-.if defined(WITH_DVD)
-RUN_DEPENDS+=		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
-.endif
+OPTIONS=		DVD "Enable DVD support" off \
+			CJK "Use cdrtools-cjk instead of cdrtools" off
 
 USE_X_PREFIX=		yes
 USE_GNOME=		gnomeprefix gnomehack libgnomeui desktopfileutils
@@ -32,12 +28,21 @@ USE_GSTREAMER=		vorbis mad flac
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define WITH_DVD=yes to enable dvd support."
-	@${ECHO_MSG} ""
+.include <bsd.port.pre.mk>
+
+RUN_DEPENDS+=		cdrdao:${PORTSDIR}/sysutils/cdrdao
+
+.if defined(WITH_CJK)
+RUN_DEPENDS+=		cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk
+.else
+RUN_DEPENDS+=		cdrecord:${PORTSDIR}/sysutils/cdrtools
+.endif
+
+.if defined(WITH_DVD)
+RUN_DEPENDS+=		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+.endif
 
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/gnomebaker/distinfo b/sysutils/gnomebaker/distinfo
index 737bf74c064f..ca6ff59814bd 100644
--- a/sysutils/gnomebaker/distinfo
+++ b/sysutils/gnomebaker/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnomebaker-0.4.2.tar.gz) = caac582ec6896a49cd76779e54ef6d3e
-SIZE (gnome2/gnomebaker-0.4.2.tar.gz) = 761044
+MD5 (gnome2/gnomebaker-0.5.0.tar.gz) = 728c471403ac35a156eac6680d507388
+SIZE (gnome2/gnomebaker-0.5.0.tar.gz) = 1184251
diff --git a/sysutils/gnomebaker/files/patch-Makefile.in b/sysutils/gnomebaker/files/patch-Makefile.in
index 928dfb3a22b3..d2d321fa45b0 100644
--- a/sysutils/gnomebaker/files/patch-Makefile.in
+++ b/sysutils/gnomebaker/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.old	Mon Aug 22 13:54:59 2005
-+++ Makefile.in	Mon Aug 22 13:55:15 2005
-@@ -215,7 +215,7 @@
+--- Makefile.in.orig	Fri Oct  7 20:08:19 2005
++++ Makefile.in	Fri Oct  7 20:08:47 2005
+@@ -217,7 +217,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- SUBDIRS = intl po macros src pixmaps help
+ SUBDIRS = intl po macros src pixmaps media help
 -gnomebakerdocdir = ${prefix}/doc/gnomebaker
 +gnomebakerdocdir = ${prefix}/share/doc/gnomebaker
  gnomebakerdoc_DATA = \
diff --git a/sysutils/gnomebaker/files/patch-src-main.c b/sysutils/gnomebaker/files/patch-src-main.c
new file mode 100644
index 000000000000..6caabc515308
--- /dev/null
+++ b/sysutils/gnomebaker/files/patch-src-main.c
@@ -0,0 +1,16 @@
+--- src/main.c.orig	Fri Oct  7 19:53:32 2005
++++ src/main.c	Fri Oct  7 19:54:29 2005
+@@ -23,12 +23,12 @@
+ #  include <config.h>
+ #endif
+ 
++#include <libintl.h>
+ #include "gnomebaker.h"
+ #include <gnome.h>
+ #include <glade/glade.h>
+ #include "splashdlg.h"
+ #include "gbcommon.h"
+-#include <libintl.h>
+ #include <locale.h>
+ #include <gst/gst.h>
+ 
diff --git a/sysutils/gnomebaker/pkg-plist b/sysutils/gnomebaker/pkg-plist
index 07ec363f5198..045d9a15f009 100644
--- a/sysutils/gnomebaker/pkg-plist
+++ b/sysutils/gnomebaker/pkg-plist
@@ -36,6 +36,8 @@ share/gnome/omf/gnomebaker/gnomebaker-C.omf
 %%DATADIR%%/baker-remove-files.png
 %%DATADIR%%/gnomebaker-48.png
 %%DATADIR%%/gnomebaker.glade
+%%DATADIR%%/media/BurnFailed.wav
+%%DATADIR%%/media/BurnOk.wav
 %%DATADIR%%/splash_2.png
 share/locale/af/LC_MESSAGES/gnomebaker.mo
 share/locale/bg/LC_MESSAGES/gnomebaker.mo
@@ -71,6 +73,7 @@ share/locale/zh_CN/LC_MESSAGES/gnomebaker.mo
 @unexec /bin/rmdir %D/share/locale/en_US 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/locale/sv_SE/LC_MESSAGES 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/locale/sv_SE 2>/dev/null || /usr/bin/true
+@dirrm %%DATADIR%%/media
 @dirrm %%DATADIR%%
 @dirrm share/gnome/omf/gnomebaker
 @dirrm share/gnome/gnomebaker/doc/gnomebaker/C/figures