Update to 2.19.3.

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

4 files changed, 115 insertions, 10 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index ade981253..12e94dce2 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/totem/Makefile,v 1.80 2007/05/15 05:26:13 marcus Exp $
+#    $MCom: ports/multimedia/totem/Makefile,v 1.81 2007/05/19 21:36:15 marcus Exp $
 #
 
 PORTNAME=	totem
-PORTVERSION=	2.19.2
-PORTREVISION?=	1
+PORTVERSION=	2.19.3
+PORTREVISION?=	0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \
-		nautiluscdburner ltverhack
+		nautiluscdburner ltverhack gnomecontrolcenter2
 GNOME_DESKTOP_VERSION=2
 WANT_GSTREAMER=	yes
 INSTALLS_ICONS=	yes
@@ -34,16 +34,38 @@ USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-	       	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+	       	LIBS="-L${LOCALBASE}/lib -lXrandr"
+CONFIGURE_ARGS=	--with-plugins=${TOTEM_PLUGINS}
 
 MAN1=		totem.1 totem-video-thumbnailer.1
 GCONF_SCHEMAS=	totem-handlers.schemas totem-video-thumbnail.schemas \
 		totem.schemas
 CONFLICTS?=	totem-gstreamer-[0-9]* totem-xine-[0-9]*
 
+OPTIONS=	LIRC "Enable lirc support" off \
+		GALAGO "Enable Galago support" off
+
+TOTEM_PLUGINS=	"screensaver ontop gromit media-player-keys properties sidebar-test skipto"
+
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_LIRC)
+LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
+PLIST_SUB+=	LIRC=""
+TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
+.else
+PLIST_SUB+=	LIRC="@comment "
+.endif
+
+.if defined(WITH_GALAGO)
+LIB_DEPENDS+=	galago.3:${PORTSIDR}/devel/libgalago
+PLIST_SUB+=	GALAGO=""
+TOTEM_PLUGINS:=	${TOTEM_PLUGINS} galago
+.else
+PLIST_SUB+=	GALAGO="@comment "
+.endif
+
 .if defined(WITH_MOZILLA_PLUGIN) && ${SLAVE_PORT:L}=="yes"
 USE_GECKO=	firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 5d255bdbd..690c658ad 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.19.2.tar.bz2) = b11f8df80a17503f97bd1066a278ce92
