update to 2.30.2

This switches to the gnome-2.30 release branch.

5 files changed, 36 insertions, 27 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index a35344c5353..9957ecf4c07 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:21 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/07/06 15:23:59 drochner Exp $
 #
 
-DISTNAME=	brasero-2.28.3
-PKGREVISION=	3
+DISTNAME=	brasero-2.30.2
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/brasero/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/brasero/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -34,6 +33,7 @@ BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.10
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gstreamer0.10+=		gstreamer0.10>=0.10.15
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/sysutils/brasero/PLIST b/sysutils/brasero/PLIST
index d209ed7729c..a31db849b24 100644
--- a/sysutils/brasero/PLIST
+++ b/sysutils/brasero/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/12/16 17:25:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/07/06 15:23:59 drochner Exp $
 bin/brasero
 include/brasero/brasero-blank-dialog.h
 include/brasero/brasero-burn-dialog.h
@@ -31,7 +31,9 @@ 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-burn-uri.la
+lib/brasero/plugins/libbrasero-cdda2wav.la
 lib/brasero/plugins/libbrasero-cdrdao.la
 lib/brasero/plugins/libbrasero-cdrecord.la
 lib/brasero/plugins/libbrasero-checksum-file.la
@@ -46,7 +48,6 @@ lib/brasero/plugins/libbrasero-mkisofs.la
 lib/brasero/plugins/libbrasero-normalize.la
 lib/brasero/plugins/libbrasero-readcd.la
 lib/brasero/plugins/libbrasero-readom.la
-lib/brasero/plugins/libbrasero-toc2cue.la
 lib/brasero/plugins/libbrasero-transcode.la
 lib/brasero/plugins/libbrasero-vcdimager.la
 lib/brasero/plugins/libbrasero-vob.la
@@ -218,6 +219,8 @@ share/gconf/schemas/brasero.schemas
 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
@@ -230,6 +233,8 @@ share/gnome/help/brasero/en_GB/brasero.xml
 share/gnome/help/brasero/en_GB/figures/brasero_main.png
 share/gnome/help/brasero/es/brasero.xml
 share/gnome/help/brasero/es/figures/brasero_main.png
+share/gnome/help/brasero/fi/brasero.xml
+share/gnome/help/brasero/fi/figures/brasero_main.png
 share/gnome/help/brasero/fr/brasero.xml
 share/gnome/help/brasero/fr/figures/brasero_main.png
 share/gnome/help/brasero/it/brasero.xml
@@ -263,8 +268,6 @@ share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroSessionSpan.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroSumDialog.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroToolDialog.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrack.html
-share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackData.html
-share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackDataCfg.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackDisc.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackImage.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-BraseroTrackImageCfg.html
@@ -275,6 +278,8 @@ share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-enums.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-error.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-status.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-tags.html
+share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-track-data-cfg.html
+share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-track-data.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn-brasero-track-type.html
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn.devhelp
 share/gtk-doc/html/libbrasero-burn/libbrasero-burn.devhelp2
@@ -289,12 +294,12 @@ share/gtk-doc/html/libbrasero-media/home.png
 share/gtk-doc/html/libbrasero-media/index.html
 share/gtk-doc/html/libbrasero-media/index.sgml
 share/gtk-doc/html/libbrasero-media/left.png
-share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroDrive.html
 share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroDriveSelection.html
 share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroMedium.html
 share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroMediumMonitor.html
 share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroMediumSelection.html
 share/gtk-doc/html/libbrasero-media/libbrasero-media-BraseroVolume.html
+share/gtk-doc/html/libbrasero-media/libbrasero-media-brasero-drive.html
 share/gtk-doc/html/libbrasero-media/libbrasero-media-brasero-media.html
 share/gtk-doc/html/libbrasero-media/libbrasero-media-brasero-units.html
 share/gtk-doc/html/libbrasero-media/libbrasero-media.devhelp
@@ -309,6 +314,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
@@ -324,6 +330,7 @@ share/locale/da/LC_MESSAGES/brasero.mo
 share/locale/de/LC_MESSAGES/brasero.mo
 share/locale/dz/LC_MESSAGES/brasero.mo
 share/locale/el/LC_MESSAGES/brasero.mo
+share/locale/en@shaw/LC_MESSAGES/brasero.mo
 share/locale/en_GB/LC_MESSAGES/brasero.mo
 share/locale/es/LC_MESSAGES/brasero.mo
 share/locale/et/LC_MESSAGES/brasero.mo
@@ -336,6 +343,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
@@ -350,6 +358,7 @@ share/locale/mr/LC_MESSAGES/brasero.mo
 share/locale/nb/LC_MESSAGES/brasero.mo
 share/locale/nds/LC_MESSAGES/brasero.mo
 share/locale/nl/LC_MESSAGES/brasero.mo
+share/locale/nn/LC_MESSAGES/brasero.mo
 share/locale/oc/LC_MESSAGES/brasero.mo
 share/locale/or/LC_MESSAGES/brasero.mo
 share/locale/pa/LC_MESSAGES/brasero.mo
@@ -373,12 +382,14 @@ 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
 share/omf/brasero/brasero-el.omf
 share/omf/brasero/brasero-en_GB.omf
 share/omf/brasero/brasero-es.omf
+share/omf/brasero/brasero-fi.omf
 share/omf/brasero/brasero-fr.omf
 share/omf/brasero/brasero-it.omf
 share/omf/brasero/brasero-pl.omf
diff --git a/sysutils/brasero/buildlink3.mk b/sysutils/brasero/buildlink3.mk
index 4718bf76845..398f515fc68 100644
--- a/sysutils/brasero/buildlink3.mk
+++ b/sysutils/brasero/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/07/06 15:23:59 drochner Exp $
 
 BUILDLINK_TREE+=	brasero
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.brasero+=	brasero>=2.26.0
 BUILDLINK_ABI_DEPENDS.brasero?=	brasero>=2.28.3nb3
 BUILDLINK_PKGSRCDIR.brasero?=	../../sysutils/brasero
 
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .endif # BRASERO_BUILDLINK3_MK
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index f70c07c3ce8..83265215a97 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2009/12/20 11:24:13 drochner Exp $
+$NetBSD: distinfo,v 1.9 2010/07/06 15:23:59 drochner Exp $
 
-SHA1 (brasero-2.28.3.tar.bz2) = 8aeb042bd23d5a31f1233d0f3064213e21e8a4db
-RMD160 (brasero-2.28.3.tar.bz2) = 71b679e581015399851172d72b4b13259634b1a1
-Size (brasero-2.28.3.tar.bz2) = 4025939 bytes
-SHA1 (patch-ah) = da517a1ace02a62bbe95cbb5630cc6ce72fdf3fc
+SHA1 (brasero-2.30.2.tar.bz2) = 2250f8174ff5f253beb99b1ef6e21aeddcbc10ff
+RMD160 (brasero-2.30.2.tar.bz2) = a0073be5e56afe22d3838df2fb120e0898742e2e
+Size (brasero-2.30.2.tar.bz2) = 4460261 bytes
+SHA1 (patch-ah) = 985d7defd928ee186e53864fec6da8b3e377a9e0
 SHA1 (patch-aj) = 31928e19cfcc2612bd0826f0a89a23eb7b378c7f
 SHA1 (patch-ak) = 3db8ae8a44083aff6519f0be173b31f50d2ed3e6
 SHA1 (patch-ba) = 1e314b690f72c767f553bcfb8360076f61b0a8b8
diff --git a/sysutils/brasero/patches/patch-ah b/sysutils/brasero/patches/patch-ah
index 31eda695979..024f34dff64 100644
--- a/sysutils/brasero/patches/patch-ah
+++ b/sysutils/brasero/patches/patch-ah
@@ -1,29 +1,28 @@
-$NetBSD: patch-ah,v 1.2 2009/12/09 19:01:06 drochner Exp $
+$NetBSD: patch-ah,v 1.3 2010/07/06 15:23:59 drochner Exp $
 
---- nautilus/Makefile.in.orig	2009-10-19 18:05:45.000000000 +0200
+--- nautilus/Makefile.in.orig	2010-04-26 23:29:14.000000000 +0000
 +++ nautilus/Makefile.in
-@@ -71,10 +71,7 @@ am__installdirs = "$(DESTDIR)$(nautilus_
- 	"$(DESTDIR)$(desktopdir)"
+@@ -72,9 +72,7 @@ am__installdirs = "$(DESTDIR)$(nautilus_
  LTLIBRARIES = $(nautilus_extension_LTLIBRARIES)
  am__DEPENDENCIES_1 =
--libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	../libbrasero-utils/libbrasero-utils.la \
+ libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) ../libbrasero-utils/libbrasero-utils.la \
 -	../libbrasero-media/libbrasero-media.la \
 -	../libbrasero-burn/libbrasero-burn.la
-+libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1)
  am_libnautilus_brasero_extension_la_OBJECTS = nautilus-burn-bar.lo \
  	nautilus-burn-extension.lo brasero-project-name.lo
  libnautilus_brasero_extension_la_OBJECTS =  \
-@@ -355,9 +352,10 @@ libnautilus_brasero_extension_la_SOURCES
- 
+@@ -368,9 +366,10 @@ libnautilus_brasero_extension_la_SOURCES
  libnautilus_brasero_extension_la_LIBADD = \
+ 	$(BRASERO_GCONF_CFLAGS)	\
  	$(NAUTILUS_EXTENSION_LIBS)		\
 -	../libbrasero-utils/libbrasero-utils.la	\
 -	../libbrasero-media/libbrasero-media.la	\
 -	../libbrasero-burn/libbrasero-burn.la
 +	-L$(prefix)/lib -Wl,-R$(prefix)/lib \
-+	-lbrasero-utils	\
-+	-lbrasero-media	\
++	-lbrasero-utils \
++	-lbrasero-media \
 +	-lbrasero-burn
  
  libnautilus_brasero_extension_la_LDFLAGS = $(module_flags)