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

4 files changed, 51 insertions, 36 deletions

diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 5728db166316..50b8275fdedf 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,13 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/orca/Makefile,v 1.15 2007/03/13 00:05:30 marcus Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.32 2007/10/13 21:13:14 marcus Exp $
 #
 
 PORTNAME=	orca
-PORTVERSION=	2.18.1
-PORTREVISION=	1
-CATEGORIES=	accessibility x11 gnome
+PORTVERSION=	2.20.0.1
+CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
@@ -36,8 +35,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		orca.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-	    	s|/usr/X11R6|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/src/orca/orca.in
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    	${WRKSRC}/src/orca/orca_i18n.py
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 31aa57e3d002..0af98af9df0e 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.18.1.tar.bz2) = 764f170af318c3ffd63b9cdfdcd19248
-SHA256 (gnome2/orca-2.18.1.tar.bz2) = 98ba4d3c8d6f306423f0806c573d8ad92f9fa24cccbefc34bb3bdc53125e5a31
-SIZE (gnome2/orca-2.18.1.tar.bz2) = 934098
+MD5 (gnome2/orca-2.20.0.1.tar.bz2) = dda6808aaf7815582ba84b648f3902a2
+SHA256 (gnome2/orca-2.20.0.1.tar.bz2) = d266203141fc7e3bcfa0f8daf1110d32cdb4d4791901593d08f127bd1a089ba3
+SIZE (gnome2/orca-2.20.0.1.tar.bz2) = 1401038
diff --git a/accessibility/orca/files/patch-src_orca_platform.py.in b/accessibility/orca/files/patch-src_orca_platform.py.in
deleted file mode 100644
index a21ae5f069bc..000000000000
--- a/accessibility/orca/files/patch-src_orca_platform.py.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/orca/platform.py.in.orig	Sun Mar 25 01:07:40 2007
-+++ src/orca/platform.py.in	Sun Mar 25 01:07:56 2007
-@@ -40,4 +40,4 @@ package     = "@PACKAGE@"
- 
- # The name of the data directory (usually "share").
- #
--datadirname = "@DATADIRNAME@"
-+datadirname = "@datadir@"
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index e438c1af429c..56202a965b54 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -11,9 +11,15 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/acss.py
 %%PYTHON_SITELIBDIR%%/orca/acss.pyc
 %%PYTHON_SITELIBDIR%%/orca/acss.pyo
+%%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.py
+%%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.pyc
+%%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.pyo
 %%PYTHON_SITELIBDIR%%/orca/atspi.py
 %%PYTHON_SITELIBDIR%%/orca/atspi.pyc
 %%PYTHON_SITELIBDIR%%/orca/atspi.pyo
+%%PYTHON_SITELIBDIR%%/orca/bookmarks.py
+%%PYTHON_SITELIBDIR%%/orca/bookmarks.pyc
+%%PYTHON_SITELIBDIR%%/orca/bookmarks.pyo
 %%PYTHON_SITELIBDIR%%/orca/braille.py
 %%PYTHON_SITELIBDIR%%/orca/braille.pyc
 %%PYTHON_SITELIBDIR%%/orca/braille.pyo
@@ -55,9 +61,6 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc
 %%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo
-%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.py
-%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.pyc
-%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.pyo
 %%PYTHON_SITELIBDIR%%/orca/httpserver.py
 %%PYTHON_SITELIBDIR%%/orca/httpserver.pyc
 %%PYTHON_SITELIBDIR%%/orca/httpserver.pyo
@@ -160,12 +163,18 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyo
@@ -181,39 +190,43 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.pyo
 %%PYTHON_SITELIBDIR%%/orca/settings.py
 %%PYTHON_SITELIBDIR%%/orca/settings.pyc
 %%PYTHON_SITELIBDIR%%/orca/settings.pyo
 %%PYTHON_SITELIBDIR%%/orca/speech.py
 %%PYTHON_SITELIBDIR%%/orca/speech.pyc
 %%PYTHON_SITELIBDIR%%/orca/speech.pyo
+%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.py
+%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyc
+%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.py
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyo
 %%PYTHON_SITELIBDIR%%/orca/speechserver.py
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyo
-%%PYTHON_SITELIBDIR%%/orca/util.py
-%%PYTHON_SITELIBDIR%%/orca/util.pyc
-%%PYTHON_SITELIBDIR%%/orca/util.pyo
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.py
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.pyc
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.pyo
-share/gnome/applications/orca.desktop
-share/gnome/orca/glade/orca-find.glade
-share/gnome/orca/glade/orca-mainwin.glade
-share/gnome/orca/glade/orca-quit.glade
-share/gnome/orca/glade/orca-setup.glade
+share/applications/orca.desktop
+share/icons/hicolor/16x16/apps/orca.png
+share/icons/hicolor/22x22/apps/orca.png
+share/icons/hicolor/24x24/apps/orca.png
+share/icons/hicolor/32x32/apps/orca.png
 share/icons/hicolor/48x48/apps/orca.png
+share/icons/hicolor/scalable/apps/orca.svg
 share/locale/ar/LC_MESSAGES/orca.mo
 share/locale/bg/LC_MESSAGES/orca.mo
 share/locale/bn/LC_MESSAGES/orca.mo
@@ -247,6 +260,7 @@ share/locale/mr/LC_MESSAGES/orca.mo
 share/locale/nb/LC_MESSAGES/orca.mo
 share/locale/ne/LC_MESSAGES/orca.mo
 share/locale/nl/LC_MESSAGES/orca.mo
+share/locale/oc/LC_MESSAGES/orca.mo
 share/locale/or/LC_MESSAGES/orca.mo
 share/locale/pa/LC_MESSAGES/orca.mo
 share/locale/pl/LC_MESSAGES/orca.mo
@@ -254,7 +268,9 @@ share/locale/pt/LC_MESSAGES/orca.mo
 share/locale/pt_BR/LC_MESSAGES/orca.mo
 share/locale/ru/LC_MESSAGES/orca.mo
 share/locale/rw/LC_MESSAGES/orca.mo
+share/locale/si/LC_MESSAGES/orca.mo
 share/locale/sl/LC_MESSAGES/orca.mo
+share/locale/sq/LC_MESSAGES/orca.mo
 share/locale/sr/LC_MESSAGES/orca.mo
 share/locale/sr@Latn/LC_MESSAGES/orca.mo
 share/locale/sv/LC_MESSAGES/orca.mo
@@ -266,17 +282,26 @@ share/locale/vi/LC_MESSAGES/orca.mo
 share/locale/zh_CN/LC_MESSAGES/orca.mo
 share/locale/zh_HK/LC_MESSAGES/orca.mo
 share/locale/zh_TW/LC_MESSAGES/orca.mo
-@dirrm share/gnome/orca/glade
-@dirrm share/gnome/orca
+%%DATADIR%%/glade/orca-find.glade
+%%DATADIR%%/glade/orca-mainwin.glade
+%%DATADIR%%/glade/orca-quit.glade
+%%DATADIR%%/glade/orca-setup.glade
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/orca
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications