update brasero to 2.26.3

changes: minor bugfixes, translation updates

pkgsrc changes:
-in scsi io code, remove the code which builds a raw device path
 from a block device - use the raw_device hal property instead
-split out the nautilus plugin, allows to use brasero (and its
 clients, eg sound-juicer) with less gnome desktop overhead
-support playlist parsing as an option -- unfortunately this
 pulls in evolution-data-server indirectly which is pretty large
 for that limited gain of functionality (on per default, as in
 other pkgs able to use the evolution database)
-cleanup

10 files changed, 125 insertions, 39 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index a0b93bae45b..a96219b152b 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2009/07/22 09:01:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/26 18:25:01 drochner Exp $
 #
 
-DISTNAME=	brasero-2.26.2
+DISTNAME=	brasero-2.26.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/brasero/2.26/}
 EXTRACT_SUFX=	.tar.bz2
@@ -26,6 +26,14 @@ CONFIGURE_ARGS+=	--disable-inotify
 GCONF_SCHEMAS+=		brasero.schemas
 PKGCONFIG_OVERRIDE+=	libbrasero-media.pc.in
 
+# The playlist feature needs totem-pl-parser which in turn
+# pulls in evolution-data-server.
+PKG_OPTIONS_VAR=        PKG_OPTIONS.brasero
+PKG_SUPPORTED_OPTIONS=  evolution
+PKG_SUGGESTED_OPTIONS=  evolution
+
+.include "../../mk/bsd.options.mk"
+
 # sent upstream in http://bugzilla.gnome.org/show_bug.cgi?id=583332
 post-extract:
 	cp ${FILESDIR}/scsi-netbsd.c ${WRKSRC}/libbrasero-media/
@@ -42,8 +50,11 @@ BUILDLINK_API_DEPENDS.gstreamer0.10+=		gstreamer0.10>=0.10.15
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../sysutils/nautilus/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mevolution)
+.include "../../multimedia/totem-pl-parser/buildlink3.mk"
+.endif
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/brasero/PLIST b/sysutils/brasero/PLIST
index 9081c5aa295..ed47ddb13bf 100644
--- a/sysutils/brasero/PLIST
+++ b/sysutils/brasero/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/07/26 18:25:01 drochner Exp $
 bin/brasero
 include/brasero/brasero-drive-selection.h
 include/brasero/brasero-drive.h
@@ -29,11 +29,9 @@ lib/brasero/plugins/libbrasero-vcdimager.la
 lib/brasero/plugins/libbrasero-vob.la
 lib/brasero/plugins/libbrasero-wodim.la
 lib/libbrasero-media.la
-lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la
 lib/pkgconfig/libbrasero-media.pc
 man/man1/brasero.1
 share/applications/brasero-copy-medium.desktop
-share/applications/brasero-nautilus.desktop
 share/applications/brasero-open-image.desktop
 share/applications/brasero-open-playlist.desktop
 share/applications/brasero-open-project.desktop
diff --git a/sysutils/brasero/buildlink3.mk b/sysutils/brasero/buildlink3.mk
index c67a3728283..eb8e16446d9 100644
--- a/sysutils/brasero/buildlink3.mk
+++ b/sysutils/brasero/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/07/26 18:25:01 drochner Exp $
 
 BUILDLINK_TREE+=	brasero
 
@@ -7,6 +7,11 @@ BRASERO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.brasero+=	brasero>=2.26.0
 BUILDLINK_PKGSRCDIR.brasero?=	../../sysutils/brasero
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/hal/buildlink3.mk"
+
 .endif # BRASERO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-brasero
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 6bf428a7c30..df545c31fef 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.4 2009/07/06 15:22:14 joerg Exp $
+$NetBSD: distinfo,v 1.5 2009/07/26 18:25:01 drochner Exp $
 
-SHA1 (brasero-2.26.2.tar.bz2) = a65f0167d209e86535611d37887481beb21e33c8
-RMD160 (brasero-2.26.2.tar.bz2) = 5110cd570448b9f3c4213483ee90f8f13a7dc038
-Size (brasero-2.26.2.tar.bz2) = 3326163 bytes
+SHA1 (brasero-2.26.3.tar.bz2) = 97273908948481ea2f97d4a12e7bf5031ca613cb
+RMD160 (brasero-2.26.3.tar.bz2) = f1f811b239f4b5edfa0a3dfde65b028c43e4906c
+Size (brasero-2.26.3.tar.bz2) = 3312144 bytes
 SHA1 (patch-aa) = 3799e6f3a59e03bc8a187b0eca025c1f15bf5135
 SHA1 (patch-ab) = 5e9c3a4c3608a04270d6c7e034b5e3dd0c25e44f
