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, 82 insertions, 81 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 31b77a68cec4..0e2335912772 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/galeon/Makefile,v 1.9 2006/07/27 18:09:47 mezz Exp $
+#    $MCom: ports/www/galeon/Makefile,v 1.14 2007/10/08 19:42:51 mezz Exp $
 #
 
 PORTNAME=	galeon
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://osdn.dl.sourceforge.net/sourceforge/galeon/
@@ -29,14 +29,14 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ARGS=	--enable-nautilus-view=no \
 		--with-mozilla=${GECKO}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		galeon.1
 GCONF_SCHEMAS=	galeon.schemas
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
 # Galeon does not build correctly in -CURRENT if -Werror is passed
 # to the compiler.
@@ -54,7 +54,7 @@ post-patch:
 		's|malloc\.h|stdlib.h|g'
 	@${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \
 		${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
-	@${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${X11BASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins:${X11BASE}/lib/browser_linux_plugins|' \
+	@${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins|' \
 		${WRKSRC}/mozilla/mozilla-embed-shell.cpp
 
 .include <bsd.port.post.mk>
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index c2136ee67bb4..127a1bd68cd6 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -3,72 +3,72 @@ bin/galeon-config-tool
 etc/sound/events/galeon.soundlist
 libdata/bonobo/servers/GNOME_Galeon_Automation.server
 libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
-share/gnome/applications/galeon.desktop
-share/gnome/galeon/FAQ.html
-share/gnome/galeon/about_logo.png
-share/gnome/galeon/autoscroll.xpm
-share/gnome/galeon/bookmarks-editor-small.glade
-share/gnome/galeon/bookmarks-editor.glade
-share/gnome/galeon/bookmarks.glade
-share/gnome/galeon/bug.png
-share/gnome/galeon/certificate-dialogs.glade
-share/gnome/galeon/chrome/branding/brand.dtd
-share/gnome/galeon/chrome/branding/brand.properties
-share/gnome/galeon/chrome/galeon.manifest
-share/gnome/galeon/chrome/global/about.xhtml
-share/gnome/galeon/debian.png
-share/gnome/galeon/default-bookmarks.xbel
-share/gnome/galeon/default-prefs.js
-share/gnome/galeon/fetch_favicon.xpm
-share/gnome/galeon/freshmeat.png
-share/gnome/galeon/galeon-bookmark-alias-mark.png
-share/gnome/galeon/galeon-default.png
-share/gnome/galeon/galeon-download.png
-share/gnome/galeon/galeon-egg-ui-toolbar.xml
-share/gnome/galeon/galeon-egg-ui.xml
-share/gnome/galeon/galeon-entry.png
-share/gnome/galeon/galeon-filter.png
-share/gnome/galeon/galeon-folder.png
-share/gnome/galeon/galeon-history.png
-share/gnome/galeon/galeon-insecure.png
-share/gnome/galeon/galeon-popup-blocked.png
-share/gnome/galeon/galeon-prefs-fonts.png
-share/gnome/galeon/galeon-prefs-general.png
-share/gnome/galeon/galeon-prefs-language.png
-share/gnome/galeon/galeon-prefs-mouse.png
-share/gnome/galeon/galeon-prefs-network.png
-share/gnome/galeon/galeon-prefs-privacy.png
-share/gnome/galeon/galeon-prefs-tabs.png
-share/gnome/galeon/galeon-prefs-web-content.png
-share/gnome/galeon/galeon-secure.png
-share/gnome/galeon/galeon-separator.png
-share/gnome/galeon/galeon-tab-loading.gif
-share/gnome/galeon/galeon.glade
-share/gnome/galeon/galeon.png
-share/gnome/galeon/gnu.png
-share/gnome/galeon/google.png
-share/gnome/galeon/google_groups.png
-share/gnome/galeon/google_images.png
-share/gnome/galeon/hand-open.png
-share/gnome/galeon/imdb_movies.png
-share/gnome/galeon/logo.png
-share/gnome/galeon/myportal.css
-share/gnome/galeon/new_alias.xpm
-share/gnome/galeon/new_alias_small.xpm
-share/gnome/galeon/new_folder.xpm
-share/gnome/galeon/new_folder_small.xpm
-share/gnome/galeon/new_item.xpm
-share/gnome/galeon/new_item_small.xpm
-share/gnome/galeon/new_separator.xpm
-share/gnome/galeon/new_separator_small.xpm
-share/gnome/galeon/prefs-dialog.glade
-share/gnome/galeon/print.glade
-share/gnome/galeon/rpm.png
-share/gnome/galeon/slack.png
-share/gnome/galeon/smart-bm-fold.png
-share/gnome/galeon/smart-bm-unfold.png
-share/gnome/galeon/stocks.png
-share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
+share/applications/galeon.desktop
+share/galeon/FAQ.html
+share/galeon/about_logo.png
+share/galeon/autoscroll.xpm
+share/galeon/bookmarks-editor-small.glade
+share/galeon/bookmarks-editor.glade
+share/galeon/bookmarks.glade
+share/galeon/bug.png
+share/galeon/certificate-dialogs.glade
+share/galeon/chrome/branding/brand.dtd
+share/galeon/chrome/branding/brand.properties
+share/galeon/chrome/galeon.manifest
+share/galeon/chrome/global/about.xhtml
+share/galeon/debian.png
+share/galeon/default-bookmarks.xbel
+share/galeon/default-prefs.js
+share/galeon/fetch_favicon.xpm
+share/galeon/freshmeat.png
+share/galeon/galeon-bookmark-alias-mark.png
+share/galeon/galeon-default.png
+share/galeon/galeon-download.png
+share/galeon/galeon-egg-ui-toolbar.xml
+share/galeon/galeon-egg-ui.xml
+share/galeon/galeon-entry.png
+share/galeon/galeon-filter.png
+share/galeon/galeon-folder.png
+share/galeon/galeon-history.png
+share/galeon/galeon-insecure.png
+share/galeon/galeon-popup-blocked.png
+share/galeon/galeon-prefs-fonts.png
+share/galeon/galeon-prefs-general.png
+share/galeon/galeon-prefs-language.png
+share/galeon/galeon-prefs-mouse.png
+share/galeon/galeon-prefs-network.png
+share/galeon/galeon-prefs-privacy.png
+share/galeon/galeon-prefs-tabs.png
+share/galeon/galeon-prefs-web-content.png
+share/galeon/galeon-secure.png
+share/galeon/galeon-separator.png
+share/galeon/galeon-tab-loading.gif
+share/galeon/galeon.glade
+share/galeon/galeon.png
+share/galeon/gnu.png
+share/galeon/google.png
+share/galeon/google_groups.png
+share/galeon/google_images.png
+share/galeon/hand-open.png
+share/galeon/imdb_movies.png
+share/galeon/logo.png
+share/galeon/myportal.css
+share/galeon/new_alias.xpm
+share/galeon/new_alias_small.xpm
+share/galeon/new_folder.xpm
+share/galeon/new_folder_small.xpm
+share/galeon/new_item.xpm
+share/galeon/new_item_small.xpm
+share/galeon/new_separator.xpm
+share/galeon/new_separator_small.xpm
+share/galeon/prefs-dialog.glade
+share/galeon/print.glade
+share/galeon/rpm.png
+share/galeon/slack.png
+share/galeon/smart-bm-fold.png
+share/galeon/smart-bm-unfold.png
+share/galeon/stocks.png
+share/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
 share/gnome/help/galeon/C/apx-authors.xml
 share/gnome/help/galeon/C/apx-bugs.xml
 share/gnome/help/galeon/C/apx-command-line.xml
@@ -159,10 +159,10 @@ share/gnome/help/galeon/es/other-tools.xml
 share/gnome/help/galeon/es/plugins.xml
 share/gnome/help/galeon/es/preface.xml
 share/gnome/help/galeon/es/preferences.xml
-share/gnome/omf/galeon/galeon-C.omf
-share/gnome/omf/galeon/galeon-es.omf
-share/gnome/pixmaps/galeon.png
-share/gnome/sounds/galeon/clicked.wav
+share/omf/galeon/galeon-C.omf
+share/omf/galeon/galeon-es.omf
+share/pixmaps/galeon.png
+share/sounds/galeon/clicked.wav
 share/locale/am/LC_MESSAGES/galeon-2.0.mo
 share/locale/az/LC_MESSAGES/galeon-2.0.mo
 share/locale/be/LC_MESSAGES/galeon-2.0.mo
@@ -217,20 +217,21 @@ share/locale/wa/LC_MESSAGES/galeon-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/galeon-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@dirrm share/gnome/sounds/galeon
-@dirrm share/gnome/omf/galeon
+@dirrm share/sounds/galeon
+@dirrm share/omf/galeon
 @dirrm share/gnome/help/galeon/es/figures
 @dirrm share/gnome/help/galeon/es
 @dirrm share/gnome/help/galeon/C/figures
 @dirrm share/gnome/help/galeon/C
 @dirrm share/gnome/help/galeon
-@dirrm share/gnome/galeon/chrome/global
-@dirrm share/gnome/galeon/chrome/branding
-@dirrm share/gnome/galeon/chrome
-@dirrm share/gnome/galeon
+@dirrm share/galeon/chrome/global
+@dirrm share/galeon/chrome/branding
+@dirrm share/galeon/chrome
+@dirrm share/galeon
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications