Update to 0.101.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3509 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 15 insertions, 157 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index dd5af9e96..562063cdf 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	totem
-PORTVERSION=	0.100
+PORTVERSION=	0.101
 PORTREVISION?=	0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index a2e694925..ad53a7d47 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/totem-0.100.tar.bz2) = 885423cc7e1d5eb8ff62b7b8ec9c30bc
-SIZE (gnome2/totem-0.100.tar.bz2) = 1279913
+MD5 (gnome2/totem-0.101.tar.bz2) = c85edd6a39fa2514f09c0c8afe6bf135
+SIZE (gnome2/totem-0.101.tar.bz2) = 1295921
diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure
deleted file mode 100644
index 7d8111c86..000000000
--- a/multimedia/totem/files/patch-configure
+++ /dev/null
@@ -1,51 +0,0 @@
---- configure.orig	Sun Jan 23 11:47:50 2005
-+++ configure	Sun Jan 23 11:49:37 2005
-@@ -19551,23 +19551,23 @@
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for libnautilus-burn < 2.9.0" >&5
--echo $ECHO_N "checking for libnautilus-burn < 2.9.0... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for libnautilus-burn > 2.9.0" >&5
-+echo $ECHO_N "checking for libnautilus-burn > 2.9.0... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "libnautilus-burn < 2.9.0" ; then
-+        if $PKG_CONFIG --exists "libnautilus-burn > 2.9.0" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking NAUTILUS_BURN_CFLAGS" >&5
- echo $ECHO_N "checking NAUTILUS_BURN_CFLAGS... $ECHO_C" >&6
--            NAUTILUS_BURN_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-burn < 2.9.0"`
-+            NAUTILUS_BURN_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-burn > 2.9.0"`
-             echo "$as_me:$LINENO: result: $NAUTILUS_BURN_CFLAGS" >&5
- echo "${ECHO_T}$NAUTILUS_BURN_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking NAUTILUS_BURN_LIBS" >&5
- echo $ECHO_N "checking NAUTILUS_BURN_LIBS... $ECHO_C" >&6
--            NAUTILUS_BURN_LIBS=`$PKG_CONFIG --libs "libnautilus-burn < 2.9.0"`
-+            NAUTILUS_BURN_LIBS=`$PKG_CONFIG --libs "libnautilus-burn > 2.9.0"`
-             echo "$as_me:$LINENO: result: $NAUTILUS_BURN_LIBS" >&5
- echo "${ECHO_T}$NAUTILUS_BURN_LIBS" >&6
-         else
-@@ -19575,7 +19575,7 @@
-             NAUTILUS_BURN_LIBS=""
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
--            NAUTILUS_BURN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-burn < 2.9.0"`
-+            NAUTILUS_BURN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-burn > 2.9.0"`
- 
-         fi
- 
-@@ -19590,8 +19590,8 @@
-   if test $succeeded = yes; then
-      :
-   else
--     { { echo "$as_me:$LINENO: error: libnautilus-burn < 2.9.0 is needed" >&5
--echo "$as_me: error: libnautilus-burn < 2.9.0 is needed" >&2;}
-+     { { echo "$as_me:$LINENO: error: libnautilus-burn > 2.9.0 is needed" >&5
-+echo "$as_me: error: libnautilus-burn > 2.9.0 is needed" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
diff --git a/multimedia/totem/files/patch-data_Makefile.in b/multimedia/totem/files/patch-data_Makefile.in
deleted file mode 100644
index f788b6d77..000000000
--- a/multimedia/totem/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- data/Makefile.in.orig	Mon Jan  3 22:50:19 2005
-+++ data/Makefile.in	Mon Jan  3 22:50:55 2005
-@@ -167,8 +167,8 @@
- 
- desktop_in_in_files_all = totem.desktop.in.in.in vanity.desktop.in.in
- desktop_in_files_all = totem.desktop.in.in vanity.desktop.in
--@TOTEM_VANITY_TRUE@desktop_in_files = @TOTEM_VANITY_TRUE@totem.desktop.in.in vanity.desktop.in
--@TOTEM_VANITY_FALSE@desktop_in_files = @TOTEM_VANITY_FALSE@totem.desktop.in.in
-+@TOTEM_VANITY_TRUE@desktop_in_files = @TOTEM_VANITY_TRUE@totem.desktop.in vanity.desktop.in
-+@TOTEM_VANITY_FALSE@desktop_in_files = @TOTEM_VANITY_FALSE@totem.desktop.in
- 
- desktopdir = $(datadir)/applications/
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
diff --git a/multimedia/totem/files/patch-src_bacon-v4l-selection.h b/multimedia/totem/files/patch-src_bacon-v4l-selection.h
deleted file mode 100644
index f554ddb3c..000000000
--- a/multimedia/totem/files/patch-src_bacon-v4l-selection.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/bacon-v4l-selection.h.orig	Sun Jan 23 12:13:42 2005
-+++ src/bacon-v4l-selection.h	Sun Jan 23 12:14:05 2005
-@@ -22,7 +22,6 @@
- #define HAVE_BACON_V4L_SELECTION_H
- 
- #include <gtk/gtkcomboboxentry.h>
--#include <cd-drive.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/multimedia/totem/files/patch-src_totem-preferences.c b/multimedia/totem/files/patch-src_totem-preferences.c
deleted file mode 100644
index c1d50d15c..000000000
--- a/multimedia/totem/files/patch-src_totem-preferences.c
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/totem-preferences.c.orig	Mon Jan  3 00:18:39 2005
-+++ src/totem-preferences.c	Sun Jan 23 12:06:53 2005
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--#include <bacon-cd-selection.h>
-+#include <nautilus-burn-drive-selection.h>
- 
- #include "totem.h"
- #include "totem-private.h"
-@@ -210,11 +210,11 @@
- }
- 
- static void
--on_combo_entry1_changed (BaconCdSelection *bcs, char *device, Totem *totem)
-+on_combo_entry1_changed (NautilusBurnDriveSelection *bcs, char *device, Totem *totem)
- {
- 	const char *str;
- 
--	str = bacon_cd_selection_get_device (bcs);
-+	str = nautilus_burn_drive_selection_get_device (bcs);
- 	gconf_client_set_string (totem->gc, GCONF_PREFIX"/mediadev", str, NULL);
- 	bacon_video_widget_set_media_device
- 		(BACON_VIDEO_WIDGET (totem->bvw), str);
-@@ -271,9 +271,9 @@
- 			GCONF_PREFIX"/mediadev", NULL);
- 
- 	if (mediadev == NULL || strcmp (mediadev, "") == 0)
--		mediadev = g_strdup ("/dev/cdrom");
-+		mediadev = g_strdup ("/dev/acd0");
- 
--	bacon_cd_selection_set_device (BACON_CD_SELECTION (item), mediadev);
-+	nautilus_burn_drive_selection_set_device (NAUTILUS_BURN_DRIVE_SELECTION (item), mediadev);
- 	bacon_video_widget_set_media_device
- 		(BACON_VIDEO_WIDGET (totem->bvw), mediadev);
- 
-@@ -358,7 +358,7 @@
- {
- 	GtkWidget *widget;
- 
--	widget = bacon_cd_selection_new ();
-+	widget = nautilus_burn_drive_selection_new ();
- 	gtk_widget_show (widget);
- 
- 	return widget;
-@@ -480,8 +480,8 @@
- 	if (mediadev == NULL || (strcmp (mediadev, "") == 0)
- 			|| (strcmp (mediadev, "auto") == 0))
- 	{
--		mediadev = g_strdup (bacon_cd_selection_get_default_device
--				     (BACON_CD_SELECTION (item)));
-+		mediadev = g_strdup (nautilus_burn_drive_selection_get_default_device
-+				     (NAUTILUS_BURN_DRIVE_SELECTION (item)));
- 		gconf_client_set_string (totem->gc, GCONF_PREFIX"/mediadev",
- 				mediadev, NULL);
- 	}
-@@ -491,7 +491,7 @@
- 	g_signal_connect (G_OBJECT (item), "device-changed",
- 			G_CALLBACK (on_combo_entry1_changed), totem);
- 
--	bacon_cd_selection_set_device (BACON_CD_SELECTION (item), mediadev);
-+	nautilus_burn_drive_selection_set_device (NAUTILUS_BURN_DRIVE_SELECTION (item), mediadev);
- 	g_free (mediadev);
- 
- 	/* Connection Speed */
diff --git a/multimedia/totem/files/patch-src_totem.c b/multimedia/totem/files/patch-src_totem.c
deleted file mode 100644
index 591f2e2ef..000000000
--- a/multimedia/totem/files/patch-src_totem.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/totem.c.orig	Sun Jan 23 11:52:03 2005
-+++ src/totem.c	Sun Jan 23 11:54:08 2005
-@@ -42,7 +42,6 @@
- #include "bacon-video-widget.h"
- #include "bacon-video-widget-properties.h"
- #include "rb-ellipsizing-label.h"
--#include "bacon-cd-selection.h"
- #include "totem-statusbar.h"
- #include "totem-time-label.h"
- #include "totem-session.h"
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index e8c406641..642b32365 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -1,8 +1,14 @@
 bin/totem
 bin/totem-video-thumbnailer
-libdata/bonobo/servers/Totem_properties.server
-libexec/totem-properties-page
-share/gnome/application-registry/totem.applications
+include/totem/1/plparser/totem-disc.h
+include/totem/1/plparser/totem-pl-parser-builtins.h
+include/totem/1/plparser/totem-pl-parser.h
+lib/libtotem-plparser.a
+lib/libtotem-plparser.so
+lib/libtotem-plparser.so.0
+lib/nautilus/extensions-1.0/libtotem-properties-page.a
+lib/nautilus/extensions-1.0/libtotem-properties-page.so
+libdata/pkgconfig/totem-plparser.pc
 share/gnome/applications/totem.desktop
 share/gnome/help/totem/C/figures/totem_next_button.png
 share/gnome/help/totem/C/figures/totem_pause_button.png
@@ -38,7 +44,6 @@ share/gnome/help/totem/ru/figures/totem_screenshot.png
 share/gnome/help/totem/ru/figures/totem_start_window.png
 share/gnome/help/totem/ru/legal.xml
 share/gnome/help/totem/ru/totem.xml
-share/gnome/mime-info/totem.keys
 share/gnome/omf/totem/totem-C.omf
 share/gnome/omf/totem/totem-de.omf
 share/gnome/omf/totem/totem-es.omf
@@ -135,5 +140,8 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm share/gnome/help/totem
 %%GSTREAMER%%@unexec rmdir lib/mozilla/plugins 2>/dev/null || /usr/bin/true
 %%GSTREAMER%%@unexec rmdir lib/mozilla 2>/dev/null || /usr/bin/true
+@dirrm include/totem/1/plparser
+@dirrm include/totem/1
+@dirrm include/totem
 @exec update-desktop-database > /dev/null || /usr/bin/true
 @unexec update-desktop-database > /dev/null || /usr/bin/true