Update to 3.2.0.

Do much needed plugin update.


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

3 files changed, 65 insertions, 44 deletions

diff --git a/multimedia/totem3/Makefile b/multimedia/totem3/Makefile
index c61b9c4cb..82929f00e 100644
--- a/multimedia/totem3/Makefile
+++ b/multimedia/totem3/Makefile
@@ -3,25 +3,26 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/totem3/Makefile,v 1.19 2011/09/18 15:36:58 kwm Exp $
+#   $MCom: ports/multimedia/totem3/Makefile,v 1.20 2011/09/22 15:36:13 kwm Exp $
 #
 
 PORTNAME=	totem
-PORTVERSION=	3.1.92
-PORTREVISION?=	0
+PORTVERSION=	3.2.0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
-MAINTAINER?=	gnome@FreeBSD.org
-COMMENT?=	A gstreamer-based video player for the GNOME 3 Desktop
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A gstreamer-based video player for the GNOME 3 Desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	gdata.13:${PORTSDIR}/devel/libgdata \
-		dbus-1.3:${PORTSDIR}/devel/dbus \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		clutter-gst-1.0.0:${PORTSDIR}/multimedia/clutter-gst \
+		clutter-gtk-1.0.0:${PORTSDIR}/graphics/clutter-gtk3 \
+		mx-1.0.2:${PORTSDIR}/x11-toolkits/mx \
 		peas-1.0.0:${PORTSDIR}/devel/libpeas \
 		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
@@ -33,20 +34,21 @@ CONFLICTS=	totem-2.[0-9]*
 
 LATEST_LINK=	totem3
 USE_PYTHON=	yes
-USE_XORG=	x11 xrandr xxf86vm
+USE_XORG=	x11 xproto xtst ice sm
 USE_XZ=		yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils \
-		nautilus3 ltverhack pygobject3 gnomedocutils
-USE_GSTREAMER=	core gconf hal good mpeg2dec soup ugly gio resindvd
+USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gtk30 libxml2 \
+		nautilus3 ltverhack pygobject3 gnomedocutils gnomehier
+USE_GSTREAMER=	core good mpeg2dec soup ugly gio resindvd
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LIBS="-L${LOCALBASE}/lib -lXrandr" \
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LIBS="-lXrandr" \
 		BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}"
 CONFIGURE_ARGS=	--with-plugins="${TOTEM_PLUGINS}"
 
@@ -56,29 +58,30 @@ GLIB_SCHEMAS=	org.gnome.totem.enums.xml \
 		org.gnome.totem.plugins.opensubtitles.gschema.xml
 
 OPTIONS=	LIRC "Enable lirc support" off \
-		GALAGO "Enable Galago support" off \
-		BROWSER_PLUGINS "Enable install plugins for gecko browser" on \
+		BROWSER_PLUGINS "Build plugins for a webkit-gtk3 browser" on \
 		PUBLISH "Enable Publish (network playlist) plugin" off \
 #		TRACKER "Enable tracker local search plugin" off
 
 # check configure script for allowed_plugins="..." for new plugins
-TOTEM_PLUGINS=	thumbnail screensaver ontop gromit media-player-keys \
-		properties skipto youtube opensubtitles screenshot \
-		brasero-disc-recorder dbus-service iplayer
+TOTEM_PLUGINS=	brasero-disc-recorder chapters dbusservice im-status gromit \
+		iplayer media-player-keys ontop opensubtitles properties \
+		screensaver screenshot sidebar-test skipto youtube
 
-# Not using:
-# TOTEM_PLUGINS= mythtv bemused jamendo
-# coherence_upnp (uses py-gtk2 conflict with py-gobject >=2.27.0)
+# pythonconsole samplepython 
+# vala rotation sample-vala
+# nautilus save-file 
+# iplayer zeitgeist-dp grilo
 
-# current full list, needs sorting (again)
-#allowed_plugins="bemused brasero-disc-recorder chapters coherence_upnp dbus-service galago gromit iplayer jamendo lirc media-player-keys ontop opensubtitles properties publish pythonconsole save-file sample-python screensaver screenshot sidebar-test skipto thumbnail tracker youtube"
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_PUBLISH)
-LIB_DEPENDS+=	epc-1.0.2:${PORTSDIR}/www/libepc
+LIB_DEPENDS+=	epc-1.0.3:${PORTSDIR}/www/libepc
 PLIST_SUB+=	PUBLISH=""
 TOTEM_PLUGINS:=	${TOTEM_PLUGINS} publish
+GLIB_SCHEMAS=	org.gnome.totem.enums.xml \
+		org.gnome.totem.gschema.xml \
+		org.gnome.totem.plugins.publish.gschema.xml \
+		org.gnome.totem.plugins.opensubtitles.gschema.xml
 .else
 PLIST_SUB+=	PUBLISH="@comment "
 .endif
@@ -92,28 +95,20 @@ PLIST_SUB+=	TRACKER="@comment "
 #.endif
 
 .if defined(WITH_LIRC)
-LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
+LIB_DEPENDS+=	lirc_client.2:${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:${PORTSDIR}/devel/libgalago
-PLIST_SUB+=	GALAGO=""
-TOTEM_PLUGINS:=	${TOTEM_PLUGINS} galago
-.else
-PLIST_SUB+=	GALAGO="@comment "
-.endif
-
 .if !defined(WITHOUT_BROWSER_PLUGINS)
 CONFIGURE_ARGS+=--enable-browser-plugins \
 		--enable-gmp-plugin \
 		--enable-narrowspace-plugin
 PLIST_SUB+=	BROWSER_PLUGINS=""
 
-USE_WEBPLUGINS=		gecko19 webkit-gtk2
+USE_WEBPLUGINS=		webkit-gtk3
 WEBPLUGINS_FILES=	libtotem-cone-plugin.so libtotem-gmp-plugin.so \
 			libtotem-mully-plugin.so \
 			libtotem-narrowspace-plugin.so
@@ -149,4 +144,4 @@ post-install:
 #	${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.deps ${PREFIX}/share/vala/vapi
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/totem3/distinfo b/multimedia/totem3/distinfo
index b7e8e0693..e70b45235 100644
--- a/multimedia/totem3/distinfo
+++ b/multimedia/totem3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/totem-3.1.92.tar.xz) = a7186a3c3a62f5ec0a8749aba9718c999507b43ab99711ebf4f7b65c24e995ab
-SIZE (gnome3/totem-3.1.92.tar.xz) = 3120844
+SHA256 (gnome3/totem-3.2.0.tar.xz) = 97277b6746bdbfa7de185fa20602bfb5c72b77169f346311001d4013a93f9139
+SIZE (gnome3/totem-3.2.0.tar.xz) = 3131616
diff --git a/multimedia/totem3/pkg-plist b/multimedia/totem3/pkg-plist
index bc462d107..96c733c78 100644
--- a/multimedia/totem3/pkg-plist
+++ b/multimedia/totem3/pkg-plist
@@ -31,11 +31,21 @@ lib/totem/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin
 lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.a
 lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.la
 lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.so
-%%GALAGO%%lib/totem/plugins/galago/galago.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/chapters/chapters-edit.ui
+lib/totem/plugins/chapters/chapters-list.ui
+lib/totem/plugins/chapters/chapters.plugin
+lib/totem/plugins/chapters/libchapters.a
+lib/totem/plugins/chapters/libchapters.la
+lib/totem/plugins/chapters/libchapters.so
+lib/totem/plugins/dbus/dbusservice.plugin
+lib/totem/plugins/dbus/dbusservice.py
+lib/totem/plugins/dbus/dbusservice.pyc
+lib/totem/plugins/dbus/dbusservice.pyo
 lib/totem/plugins/gromit/gromit.plugin
+lib/totem/plugins/im-status/libtotem-im-status.a
+lib/totem/plugins/im-status/libtotem-im-status.la
+lib/totem/plugins/im-status/libtotem-im-status.so
+lib/totem/plugins/im-status/totem-im-status.plugin
 lib/totem/plugins/iplayer/iplayer.py
 lib/totem/plugins/iplayer/iplayer.pyc
 lib/totem/plugins/iplayer/iplayer.pyo
@@ -54,6 +64,7 @@ lib/totem/plugins/gromit/libgromit.so
 %%LIRC%%lib/totem/plugins/lirc/liblirc.a
 %%LIRC%%lib/totem/plugins/lirc/liblirc.la
 %%LIRC%%lib/totem/plugins/lirc/liblirc.so
+%%LIRC%%lib/totem/plugins/lirc/totem_lirc_default
 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
@@ -73,7 +84,7 @@ lib/totem/plugins/opensubtitles/opensubtitles.ui
 %%PUBLISH%%lib/totem/plugins/publish/libpublish.a
 %%PUBLISH%%lib/totem/plugins/publish/libpublish.la
 %%PUBLISH%%lib/totem/plugins/publish/libpublish.so
-%%PUBLISH%%lib/totem/plugins/publish/publish.ui
+%%PUBLISH%%lib/totem/plugins/publish/publish-plugin.ui
 %%PUBLISH%%lib/totem/plugins/publish/publish.plugin
 lib/totem/plugins/properties/libmovie-properties.a
 lib/totem/plugins/properties/libmovie-properties.la
@@ -107,6 +118,7 @@ libdata/pkgconfig/totem.pc
 %%BROWSER_PLUGINS%%libexec/totem-plugin-viewer
 libexec/totem/totem-bugreport.py
 share/GConf/gsettings/opensubtitles.convert
+%%PUBLISH%%share/GConf/gsettings/publish.convert
 share/GConf/gsettings/totem.convert
 share/applications/totem.desktop
 %%DOCSDIR%%/BaconVideoWidget.html
@@ -243,6 +255,15 @@ share/gnome/help/totem/fr/figures/totem_start_window.png
 share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/fr/figures/totem_volume_mute_button.png
 share/gnome/help/totem/fr/totem.xml
+share/gnome/help/totem/gl/figures/totem_next_button.png
+share/gnome/help/totem/gl/figures/totem_pause_button.png
+share/gnome/help/totem/gl/figures/totem_play_button.png
+share/gnome/help/totem/gl/figures/totem_previous_button.png
+share/gnome/help/totem/gl/figures/totem_show_playlist_button.png
+share/gnome/help/totem/gl/figures/totem_start_window.png
+share/gnome/help/totem/gl/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/gl/figures/totem_volume_mute_button.png
+share/gnome/help/totem/gl/totem.xml
 share/gnome/help/totem/it/figures/totem_next_button.png
 share/gnome/help/totem/it/figures/totem_pause_button.png
 share/gnome/help/totem/it/figures/totem_play_button.png
@@ -483,6 +504,7 @@ share/omf/totem/totem-es.omf
 share/omf/totem/totem-eu.omf
 share/omf/totem/totem-fi.omf
 share/omf/totem/totem-fr.omf
+share/omf/totem/totem-gl.omf
 share/omf/totem/totem-it.omf
 share/omf/totem/totem-ja.omf
 share/omf/totem/totem-oc.omf
@@ -540,6 +562,8 @@ share/thumbnailers/totem.thumbnailer
 @dirrm share/gnome/help/totem/ja
 @dirrm share/gnome/help/totem/it/figures
 @dirrm share/gnome/help/totem/it
+@dirrm share/gnome/help/totem/gl/figures
+@dirrm share/gnome/help/totem/gl
 @dirrm share/gnome/help/totem/fr/figures
 @dirrm share/gnome/help/totem/fr
 @dirrm share/gnome/help/totem/fi/figures
@@ -580,8 +604,10 @@ share/thumbnailers/totem.thumbnailer
 @dirrm lib/totem/plugins/media-player-keys
 %%LIRC%%@dirrm lib/totem/plugins/lirc
 @dirrm lib/totem/plugins/iplayer
+@dirrm lib/totem/plugins/im-status
 @dirrm lib/totem/plugins/gromit
-%%GALAGO%%@dirrm lib/totem/plugins/galago
+@dirrm lib/totem/plugins/dbus
+@dirrm lib/totem/plugins/chapters
 @dirrm lib/totem/plugins/brasero-disc-recorder
 @dirrm lib/totem/plugins
 @dirrm lib/totem