Update to Update to 3.6.3.

Submitted by:	Gustau Perez (based on)


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

4 files changed, 17 insertions, 38 deletions

diff --git a/multimedia/totem3/Makefile b/multimedia/totem3/Makefile
index cd790945e..772d4751d 100644
--- a/multimedia/totem3/Makefile
+++ b/multimedia/totem3/Makefile
@@ -1,9 +1,9 @@
 # Created by: Hendrik Scholz <hendrik@scholz.net>
 # $FreeBSD$
-#   $MCom: ports/trunk/multimedia/totem3/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom: ports/multimedia/totem3/Makefile,v 1.23 2012/06/13 22:23:32 mezz Exp $
 
 PORTNAME=	totem
-PORTVERSION=	3.4.2
+PORTVERSION=	3.6.3
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,11 +16,10 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	gdata.13:${PORTSDIR}/devel/libgdata \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		clutter-gst-1.0:${PORTSDIR}/multimedia/clutter-gst \
+		clutter-gst-2.0:${PORTSDIR}/multimedia/clutter-gst \
 		clutter-gtk-1.0:${PORTSDIR}/graphics/clutter-gtk3 \
-		mx-1.0:${PORTSDIR}/x11-toolkits/mx \
 		peas-1.0:${PORTSDIR}/devel/libpeas \
-		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser
+		totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
 		gnome-settings-daemon>=2.91.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
@@ -35,7 +34,7 @@ USE_XZ=		yes
 USES=		gettext pathfix pkgconfig desktop-file-utils
 USE_GNOME=	gnomeprefix intlhack gtk30 libxml2 nautilus3 ltverhack \
 		pygobject3 gnomedocutils gnomehier
-USE_GSTREAMER=	core good mpeg2dec soup ugly gio resindvd
+USE_GSTREAMER1=	core good bad soup ugly
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
@@ -63,15 +62,15 @@ TOTEM_PLUGINS=	brasero-disc-recorder chapters dbusservice im-status gromit \
 		iplayer media-player-keys ontop opensubtitles properties \
 		screensaver screenshot sidebar-test skipto youtube
 
-# pythonconsole samplepython 
+# pythonconsole samplepython
 # vala rotation sample-vala
-# nautilus save-file 
+# nautilus save-file
 # iplayer zeitgeist-dp grilo
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_PUBLISH)
-LIB_DEPENDS+=	epc-1.0.3:${PORTSDIR}/www/libepc
+LIB_DEPENDS+=	epc-1.0:${PORTSDIR}/www/libepc
 PLIST_SUB+=	PUBLISH=""
 TOTEM_PLUGINS:=	${TOTEM_PLUGINS} publish
 GLIB_SCHEMAS=	org.gnome.totem.enums.xml \
@@ -83,7 +82,7 @@ PLIST_SUB+=	PUBLISH="@comment "
 .endif
 
 #.if defined(WITH_TRACKER)
-#LIB_DEPENDS+=	tracker-gtk.0:${PORTSDIR}/sysutils/tracker-libtrackergtk
+#LIB_DEPENDS+=	tracker-gtk:${PORTSDIR}/sysutils/tracker-libtrackergtk
 #TOTEM_PLUGINS:=	${TOTEM_PLUGINS} tracker
 #PLIST_SUB+=	TRACKER=""
 #.else
@@ -91,7 +90,7 @@ PLIST_SUB+=	TRACKER="@comment "
 #.endif
 
 .if defined(WITH_LIRC)
-LIB_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
+LIB_DEPENDS+=	lirc_client:${PORTSDIR}/comms/lirc
 PLIST_SUB+=	LIRC=""
 TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
 .else
@@ -120,7 +119,7 @@ PLIST_SUB+=	BROWSER_PLUGINS="@comment "
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
-DEFAULT_DVD_DEVICE=/dev/acd0
+DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
 
 pre-everything::
@@ -130,8 +129,8 @@ pre-everything::
 
 post-patch:
 	@${CP} -f ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
-		${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c
+#	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
+#		${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c
 
 post-install:
 #	${MKDIR} ${PREFIX}/share/vala/vapi
diff --git a/multimedia/totem3/distinfo b/multimedia/totem3/distinfo
index 4c70dc162..f3ca549db 100644
--- a/multimedia/totem3/distinfo
+++ b/multimedia/totem3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/totem-3.4.2.tar.xz) = e1532b471a14612b5f44d29b8392716c1123f4d874cd9d01e06a11f32637341e
-SIZE (gnome3/totem-3.4.2.tar.xz) = 3162288
+SHA256 (gnome3/totem-3.6.3.tar.xz) = ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60
+SIZE (gnome3/totem-3.6.3.tar.xz) = 3120056
diff --git a/multimedia/totem3/files/patch-configure b/multimedia/totem3/files/patch-configure
index 4c6a3519c..eb555a5a7 100644
--- a/multimedia/totem3/files/patch-configure
+++ b/multimedia/totem3/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	2010-10-10 12:15:41.000000000 -0400
 +++ configure	2010-10-10 12:18:12.000000000 -0400
-@@ -18343,7 +18343,7 @@ for good_element in gconfaudiosink gconf
- do
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $good_element plugin" >&5
- $as_echo_n "checking GStreamer 0.10 $good_element plugin... " >&6; }
--	if $gst010_inspect $good_element >/dev/null 2>/dev/null; then
-+	if dbus-launch $gst010_inspect $good_element >/dev/null 2>/dev/null; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
 @@ -21139,7 +21139,9 @@ if test "$enable_browser_plugins" = "yes
  $as_echo "#define ENABLE_BROWSER_PLUGINS 1" >>confdefs.h
  
diff --git a/multimedia/totem3/pkg-plist b/multimedia/totem3/pkg-plist
index 09a679a82..f169cfccc 100644
--- a/multimedia/totem3/pkg-plist
+++ b/multimedia/totem3/pkg-plist
@@ -52,17 +52,6 @@ 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.plugin
-lib/totem/plugins/iplayer/iplayer.py
-lib/totem/plugins/iplayer/iplayer.pyc
-lib/totem/plugins/iplayer/iplayer.pyo
-lib/totem/plugins/iplayer/iplayer.ui
-lib/totem/plugins/iplayer/iplayer2.py
-lib/totem/plugins/iplayer/iplayer2.pyc
-lib/totem/plugins/iplayer/iplayer2.pyo
-lib/totem/plugins/iplayer/listparser.py
-lib/totem/plugins/iplayer/listparser.pyc
-lib/totem/plugins/iplayer/listparser.pyo
 %%LIRC%%lib/totem/plugins/lirc/lirc.plugin
 %%LIRC%%lib/totem/plugins/lirc/liblirc.a
 %%LIRC%%lib/totem/plugins/lirc/liblirc.la
@@ -98,7 +87,6 @@ lib/totem/plugins/screensaver/libscreensaver.la
 lib/totem/plugins/screensaver/libscreensaver.so
 lib/totem/plugins/screensaver/screensaver.plugin
 lib/totem/plugins/screenshot/gallery.ui
-lib/totem/plugins/screenshot/gnome-screenshot.ui
 lib/totem/plugins/screenshot/libscreenshot.a
 lib/totem/plugins/screenshot/libscreenshot.la
 lib/totem/plugins/screenshot/libscreenshot.so
@@ -452,6 +440,7 @@ share/locale/hu/LC_MESSAGES/totem.mo
 share/locale/id/LC_MESSAGES/totem.mo
 share/locale/is/LC_MESSAGES/totem.mo
 share/locale/it/LC_MESSAGES/totem.mo
+share/locale/km/LC_MESSAGES/totem.mo
 share/locale/ja/LC_MESSAGES/totem.mo
 share/locale/ka/LC_MESSAGES/totem.mo
 share/locale/kk/LC_MESSAGES/totem.mo
@@ -536,6 +525,7 @@ share/thumbnailers/totem.thumbnailer
 %%DATADIR%%/mozilla-viewer.css
 %%DATADIR%%/mozilla-viewer.ui
 %%DATADIR%%/playlist.ui
+%%DATADIR%%/preferences.ui
 %%DATADIR%%/properties.ui
 %%DATADIR%%/totem.ui
 %%DATADIR%%/uri.ui
@@ -661,7 +651,6 @@ share/thumbnailers/totem.thumbnailer
 @dirrm lib/totem/plugins/ontop
 @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
 @dirrm lib/totem/plugins/dbus