Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

2 files changed, 48 insertions, 46 deletions

diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index fd3ab322db8f..b81254a014f3 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		streamtuner
 PORTVERSION=		0.99.99
-PORTREVISION=		7
+PORTREVISION=		9
 CATEGORIES=		audio www
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,14 +15,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		jylefort@FreeBSD.org
 COMMENT=		A GTK+ stream directory browser
 
-BUILD_DEPENDS=		scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS=		rarian-sk-config:${PORTSDIR}/textproc/rarian
 LIB_DEPENDS=		curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_XLIB=		yes
 USE_GNOME=		gtk20 gnomehack gnomeprefix
 USE_GMAKE=		yes
-GNU_CONFIGURE=	yes
+INSTALLS_OMF=		yes
+GNU_CONFIGURE=		yes
 USE_GETOPT_LONG=	yes
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS=		-L${LOCALBASE}/lib
@@ -85,5 +86,7 @@ USE_GNOME+=		pygtk2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]datadir[)]/help|(datadir)/gnome/help|g' \
+		${WRKSRC}/help/C/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/audio/streamtuner/pkg-plist b/audio/streamtuner/pkg-plist
index 49b9461ba2df..4aea575d4a33 100644
--- a/audio/streamtuner/pkg-plist
+++ b/audio/streamtuner/pkg-plist
@@ -24,6 +24,7 @@ include/streamtuner/streamtuner.h
 %%SHOUTCAST%%lib/streamtuner/plugins/shoutcast.so
 %%XIPH%%lib/streamtuner/plugins/xiph.so
 libdata/pkgconfig/streamtuner.pc
+share/applications/streamtuner.desktop
 share/doc/streamtuner/api-reference.html
 share/doc/streamtuner/ch01s02.html
 share/doc/streamtuner/home.png
@@ -53,58 +54,56 @@ share/doc/streamtuner/streamtuner-st-util-api.html
 share/doc/streamtuner/streamtuner-st-version-api.html
 share/doc/streamtuner/streamtuner.devhelp
 share/doc/streamtuner/up.png
-share/gnome/applications/streamtuner.desktop
 share/gnome/help/streamtuner/C/documentation-license.xml
 share/gnome/help/streamtuner/C/figures/main-window.png
 share/gnome/help/streamtuner/C/software-license.xml
 share/gnome/help/streamtuner/C/streamtuner.xml
-share/gnome/omf/streamtuner/streamtuner-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/streamtuner/streamtuner-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/streamtuner.png
-share/gnome/streamtuner/ui/applications.png
-share/gnome/streamtuner/ui/bookmarks.png
-share/gnome/streamtuner/ui/browse.png
-share/gnome/streamtuner/ui/category-open-running.png
-share/gnome/streamtuner/ui/category-open.png
-share/gnome/streamtuner/ui/category-running.png
-share/gnome/streamtuner/ui/category.png
-%%LIVE365%%share/gnome/streamtuner/ui/live365.png
-%%LOCAL%%share/gnome/streamtuner/ui/local.png
-share/gnome/streamtuner/ui/logo.png
-share/gnome/streamtuner/ui/main-category-running.png
-share/gnome/streamtuner/ui/main-category.png
-share/gnome/streamtuner/ui/preselections.png
-%%PYTHON%%share/gnome/streamtuner/ui/python.png
-share/gnome/streamtuner/ui/record.png
-share/gnome/streamtuner/ui/search-category-running.png
-share/gnome/streamtuner/ui/search-category.png
-share/gnome/streamtuner/ui/search.png
-%%SHOUTCAST%%share/gnome/streamtuner/ui/shoutcast.png
-share/gnome/streamtuner/ui/streamtuner.png
-share/gnome/streamtuner/ui/tune-in.png
-%%XIPH%%share/gnome/streamtuner/ui/xiph.png
-%%PYTHON%%share/gnome/streamtuner/python/icons/basic.ch.png
-%%PYTHON%%share/gnome/streamtuner/python/icons/google-stations.png
-%%PYTHON%%share/gnome/streamtuner/python/icons/punkcast.com.png
-%%PYTHON%%share/gnome/streamtuner/python/scripts/basic.ch.py
-%%PYTHON%%share/gnome/streamtuner/python/scripts/google-stations.py
-%%PYTHON%%share/gnome/streamtuner/python/scripts/punkcast.com.py
 share/locale/de/LC_MESSAGES/streamtuner.mo
 share/locale/fr/LC_MESSAGES/streamtuner.mo
 share/locale/hu/LC_MESSAGES/streamtuner.mo
 share/locale/ja/LC_MESSAGES/streamtuner.mo
 share/locale/pt/LC_MESSAGES/streamtuner.mo
-@dirrm include/streamtuner
-@dirrm lib/streamtuner/plugins
-@dirrm lib/streamtuner
-@dirrm share/doc/streamtuner
+share/omf/streamtuner/streamtuner-C.omf
+share/pixmaps/streamtuner.png
+share/streamtuner/ui/applications.png
+share/streamtuner/ui/bookmarks.png
+share/streamtuner/ui/browse.png
+share/streamtuner/ui/category-open-running.png
+share/streamtuner/ui/category-open.png
+share/streamtuner/ui/category-running.png
+share/streamtuner/ui/category.png
+%%LIVE365%%share/streamtuner/ui/live365.png
+%%LOCAL%%share/streamtuner/ui/local.png
+share/streamtuner/ui/logo.png
+share/streamtuner/ui/main-category-running.png
+share/streamtuner/ui/main-category.png
+share/streamtuner/ui/preselections.png
+%%PYTHON%%share/streamtuner/ui/python.png
+share/streamtuner/ui/record.png
+share/streamtuner/ui/search-category-running.png
+share/streamtuner/ui/search-category.png
+share/streamtuner/ui/search.png
+%%SHOUTCAST%%share/streamtuner/ui/shoutcast.png
+share/streamtuner/ui/streamtuner.png
+share/streamtuner/ui/tune-in.png
+%%XIPH%%share/streamtuner/ui/xiph.png
+%%PYTHON%%share/streamtuner/python/icons/basic.ch.png
+%%PYTHON%%share/streamtuner/python/icons/google-stations.png
+%%PYTHON%%share/streamtuner/python/icons/punkcast.com.png
+%%PYTHON%%share/streamtuner/python/scripts/basic.ch.py
+%%PYTHON%%share/streamtuner/python/scripts/google-stations.py
+%%PYTHON%%share/streamtuner/python/scripts/punkcast.com.py
+@dirrm share/streamtuner/ui
+%%PYTHON%%@dirrm share/streamtuner/python/scripts
+%%PYTHON%%@dirrm share/streamtuner/python/icons
+%%PYTHON%%@dirrm share/streamtuner/python
+@dirrm share/streamtuner
+@dirrm share/omf/streamtuner
 @dirrm share/gnome/help/streamtuner/C/figures
 @dirrm share/gnome/help/streamtuner/C
 @dirrm share/gnome/help/streamtuner
-@dirrm share/gnome/omf/streamtuner
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/streamtuner/streamtuner-C.omf 2>/dev/null || /usr/bin/true
-@dirrm share/gnome/streamtuner/ui
-%%PYTHON%%@dirrm share/gnome/streamtuner/python/icons
-%%PYTHON%%@dirrm share/gnome/streamtuner/python/scripts
-%%PYTHON%%@dirrm share/gnome/streamtuner/python
-@dirrm share/gnome/streamtuner
+@dirrm share/doc/streamtuner
+@dirrm lib/streamtuner/plugins
+@dirrm lib/streamtuner
+@dirrm include/streamtuner
+@dirrmtry share/applications