5 files changed, 44 insertions, 41 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index af04b7b498ea..a21ba7d18330 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/brasero/Makefile,v 1.59 2009/10/24 01:52:39 avl Exp $
+#    $MCom: ports/sysutils/brasero/Makefile,v 1.71 2010/04/27 20:38:56 kwm Exp $
 
 PORTNAME=	brasero
-PORTVERSION=	2.28.3
-PORTREVISION=	2
+PORTVERSION=	2.30.1
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +16,8 @@ COMMENT=	CD/DVD mastering tool for the GNOME desktop
 
 LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser
+		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
+		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		cdrdao:${PORTSDIR}/sysutils/cdrdao
 
@@ -61,4 +61,8 @@ PLIST_SUB+=	LIBBURNIA=""
 PLIST_SUB+=	LIBBURNIA="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	    	${WRKSRC}/libbrasero-burn/burn-process.c
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 92525e36567b..39893f67a966 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/brasero-2.28.3.tar.bz2) = 6ef5cc07325f1869577a85d15ac67eb3
-SHA256 (gnome2/brasero-2.28.3.tar.bz2) = adaee8f93170d5799cddcd116a01a8687fabb86575dd5dc88f1f668bb397623c
-SIZE (gnome2/brasero-2.28.3.tar.bz2) = 4025939
+MD5 (gnome2/brasero-2.30.1.tar.bz2) = 01c313f02939ee7dd277cafe11a5ef89
+SHA256 (gnome2/brasero-2.30.1.tar.bz2) = 676922e42192f38c82b40b460f896fa4653dd55a336365ace1fa64d9fc441f0e
+SIZE (gnome2/brasero-2.30.1.tar.bz2) = 4310409
diff --git a/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c b/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c
new file mode 100644
index 000000000000..b2b34227195f
--- /dev/null
+++ b/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c
@@ -0,0 +1,10 @@
+--- libbrasero-burn/burn-process.c.orig	2010-03-07 15:07:48.000000000 -0500
++++ libbrasero-burn/burn-process.c	2010-03-07 15:08:41.000000000 -0500
+@@ -609,6 +609,7 @@ brasero_process_start (BraseroJob *job, 
+ 	gchar *envp [] = {	"LANG=C",
+ 				"LANGUAGE=C",
+ 				"LC_ALL=C",
++				"PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin",
+ 				NULL};
+ 
+ 	if (priv->pid)
diff --git a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
deleted file mode 100644
index e342112f8562..000000000000
--- a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- libbrasero-media/scsi-cam.c.orig	2009-09-25 10:39:03.000000000 -0400
-+++ libbrasero-media/scsi-cam.c	2009-10-10 13:30:06.000000000 -0400
-@@ -184,6 +184,8 @@ brasero_device_handle_open (const gchar 
- 		handle->fd = fd;
- 	}
- 	else {
-+		int serrno;
-+
- 		if (code) {
- 			if (errno == EAGAIN
- 			||  errno == EWOULDBLOCK
-@@ -193,6 +195,15 @@ brasero_device_handle_open (const gchar 
- 				*code = BRASERO_SCSI_ERRNO;
- 		}
- 
-+		serrno = errno;
-+
-+		if (fd > -1)
-+			close (fd);
-+		if (cam)
-+			cam_close_device (cam);
-+
-+		errno = serrno;
-+
- 		return NULL;
- 	}
- 
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index 5d2b0ef37991..c9ba877869f6 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -30,8 +30,12 @@ include/brasero/brasero-track-type.h
 include/brasero/brasero-track.h
 include/brasero/brasero-units.h
 include/brasero/brasero-volume.h
+lib/brasero/plugins/libbrasero-audio2cue.la
+lib/brasero/plugins/libbrasero-audio2cue.so
 lib/brasero/plugins/libbrasero-burn-uri.la
 lib/brasero/plugins/libbrasero-burn-uri.so
+lib/brasero/plugins/libbrasero-cdda2wav.la
+lib/brasero/plugins/libbrasero-cdda2wav.so
 lib/brasero/plugins/libbrasero-cdrdao.la
 lib/brasero/plugins/libbrasero-cdrdao.so
 lib/brasero/plugins/libbrasero-cdrecord.la
@@ -64,8 +68,6 @@ lib/brasero/plugins/libbrasero-readcd.la
 lib/brasero/plugins/libbrasero-readcd.so
 lib/brasero/plugins/libbrasero-readom.la
 lib/brasero/plugins/libbrasero-readom.so
-lib/brasero/plugins/libbrasero-toc2cue.la
-lib/brasero/plugins/libbrasero-toc2cue.so
 lib/brasero/plugins/libbrasero-transcode.la
 lib/brasero/plugins/libbrasero-transcode.so
 lib/brasero/plugins/libbrasero-vcdimager.la
@@ -74,6 +76,8 @@ lib/brasero/plugins/libbrasero-vob.la
 lib/brasero/plugins/libbrasero-vob.so
 lib/brasero/plugins/libbrasero-wodim.la
 lib/brasero/plugins/libbrasero-wodim.so
+lib/girepository-1.0/BraseroBurn-1.0.typelib
+lib/girepository-1.0/BraseroMedia-1.0.typelib
 lib/libbrasero-burn.la
 lib/libbrasero-burn.so
 lib/libbrasero-burn.so.2
@@ -107,8 +111,6 @@ share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionSpan.html
 share/doc/libbrasero-burn/libbrasero-burn-BraseroSumDialog.html
 share/doc/libbrasero-burn/libbrasero-burn-BraseroToolDialog.html
 share/doc/libbrasero-burn/libbrasero-burn-BraseroTrack.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackData.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDataCfg.html
 share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDisc.html
 share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImage.html
 share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImageCfg.html
@@ -119,6 +121,8 @@ share/doc/libbrasero-burn/libbrasero-burn-brasero-enums.html
 share/doc/libbrasero-burn/libbrasero-burn-brasero-error.html
 share/doc/libbrasero-burn/libbrasero-burn-brasero-status.html
 share/doc/libbrasero-burn/libbrasero-burn-brasero-tags.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-track-data-cfg.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-track-data.html
 share/doc/libbrasero-burn/libbrasero-burn-brasero-track-type.html
 share/doc/libbrasero-burn/libbrasero-burn.devhelp
 share/doc/libbrasero-burn/libbrasero-burn.devhelp2
@@ -133,12 +137,12 @@ share/doc/libbrasero-media/home.png
 share/doc/libbrasero-media/index.html
 share/doc/libbrasero-media/index.sgml
 share/doc/libbrasero-media/left.png
-share/doc/libbrasero-media/libbrasero-media-BraseroDrive.html
 share/doc/libbrasero-media/libbrasero-media-BraseroDriveSelection.html
 share/doc/libbrasero-media/libbrasero-media-BraseroMedium.html
 share/doc/libbrasero-media/libbrasero-media-BraseroMediumMonitor.html
 share/doc/libbrasero-media/libbrasero-media-BraseroMediumSelection.html
 share/doc/libbrasero-media/libbrasero-media-BraseroVolume.html
+share/doc/libbrasero-media/libbrasero-media-brasero-drive.html
 share/doc/libbrasero-media/libbrasero-media-brasero-media.html
 share/doc/libbrasero-media/libbrasero-media-brasero-units.html
 share/doc/libbrasero-media/libbrasero-media.devhelp
@@ -302,9 +306,13 @@ share/doc/libbrasero-media/up.png
 %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg
 %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg
 %%DATADIR%%/logo.png
+share/gir-1.0/BraseroBurn-1.0.gir
+share/gir-1.0/BraseroMedia-1.0.gir
 share/gnome/help/brasero/C/brasero.xml
 share/gnome/help/brasero/C/figures/brasero_main.png
 share/gnome/help/brasero/C/legal.xml
+share/gnome/help/brasero/bg/brasero.xml
+share/gnome/help/brasero/bg/figures/brasero_main.png
 share/gnome/help/brasero/ca/brasero.xml
 share/gnome/help/brasero/ca/figures/brasero_main.png
 share/gnome/help/brasero/cs/brasero.xml
@@ -339,6 +347,7 @@ share/icons/hicolor/24x24/apps/brasero.png
 share/icons/hicolor/32x32/apps/brasero.png
 share/icons/hicolor/48x48/apps/brasero.png
 share/icons/hicolor/scalable/apps/brasero.svg
+share/locale/af/LC_MESSAGES/brasero.mo
 share/locale/ar/LC_MESSAGES/brasero.mo
 share/locale/as/LC_MESSAGES/brasero.mo
 share/locale/ast/LC_MESSAGES/brasero.mo
@@ -355,6 +364,7 @@ share/locale/de/LC_MESSAGES/brasero.mo
 share/locale/dz/LC_MESSAGES/brasero.mo
 share/locale/el/LC_MESSAGES/brasero.mo
 share/locale/en_GB/LC_MESSAGES/brasero.mo
+share/locale/en@shaw/LC_MESSAGES/brasero.mo
 share/locale/es/LC_MESSAGES/brasero.mo
 share/locale/et/LC_MESSAGES/brasero.mo
 share/locale/eu/LC_MESSAGES/brasero.mo
@@ -366,6 +376,7 @@ share/locale/gu/LC_MESSAGES/brasero.mo
 share/locale/he/LC_MESSAGES/brasero.mo
 share/locale/hi/LC_MESSAGES/brasero.mo
 share/locale/hu/LC_MESSAGES/brasero.mo
+share/locale/id/LC_MESSAGES/brasero.mo
 share/locale/it/LC_MESSAGES/brasero.mo
 share/locale/ja/LC_MESSAGES/brasero.mo
 share/locale/kn/LC_MESSAGES/brasero.mo
@@ -403,6 +414,7 @@ share/locale/zh_HK/LC_MESSAGES/brasero.mo
 share/locale/zh_TW/LC_MESSAGES/brasero.mo
 share/mime/packages/brasero.xml
 share/omf/brasero/brasero-C.omf
+share/omf/brasero/brasero-bg.omf
 share/omf/brasero/brasero-ca.omf
 share/omf/brasero/brasero-cs.omf
 share/omf/brasero/brasero-de.omf
@@ -446,6 +458,8 @@ share/omf/brasero/brasero-zh_TW.omf
 @dirrm share/gnome/help/brasero/cs
 @dirrm share/gnome/help/brasero/ca/figures
 @dirrm share/gnome/help/brasero/ca
+@dirrm share/gnome/help/brasero/bg/figures
+@dirrm share/gnome/help/brasero/bg
 @dirrm share/gnome/help/brasero/C/figures
 @dirrm share/gnome/help/brasero/C
 @dirrm share/gnome/help/brasero
@@ -481,8 +495,6 @@ share/omf/brasero/brasero-zh_TW.omf
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -497,6 +509,8 @@ share/omf/brasero/brasero-zh_TW.omf
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -505,3 +519,5 @@ share/omf/brasero/brasero-zh_TW.omf
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as