Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

9 files changed, 30 insertions, 142 deletions

diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
deleted file mode 100644
index b7d4b296bafa..000000000000
--- a/multimedia/nautilus-media/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	nautilus-media
-# Date created:				30 November 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	nautilus-media
-PORTVERSION=	0.8.1
-PORTREVISION=	1
-CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GStreamer-based multimedia views for Nautilus
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack nautilus2
-USE_GSTREAMER=	core gnomevfs
-USE_INC_LIBTOOL_VER=13
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	gst-thumbnail.schemas
-
-.include <bsd.port.mk>
diff --git a/multimedia/nautilus-media/distinfo b/multimedia/nautilus-media/distinfo
deleted file mode 100644
index dc6fb6216567..000000000000
--- a/multimedia/nautilus-media/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/nautilus-media-0.8.1.tar.bz2) = 4ad604430b213a899c1217f5f4633887
-SIZE (gnome2/nautilus-media-0.8.1.tar.bz2) = 418924
diff --git a/multimedia/nautilus-media/pkg-descr b/multimedia/nautilus-media/pkg-descr
deleted file mode 100644
index c8ad32667488..000000000000
--- a/multimedia/nautilus-media/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Nautilus-media provides GStreamer-based multimedia support within
-Nautilus, including music previewing and video thumbnailing.
diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist
deleted file mode 100644
index b60c1c45bc03..000000000000
--- a/multimedia/nautilus-media/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-bin/gst-thumbnail
-lib/bonobo/libnautilus-audio-properties-view.so
-libdata/bonobo/servers/Nautilus_View_audio.server
-libdata/bonobo/servers/Nautilus_View_audio_properties.server
-libexec/nautilus-audio-view
-share/gnome/gnome-2.0/ui/nautilus-audio-view-ui.xml
-share/gnome/nautilus/glade/audio-properties-view.glade
-share/gnome/pixmaps/nautilus-media/next.png
-share/gnome/pixmaps/nautilus-media/pause.png
-share/gnome/pixmaps/nautilus-media/play.png
-share/gnome/pixmaps/nautilus-media/prev.png
-share/gnome/pixmaps/nautilus-media/scan.png
-share/gnome/pixmaps/nautilus-media/stop.png
-share/locale/am/LC_MESSAGES/nautilus-media.mo
-share/locale/ar/LC_MESSAGES/nautilus-media.mo
-share/locale/az/LC_MESSAGES/nautilus-media.mo
-share/locale/be/LC_MESSAGES/nautilus-media.mo
-share/locale/bg/LC_MESSAGES/nautilus-media.mo
-share/locale/bn/LC_MESSAGES/nautilus-media.mo
-share/locale/bs/LC_MESSAGES/nautilus-media.mo
-share/locale/ca/LC_MESSAGES/nautilus-media.mo
-share/locale/cs/LC_MESSAGES/nautilus-media.mo
-share/locale/cy/LC_MESSAGES/nautilus-media.mo
-share/locale/da/LC_MESSAGES/nautilus-media.mo
-share/locale/de/LC_MESSAGES/nautilus-media.mo
-share/locale/el/LC_MESSAGES/nautilus-media.mo
-share/locale/en_GB/LC_MESSAGES/nautilus-media.mo
-share/locale/en_CA/LC_MESSAGES/nautilus-media.mo
-share/locale/es/LC_MESSAGES/nautilus-media.mo
-share/locale/et/LC_MESSAGES/nautilus-media.mo
-share/locale/eu/LC_MESSAGES/nautilus-media.mo
-share/locale/fa/LC_MESSAGES/nautilus-media.mo
-share/locale/fi/LC_MESSAGES/nautilus-media.mo
-share/locale/fr/LC_MESSAGES/nautilus-media.mo
-share/locale/ga/LC_MESSAGES/nautilus-media.mo
-share/locale/gu/LC_MESSAGES/nautilus-media.mo
-share/locale/he/LC_MESSAGES/nautilus-media.mo
-share/locale/hi/LC_MESSAGES/nautilus-media.mo
-share/locale/hr/LC_MESSAGES/nautilus-media.mo
-share/locale/hu/LC_MESSAGES/nautilus-media.mo
-share/locale/id/LC_MESSAGES/nautilus-media.mo
-share/locale/is/LC_MESSAGES/nautilus-media.mo
-share/locale/it/LC_MESSAGES/nautilus-media.mo
-share/locale/ja/LC_MESSAGES/nautilus-media.mo
-share/locale/ko/LC_MESSAGES/nautilus-media.mo
-share/locale/li/LC_MESSAGES/nautilus-media.mo
-share/locale/lt/LC_MESSAGES/nautilus-media.mo
-share/locale/lv/LC_MESSAGES/nautilus-media.mo
-share/locale/mi/LC_MESSAGES/nautilus-media.mo
-share/locale/mk/LC_MESSAGES/nautilus-media.mo
-share/locale/ml/LC_MESSAGES/nautilus-media.mo
-share/locale/mn/LC_MESSAGES/nautilus-media.mo
-share/locale/ms/LC_MESSAGES/nautilus-media.mo
-share/locale/nb/LC_MESSAGES/nautilus-media.mo
-share/locale/nl/LC_MESSAGES/nautilus-media.mo
-share/locale/nn/LC_MESSAGES/nautilus-media.mo
-share/locale/no/LC_MESSAGES/nautilus-media.mo
-share/locale/or/LC_MESSAGES/nautilus-media.mo
-share/locale/pa/LC_MESSAGES/nautilus-media.mo
-share/locale/pl/LC_MESSAGES/nautilus-media.mo
-share/locale/pt/LC_MESSAGES/nautilus-media.mo
-share/locale/pt_BR/LC_MESSAGES/nautilus-media.mo
-share/locale/ro/LC_MESSAGES/nautilus-media.mo
-share/locale/ru/LC_MESSAGES/nautilus-media.mo
-share/locale/sk/LC_MESSAGES/nautilus-media.mo
-share/locale/sl/LC_MESSAGES/nautilus-media.mo
-share/locale/sq/LC_MESSAGES/nautilus-media.mo
-share/locale/sr/LC_MESSAGES/nautilus-media.mo
-share/locale/sr@Latn/LC_MESSAGES/nautilus-media.mo
-share/locale/sv/LC_MESSAGES/nautilus-media.mo
-share/locale/ta/LC_MESSAGES/nautilus-media.mo
-share/locale/th/LC_MESSAGES/nautilus-media.mo
-share/locale/tk/LC_MESSAGES/nautilus-media.mo
-share/locale/tr/LC_MESSAGES/nautilus-media.mo
-share/locale/uk/LC_MESSAGES/nautilus-media.mo
-share/locale/vi/LC_MESSAGES/nautilus-media.mo
-share/locale/zh_CN/LC_MESSAGES/nautilus-media.mo
-share/locale/zh_TW/LC_MESSAGES/nautilus-media.mo
-@dirrm share/gnome/pixmaps/nautilus-media
diff --git a/multimedia/totem-gstreamer/Makefile b/multimedia/totem-gstreamer/Makefile
index 56c5550d13e2..28bda1cea398 100644
--- a/multimedia/totem-gstreamer/Makefile
+++ b/multimedia/totem-gstreamer/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 PKGNAMESUFFIX=	-gstreamer
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -13,8 +14,8 @@ COMMENT=	A Gstreamer-based video player for the Gnome 2 desktop
 MASTERDIR=	${.CURDIR}/../totem
 
 OPTIONS=
-
 WITH_GSTREAMER=	yes
+
 CONFLICTS=	totem-[0-9]*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 5a7918826527..b1319f22e63c 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	totem
-PORTVERSION=	0.100
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
@@ -16,18 +15,18 @@ DIST_SUBDIR=	gnome2
 MAINTAINER?=	hendrik@scholz.net
 COMMENT?=	A Xine-based video player for the Gnome 2 Desktop
 
-LIB_DEPENDS=	nautilus-burn.0:${PORTSDIR}/sysutils/nautilus-cd-burner
-
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils
+USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \
+		nautiluscdburner
 WANT_GSTREAMER=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 	       	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
+CONFIGURE_ARGS+=--disable-mozilla
 
 OPTIONS?=	DVDNAV "Enable DVD support" on \
 		GSTREAMER "Use Gstreamer instead of Xine" off
@@ -41,7 +40,7 @@ CONFLICTS=	totem-gstreamer-[0-9]*
 
 .if defined(WITH_GSTREAMER)
 CONFIGURE_ARGS+=--enable-gstreamer
-USE_GSTREAMER=	gnomevfs core
+USE_GSTREAMER+=	gnomevfs core
 WITHOUT_DVDNAV=	yes
 PLIST_SUB=	GSTREAMER=""
 .else
@@ -91,4 +90,7 @@ post-patch:
 		${WRKSRC}/src/bacon-video-widget-gst.c
 .endif
 
+post-install:
+	@-update-desktop-database
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index a2e694925bf5..dbe8c55a9a30 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/totem-0.100.tar.bz2) = 885423cc7e1d5eb8ff62b7b8ec9c30bc
-SIZE (gnome2/totem-0.100.tar.bz2) = 1279913
+MD5 (gnome2/totem-1.0.tar.bz2) = eddfebd11ccb58caca72edc6485ed22f
+SIZE (gnome2/totem-1.0.tar.bz2) = 1402642
diff --git a/multimedia/totem/files/patch-data_Makefile.in b/multimedia/totem/files/patch-data_Makefile.in
deleted file mode 100644
index ac127a4ab657..000000000000
--- a/multimedia/totem/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 e2e6502bdf7e..3d9d848dc419 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -1,8 +1,14 @@
 bin/totem
 bin/totem-video-thumbnailer
-libdata/bonobo/servers/Totem_properties.server
-libexec/totem-properties-page
-share/gnome/application-registry/totem.applications
+include/totem/1/plparser/totem-disc.h
+include/totem/1/plparser/totem-pl-parser-builtins.h
+include/totem/1/plparser/totem-pl-parser.h
+lib/libtotem-plparser.a
+lib/libtotem-plparser.so
+lib/libtotem-plparser.so.0
+lib/nautilus/extensions-1.0/libtotem-properties-page.a
+lib/nautilus/extensions-1.0/libtotem-properties-page.so
+libdata/pkgconfig/totem-plparser.pc
 share/gnome/applications/totem.desktop
 share/gnome/help/totem/C/figures/totem_next_button.png
 share/gnome/help/totem/C/figures/totem_pause_button.png
@@ -34,11 +40,10 @@ 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/figures/totem_screenshot.png
+share/gnome/help/totem/ru/figures/totem_start_window.png
 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
@@ -54,6 +59,7 @@ share/gnome/totem/playlist-16.png
 share/gnome/totem/playlist-24.png
 share/gnome/totem/playlist-playing.png
 share/gnome/totem/playlist.glade
+share/gnome/totem/popup.glade
 share/gnome/totem/properties.glade
 share/gnome/totem/rhythmbox-volume-max.png
 share/gnome/totem/rhythmbox-volume-zero.png
@@ -91,6 +97,7 @@ share/locale/fr/LC_MESSAGES/totem.mo
 share/locale/ga/LC_MESSAGES/totem.mo
 share/locale/gu/LC_MESSAGES/totem.mo
 share/locale/he/LC_MESSAGES/totem.mo
+share/locale/hi/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
@@ -106,6 +113,7 @@ share/locale/ms/LC_MESSAGES/totem.mo
 share/locale/nb/LC_MESSAGES/totem.mo
 share/locale/nl/LC_MESSAGES/totem.mo
 share/locale/no/LC_MESSAGES/totem.mo
+share/locale/pa/LC_MESSAGES/totem.mo
 share/locale/pl/LC_MESSAGES/totem.mo
 share/locale/pt/LC_MESSAGES/totem.mo
 share/locale/pt_BR/LC_MESSAGES/totem.mo
@@ -116,6 +124,7 @@ share/locale/sq/LC_MESSAGES/totem.mo
 share/locale/sr/LC_MESSAGES/totem.mo
 share/locale/sr@Latn/LC_MESSAGES/totem.mo
 share/locale/sv/LC_MESSAGES/totem.mo
+share/locale/th/LC_MESSAGES/totem.mo
 share/locale/tr/LC_MESSAGES/totem.mo
 share/locale/uk/LC_MESSAGES/totem.mo
 share/locale/vi/LC_MESSAGES/totem.mo
@@ -135,5 +144,8 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @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
+@dirrm include/totem/1/plparser
+@dirrm include/totem/1
+@dirrm include/totem
 @exec update-desktop-database > /dev/null || /usr/bin/true
 @unexec update-desktop-database > /dev/null || /usr/bin/true