Update to version 0.100

PR:		76006
Submitted by:	maintainer

5 files changed, 37 insertions, 9 deletions

diff --git a/multimedia/totem-gstreamer/Makefile b/multimedia/totem-gstreamer/Makefile
index 52cb9bee2d23..56c5550d13e2 100644
--- a/multimedia/totem-gstreamer/Makefile
+++ b/multimedia/totem-gstreamer/Makefile
@@ -11,8 +11,10 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Gstreamer-based video player for the Gnome 2 desktop
 
 MASTERDIR=	${.CURDIR}/../totem
-WITH_GSTREAMER_OVERRIDE=	yes
 
+OPTIONS=
+
+WITH_GSTREAMER=	yes
 CONFLICTS=	totem-[0-9]*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 56dfa45f9476..4705a4c782ae 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	totem
-PORTVERSION=	0.99.22
-PORTREVISION?=	1
+PORTVERSION=	0.100
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/...$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	hendrik@scholz.net
@@ -28,7 +27,8 @@ INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 	       	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
 
-OPTIONS=	DVDNAV "Enable DVD support" on
+OPTIONS?=	DVDNAV "Enable DVD support" on \
+		GSTREAMER "Use Gstreamer instead of Xine" off
 
 MAN1=	totem.1
 GCONF_SCHEMAS=	totem-handlers.schemas totem-video-thumbnail.schemas \
@@ -37,12 +37,14 @@ CONFLICTS=	totem-gstreamer-[0-9]*
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GSTREAMER_OVERRIDE)
+.if defined(WITH_GSTREAMER)
 CONFIGURE_ARGS+=--enable-gstreamer
 USE_GNOME+=	gstreamerplugins
 WITHOUT_DVDNAV=	yes
+PLIST_SUB=	GSTREAMER=""
 .else
 LIB_DEPENDS+=	xine.12:${PORTSDIR}/multimedia/libxine
+PLIST_SUB=	GSTREAMER="@comment "
 .endif
 
 .if defined(WITH_DVDNAV) && !defined(WITHOUT_DVDNAV)
@@ -82,7 +84,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		${WRKSRC}/src/totem-preferences.c \
 		${WRKSRC}/src/bacon-video-widget-gst.c
-.if defined(WITH_GSTREAMER_OVERRIDE)
+.if defined(WITH_GSTREAMER)
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
 		${WRKSRC}/src/bacon-video-widget-gst.c
 .endif
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index b19a28ebea0c..a2e694925bf5 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/totem-0.99.22.tar.bz2) = 7843368e1e61921b0ae87a751ad91079
-SIZE (gnome2/totem-0.99.22.tar.bz2) = 1095821
+MD5 (gnome2/totem-0.100.tar.bz2) = 885423cc7e1d5eb8ff62b7b8ec9c30bc
+SIZE (gnome2/totem-0.100.tar.bz2) = 1279913
diff --git a/multimedia/totem/files/patch-data_Makefile.in b/multimedia/totem/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..ac127a4ab657
--- /dev/null
+++ b/multimedia/totem/files/patch-data_Makefile.in
@@ -0,0 +1,13 @@
+--- data/Makefile.in.orig       Sun Jan  9 21:15:28 2005
++++ data/Makefile.in    Sun Jan  9 21:16:01 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/pkg-plist b/multimedia/totem/pkg-plist
index c37924fdb7b8..e2e6502bdf7e 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -34,10 +34,15 @@ share/gnome/help/totem/es/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/es/figures/totem_volume_mute_button.png
 share/gnome/help/totem/es/legal.xml
 share/gnome/help/totem/es/totem.xml
+share/gnome/help/totem/ru/legal.xml
+share/gnome/help/totem/ru/totem.xml
+share/gnome/help/totem/ru/figures/totem_start_window.png
+share/gnome/help/totem/ru/figures/totem_screenshot.png
 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
+share/gnome/omf/totem/totem-ru.omf
 share/gnome/pixmaps/media-player-48.png
 share/gnome/pixmaps/vanity.png
 share/gnome/totem/filmholes-big-left.png
@@ -53,6 +58,7 @@ share/gnome/totem/properties.glade
 share/gnome/totem/rhythmbox-volume-max.png
 share/gnome/totem/rhythmbox-volume-zero.png
 share/gnome/totem/screenshot.glade
+share/gnome/totem/skip_to.glade
 share/gnome/totem/stock-tool-brightness-contrast-22.png
 share/gnome/totem/stock_media_next.png
 share/gnome/totem/stock_media_pause.png
@@ -87,6 +93,7 @@ share/locale/gu/LC_MESSAGES/totem.mo
 share/locale/he/LC_MESSAGES/totem.mo
 share/locale/hr/LC_MESSAGES/totem.mo
 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/ja/LC_MESSAGES/totem.mo
@@ -117,6 +124,8 @@ share/locale/zh_CN/LC_MESSAGES/totem.mo
 share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm share/gnome/totem
 @dirrm share/gnome/omf/totem
+@dirrm share/gnome/help/totem/ru/figures
+@dirrm share/gnome/help/totem/ru
 @dirrm share/gnome/help/totem/es/figures
 @dirrm share/gnome/help/totem/es
 @dirrm share/gnome/help/totem/de/figures
@@ -124,5 +133,7 @@ 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
+%%GSTREAMER%%@unexec rmdir lib/mozilla/plugins 2>/dev/null || /usr/bin/true
+%%GSTREAMER%%@unexec rmdir lib/mozilla 2>/dev/null || /usr/bin/true
 @exec update-desktop-database > /dev/null || /usr/bin/true
 @unexec update-desktop-database > /dev/null || /usr/bin/true