-SHA256 (gnome2/totem-2.19.2.tar.bz2) = b787dff87d066536395bfdb7febd2cd420222c71ab0c7d5a5e778f310764de52
-SIZE (gnome2/totem-2.19.2.tar.bz2) = 2095867
+MD5 (gnome2/totem-2.19.3.tar.bz2) = 02266885a14febed85f53cf17e9f037b
+SHA256 (gnome2/totem-2.19.3.tar.bz2) = d8a9c9128bae909457e5eb099b44549b5e50c9cb48117b4ee3748600c7d814b7
+SIZE (gnome2/totem-2.19.3.tar.bz2) = 2110002
diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure
new file mode 100644
index 000000000..1fab81f6e
--- /dev/null
+++ b/multimedia/totem/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	Fri May 25 00:24:10 2007
++++ configure	Fri May 25 00:24:23 2007
+@@ -22960,7 +22960,7 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"
+ 
+ plugin_error_or_ignore()
+ {
+-	if test "${error_on_bad_plugin}" == "1" ; then
++	if test "${error_on_bad_plugin}" = "1" ; then
+ 		{ { echo "$as_me:$LINENO: error: $1" >&5
+ echo "$as_me: error: $1" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -22982,7 +22982,7 @@ fi
+ used_plugins=""
+ used_plugins2=""
+ 
+-if test "x${with_plugins}" == "xautodetect" ; then
++if test "x${with_plugins}" = "xautodetect" ; then
+ 	# Default to all plugins and just ignore them if they won't compile
+ 	with_plugins="all"
+ 	error_on_bad_plugin="0"
+@@ -23384,7 +23384,7 @@ fi
+ 	esac
+ 
+ 	# Add the specified plugin
+-	if test "${add_plugin}" == "1" ; then
++	if test "${add_plugin}" = "1" ; then
+ 		used_plugins2="${used_plugins2} ${plugin}"
+ 	fi
+ done
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 98ce2d447..c5da032db 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -12,6 +12,39 @@ lib/libtotem-plparser.so.7
 lib/nautilus/extensions-1.0/libtotem-properties-page.a
 lib/nautilus/extensions-1.0/libtotem-properties-page.la
 lib/nautilus/extensions-1.0/libtotem-properties-page.so
+%%GALAGO%%lib/totem/plugins/galago/galago.totem-plugin
+%%GALAGO%%lib/totem/plugins/galago/libtgp.a
+%%GALAGO%%lib/totem/plugins/galago/libtgp.la
+%%GALAGO%%lib/totem/plugins/galago/libtgp.so
+lib/totem/plugins/gromit/gromit.totem-plugin
+lib/totem/plugins/gromit/libgromit.a
+lib/totem/plugins/gromit/libgromit.la
+lib/totem/plugins/gromit/libgromit.so
+%%LIRC%%lib/totem/plugins/lirc/lirc.totem-plugin
+%%LIRC%%lib/totem/plugins/lirc/liblirc.a
+%%LIRC%%lib/totem/plugins/lirc/liblirc.la
+%%LIRC%%lib/totem/plugins/lirc/liblirc.so
+lib/totem/plugins/media-player-keys/libmedia_player_keys.a
+lib/totem/plugins/media-player-keys/libmedia_player_keys.la
+lib/totem/plugins/media-player-keys/libmedia_player_keys.so
+lib/totem/plugins/media-player-keys/media-player-keys.totem-plugin
+lib/totem/plugins/ontop/libontop.a
+lib/totem/plugins/ontop/libontop.la
+lib/totem/plugins/ontop/libontop.so
+lib/totem/plugins/ontop/ontop.totem-plugin
+lib/totem/plugins/properties/libmovie-properties.a
+lib/totem/plugins/properties/libmovie-properties.la
+lib/totem/plugins/properties/libmovie-properties.so
+lib/totem/plugins/properties/movie-properties.totem-plugin
+lib/totem/plugins/screensaver/libscreensaver.a
+lib/totem/plugins/screensaver/libscreensaver.la
+lib/totem/plugins/screensaver/libscreensaver.so
+lib/totem/plugins/screensaver/screensaver.totem-plugin
+lib/totem/plugins/skipto/libskipto.a
+lib/totem/plugins/skipto/libskipto.la
+lib/totem/plugins/skipto/libskipto.so
+lib/totem/plugins/skipto/skip_to.glade
+lib/totem/plugins/skipto/skipto.totem-plugin
 libdata/pkgconfig/totem-plparser.pc
 share/applications/totem.desktop
 share/gnome/help/totem/C/figures/totem_next_button.png
@@ -36,6 +69,15 @@ share/gnome/help/totem/de/figures/totem_start_window.png
 share/gnome/help/totem/de/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/de/figures/totem_volume_mute_button.png
 share/gnome/help/totem/de/totem.xml
+share/gnome/help/totem/en_GB/figures/totem_next_button.png
+share/gnome/help/totem/en_GB/figures/totem_pause_button.png
+share/gnome/help/totem/en_GB/figures/totem_play_button.png
+share/gnome/help/totem/en_GB/figures/totem_previous_button.png
+share/gnome/help/totem/en_GB/figures/totem_show_playlist_button.png
+share/gnome/help/totem/en_GB/figures/totem_start_window.png
+share/gnome/help/totem/en_GB/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/en_GB/figures/totem_volume_mute_button.png
+share/gnome/help/totem/en_GB/totem.xml
 share/gnome/help/totem/es/figures/totem_next_button.png
 share/gnome/help/totem/es/figures/totem_pause_button.png
 share/gnome/help/totem/es/figures/totem_play_button.png
@@ -102,6 +144,7 @@ share/gnome/help/totem/uk/totem.xml
 share/omf/totem/totem-C.omf
 share/omf/totem/totem-bg.omf
 share/omf/totem/totem-de.omf
+share/omf/totem/totem-en_GB.omf
 share/omf/totem/totem-es.omf
 share/omf/totem/totem-fr.omf
 share/omf/totem/totem-pa.omf
@@ -117,7 +160,6 @@ share/totem/playlist-ui.xml
 share/totem/playlist.glade
 share/totem/plugins.glade
 share/totem/properties.glade
-share/totem/skip_to.glade
 share/totem/stock-tool-brightness-contrast-22.png
 share/totem/totem-ui.xml
 share/totem/totem.glade
@@ -218,6 +260,8 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm share/gnome/help/totem/pa
 @dirrm share/gnome/help/totem/fr/figures
 @dirrm share/gnome/help/totem/fr
+@dirrm share/gnome/help/totem/en_GB/figures
+@dirrm share/gnome/help/totem/en_GB
 @dirrm share/gnome/help/totem/es/figures
 @dirrm share/gnome/help/totem/es
 @dirrm share/gnome/help/totem/de/figures
@@ -227,6 +271,16 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm share/gnome/help/totem/C/figures
 @dirrm share/gnome/help/totem/C
 @dirrm share/gnome/help/totem
+%%GALAGO%%@dirrm lib/totem/plugins/galago
+@dirrm lib/totem/plugins/gromit
+%%LIRC%%@dirrm lib/totem/plugins/lirc
+@dirrm lib/totem/plugins/media-player-keys
+@dirrm lib/totem/plugins/ontop
+@dirrm lib/totem/plugins/properties
+@dirrm lib/totem/plugins/screensaver
+@dirrm lib/totem/plugins/skipto
+@dirrm lib/totem/plugins
+@dirrm lib/totem
 @dirrmtry lib/browser_plugins
 @dirrm include/totem/1/plparser
 @dirrm include/totem/1