-SHA1 (patch-ac) = 9829e879d145586bb00390c26d76879d8d999179
+SHA1 (patch-ac) = ab62c40cc9046020c9088ae7958fe3e7a3af8eba
 SHA1 (patch-ad) = 80632fe45694e98692ab2aa69d24f97ad13de346
+SHA1 (patch-ae) = e5dfb8da776b860074aa935a97152968222ae9bc
+SHA1 (patch-af) = 41414c465307b08de981a281e4fa1219dd47f28e
+SHA1 (patch-ag) = a97f16bfc2a82d50904c2432daab9bb456cbe5ce
+SHA1 (patch-ah) = 91325870ad2bbfe307bbf3bc82243375b43e229c
diff --git a/sysutils/brasero/files/scsi-netbsd.c b/sysutils/brasero/files/scsi-netbsd.c
index b4f5737fb66..0ed701efdbb 100644
--- a/sysutils/brasero/files/scsi-netbsd.c
+++ b/sysutils/brasero/files/scsi-netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi-netbsd.c,v 1.2 2009/03/22 09:30:39 wiz Exp $ */
+/* $NetBSD: scsi-netbsd.c,v 1.3 2009/07/26 18:25:01 drochner Exp $ */
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /*
  * Libbrasero-media
@@ -164,14 +164,11 @@ brasero_device_handle_open (const gchar *path,
 	int fd;
 	int flags = OPEN_FLAGS;
 	BraseroDeviceHandle *handle;
-	gchar *rdevnode;
 
 	if (exclusive)
 		flags |= O_EXCL;
 
-	rdevnode = g_strdup_printf ("/dev/r%s", path + strlen ("/dev/"));
-	fd = open (rdevnode, flags);
-	g_free (rdevnode);
+	fd = open (path, flags);
 	if (fd < 0) {
 		if (code) {
 			if (errno == EAGAIN
diff --git a/sysutils/brasero/patches/patch-ac b/sysutils/brasero/patches/patch-ac
index 1d213f09efe..63f10b2f81f 100644
--- a/sysutils/brasero/patches/patch-ac
+++ b/sysutils/brasero/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2009/07/06 15:22:14 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2009/07/26 18:25:01 drochner Exp $
 
---- configure.orig	2009-05-18 17:06:56.000000000 +0200
+--- configure.orig	2009-07-01 03:03:18.000000000 +0200
 +++ configure
-@@ -912,6 +912,8 @@ HAVE_SG_IO_HDR_T_FALSE
- HAVE_SG_IO_HDR_T_TRUE
- HAVE_CAM_LIB_H_FALSE
- HAVE_CAM_LIB_H_TRUE
+@@ -900,6 +900,8 @@ ENABLE_GTK_DOC_TRUE
+ GTKDOC_CHECK
+ PKG_CONFIG
+ HTML_DIR
 +HAVE_SCSIIO_H_FALSE
 +HAVE_SCSIIO_H_TRUE
- BRASERO_SCSI_LIBS
- LIBTOOL
- ac_ct_F77
-@@ -21715,6 +21717,116 @@ else
+ HAVE_USCSI_H_FALSE
+ HAVE_USCSI_H_TRUE
+ HAVE_SG_IO_HDR_T_FALSE
+@@ -12828,6 +12830,116 @@ else
  fi
  
  
@@ -128,7 +128,7 @@ $NetBSD: patch-ac,v 1.1 2009/07/06 15:22:14 joerg Exp $
  { $as_echo "$as_me:$LINENO: checking for struct uscsi_cmd" >&5
  $as_echo_n "checking for struct uscsi_cmd... " >&6; }
  if test "${ac_cv_type_struct_uscsi_cmd+set}" = set; then
-@@ -21829,11 +21941,13 @@ if test x"$has_cam" = x"yes"; then
+@@ -12942,11 +13054,13 @@ if test x"$has_cam" = x"yes"; then
      BRASERO_SCSI_LIBS="-lcam"
  elif test x"$has_sg" = x"yes"; then
  	:
@@ -144,7 +144,7 @@ $NetBSD: patch-ac,v 1.1 2009/07/06 15:22:14 joerg Exp $
     { (exit 1); exit 1; }; }
  fi
  
-@@ -21861,6 +21975,14 @@ else
+@@ -12974,6 +13088,14 @@ else
    HAVE_USCSI_H_FALSE=
  fi
  
@@ -159,7 +159,7 @@ $NetBSD: patch-ac,v 1.1 2009/07/06 15:22:14 joerg Exp $
  
  
  # Check whether --enable-largefile was given.
-@@ -28616,6 +28738,13 @@ $as_echo "$as_me: error: conditional \"H
+@@ -19787,6 +19909,13 @@ $as_echo "$as_me: error: conditional \"H
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -173,12 +173,3 @@ $NetBSD: patch-ac,v 1.1 2009/07/06 15:22:14 joerg Exp $
  if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
    { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -29161,6 +29290,8 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
diff --git a/sysutils/brasero/patches/patch-ae b/sysutils/brasero/patches/patch-ae
new file mode 100644
index 00000000000..aa5fcb18128
--- /dev/null
+++ b/sysutils/brasero/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2009/07/26 18:25:01 drochner Exp $
+
+--- libbrasero-media/brasero-drive.c.orig	2009-07-01 03:02:50.000000000 +0200
++++ libbrasero-media/brasero-drive.c
+@@ -57,8 +57,12 @@
+ #define BLOCK_DEVICE	"block.solaris.raw_device"
+ #else
+ #define DEVICE_MODEL	"storage.model"
++#ifdef __NetBSD__
++#define BLOCK_DEVICE    "block.netbsd.raw_device"
++#else
+ #define BLOCK_DEVICE	"block.device"
+ #endif
++#endif
+ 
+ typedef struct _BraseroDrivePrivate BraseroDrivePrivate;
+ struct _BraseroDrivePrivate
diff --git a/sysutils/brasero/patches/patch-af b/sysutils/brasero/patches/patch-af
new file mode 100644
index 00000000000..aca5cebdb55
--- /dev/null
+++ b/sysutils/brasero/patches/patch-af
@@ -0,0 +1,27 @@
+$NetBSD: patch-af,v 1.1 2009/07/26 18:25:01 drochner Exp $
+
+--- libbrasero-media/burn-hal-watch.c.orig	2009-07-01 03:02:36.000000000 +0200
++++ libbrasero-media/burn-hal-watch.c
+@@ -136,7 +136,7 @@ brasero_hal_watch_init (BraseroHALWatch 
+ 	priv->ctx = libhal_ctx_new ();
+ 	if (priv->ctx == NULL) {
+ 		g_warning ("Cannot initialize hal library\n");
+-		goto error;
++		return;
+ 	}
+ 
+ 	dbus_error_init (&error);
+@@ -161,12 +161,11 @@ brasero_hal_watch_init (BraseroHALWatch 
+ 	if (libhal_ctx_init (priv->ctx, &error))
+ 		return;
+ 
+-	g_warning ("Failed to initialize hal : %s\n", error.message);
++	g_warning ("Failed to initialize hal : %s\n", error.message ? error.message : "(?)");
+ 	dbus_error_free (&error);
+ 
+ error:
+ 
+-	libhal_ctx_shutdown (priv->ctx, NULL);
+ 	libhal_ctx_free (priv->ctx);
+ 	priv->ctx = NULL;
+ 
diff --git a/sysutils/brasero/patches/patch-ag b/sysutils/brasero/patches/patch-ag
new file mode 100644
index 00000000000..bd4a5c9962f
--- /dev/null
+++ b/sysutils/brasero/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2009/07/26 18:25:01 drochner Exp $
+
+--- libbrasero-media/brasero-medium-monitor.c.orig	2009-07-01 03:02:50.000000000 +0200
++++ libbrasero-media/brasero-medium-monitor.c
+@@ -421,6 +421,8 @@ brasero_medium_monitor_init (BraseroMedi
+ 
+ 	watch = brasero_hal_watch_get_default ();
+ 	ctx = brasero_hal_watch_get_ctx (watch);
++	if (!ctx)
++		return;
+ 
+ 	g_signal_connect (watch,
+ 			  "device-added",
diff --git a/sysutils/brasero/patches/patch-ah b/sysutils/brasero/patches/patch-ah
new file mode 100644
index 00000000000..a0711fcae60
--- /dev/null
+++ b/sysutils/brasero/patches/patch-ah
@@ -0,0 +1,23 @@
+$NetBSD: patch-ah,v 1.1 2009/07/26 18:25:01 drochner Exp $
+
+--- nautilus/Makefile.in.orig	2009-07-01 03:03:20.000000000 +0200
++++ nautilus/Makefile.in
+@@ -54,8 +54,7 @@ am__installdirs = "$(DESTDIR)$(nautilus_
+ nautilus_extensionLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(nautilus_extension_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	../libbrasero-media/libbrasero-media.la
++libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libnautilus_brasero_extension_la_OBJECTS = nautilus-burn-bar.lo \
+ 	nautilus-burn-extension.lo
+ libnautilus_brasero_extension_la_OBJECTS =  \
+@@ -307,7 +306,7 @@ libnautilus_brasero_extension_la_SOURCES
+ 	$(NULL)
+ 
+ libnautilus_brasero_extension_la_LIBADD = \
+-	$(NAUTILUS_EXTENSION_LIBS) ../libbrasero-media/libbrasero-media.la
++	$(NAUTILUS_EXTENSION_LIBS) -L$(prefix)/lib -Wl,-R$(prefix)/lib -lbrasero-media
+ 
+ libnautilus_brasero_extension_la_LDFLAGS = $(module_flags)
+ all: all-am