From hscholz@goanna.wormulon.net  Sun Jan  9 20:36:52 2005
Return-Path: <hscholz@goanna.wormulon.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2B55E16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Jan 2005 20:36:52 +0000 (GMT)
Received: from goanna.wormulon.net (C6907.c.pppool.de [62.104.105.7])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1769B43D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Jan 2005 20:36:46 +0000 (GMT)
	(envelope-from hscholz@goanna.wormulon.net)
Received: from goanna.wormulon.net (localhost.wormulon.net [127.0.0.1])
	by goanna.wormulon.net (8.13.1/8.13.1) with ESMTP id j09KakjR062962;
	Sun, 9 Jan 2005 21:36:47 +0100 (CET)
	(envelope-from hscholz@goanna.wormulon.net)
Received: (from hscholz@localhost)
	by goanna.wormulon.net (8.13.1/8.13.1/Submit) id j09KajNp062948;
	Sun, 9 Jan 2005 21:36:45 +0100 (CET)
	(envelope-from hscholz)
Message-Id: <200501092036.j09KajNp062948@goanna.wormulon.net>
Date: Sun, 9 Jan 2005 21:36:45 +0100 (CET)
From: Hendrik Scholz <hendrik@scholz.net>
Reply-To: Hendrik Scholz <hendrik@scholz.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Hendrik Scholz <hendrik@scholz.net>
Subject: maintainer-update: multimedia/totem (0.9.22 to 0.100)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76006
>Category:       ports
>Synopsis:       maintainer-update: multimedia/totem (0.9.22 to 0.100)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kwm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 09 20:40:21 GMT 2005
>Closed-Date:    Sun Jan 23 10:33:50 GMT 2005
>Last-Modified:  Sun Jan 23 10:33:50 GMT 2005
>Originator:     Hendrik Scholz
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD goanna.wormulon.net 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Sun Dec 19 22:09:23 CET 2004 hscholz@goanna.wormulon.net:/usr/src/sys/i386/compile/GOANNA i386


	
>Description:

Update of totem to 0.100:

- add GSTREAMER OPTIONS knob
- update pkg-plist to include russian documentation
- add new patch files/patch-data::Makefile.in
  to take care of error in data/Makefile.in fixed in CVS:
  http://cvs.gnome.org/viewcvs/totem/data/Makefile.am?r1=1.38&r2=1.39

>How-To-Repeat:
	
>Fix:

	

--- totem-0.100.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/totem/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- Makefile	30 Dec 2004 00:59:14 -0000	1.45
+++ Makefile	9 Jan 2005 20:33:15 -0000
@@ -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 @@
 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,7 +37,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GSTREAMER_OVERRIDE)
+.if defined(WITH_GSTREAMER)
 CONFIGURE_ARGS+=--enable-gstreamer
 USE_GNOME+=	gstreamerplugins
 WITHOUT_DVDNAV=	yes
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/multimedia/totem/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	25 Nov 2004 08:03:48 -0000	1.21
+++ distinfo	9 Jan 2005 20:33:16 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/multimedia/totem/pkg-plist,v
retrieving revision 1.19
diff -u -r1.19 pkg-plist
--- pkg-plist	25 Nov 2004 08:03:48 -0000	1.19
+++ pkg-plist	9 Jan 2005 20:33:16 -0000
@@ -34,10 +34,15 @@
 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/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/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_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

[0.17] hscholz@goanna:/usr/ports/multimedia/totem > cat files/patch-data\:\:Makefile.in 
--- 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)
--- totem-0.100.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kwm 
Responsible-Changed-By: kwm 
Responsible-Changed-When: Sun Jan 9 20:48:21 GMT 2005 
Responsible-Changed-Why:  
grab 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76006 
State-Changed-From-To: open->closed 
State-Changed-By: kwm 
State-Changed-When: Sun Jan 23 10:32:34 GMT 2005 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76006 
>Unformatted:
