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, 60 insertions, 45 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index dde9bea839e8..c679cda4a1d7 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi/Makefile,v 1.56 2007/03/12 13:22:49 ahze Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.65 2007/10/15 17:22:02 mezz Exp $
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.18.1
-PORTREVISION?=	1
+PORTVERSION=	1.20.1
+PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,14 +23,15 @@ USE_BZIP2=	yes
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo \
+USE_GNOME=	gnomehack gnomehier intltool gail libbonobo \
 		intlhack
 USE_XLIB=	yes
+USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-extract:
 	@${RM} -f ${WRKSRC}/registryd/Accessibility_Registry.server
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index cd07c6f0306d..373f19b3d3ff 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.18.1.tar.bz2) = 46c531204df5d39f7e83822372b0ce69
-SHA256 (gnome2/at-spi-1.18.1.tar.bz2) = 3b0be3207eb5cf4b1c1666b1dcd341ac914802b5404defb812e3b2aa9e78e7aa
-SIZE (gnome2/at-spi-1.18.1.tar.bz2) = 780306
+MD5 (gnome2/at-spi-1.20.1.tar.bz2) = 9dc4ce96c17452cd285d006d03574e93
+SHA256 (gnome2/at-spi-1.20.1.tar.bz2) = d592833339a347d6e4b33946b717b7bbe61f7730d714112cd99715c5a3a3714e
+SIZE (gnome2/at-spi-1.20.1.tar.bz2) = 842254
diff --git a/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in b/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in
deleted file mode 100644
index f8b41ab8c214..000000000000
--- a/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/idl/Makefile.in.orig	Fri Mar 31 17:43:05 2006
-+++ docs/reference/idl/Makefile.in	Fri Mar 31 17:43:28 2006
-@@ -233,7 +233,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- doxygen_configfile = Doxyfile
- EXTRA_DIST = Doxyfile README html
--referencetopdir = $(datadir)/doc/at-spi-$(VERSION)/reference
-+referencetopdir = $(prefix)/share/doc/at-spi-$(VERSION)/reference
- referencedir = $(referencetopdir)/html
- all: all-am
- 
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 74f5318c15a7..8d213686b51d 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -8,6 +8,7 @@ include/at-spi-1.0/libspi/accessible.h
 include/at-spi-1.0/libspi/action.h
 include/at-spi-1.0/libspi/application.h
 include/at-spi-1.0/libspi/base.h
+include/at-spi-1.0/libspi/collection.h
 include/at-spi-1.0/libspi/component.h
 include/at-spi-1.0/libspi/devicelistener.h
 include/at-spi-1.0/libspi/document.h
@@ -20,6 +21,7 @@ include/at-spi-1.0/libspi/keymasks.h
 include/at-spi-1.0/libspi/keystrokelistener.h
 include/at-spi-1.0/libspi/libspi.h
 include/at-spi-1.0/libspi/listener.h
+include/at-spi-1.0/libspi/matchrule.h
 include/at-spi-1.0/libspi/relation.h
 include/at-spi-1.0/libspi/remoteobject.h
 include/at-spi-1.0/libspi/selection.h
@@ -51,34 +53,53 @@ lib/orbit-2.0/Accessibility_LoginHelper_module.so
 lib/orbit-2.0/Accessibility_module.a
 lib/orbit-2.0/Accessibility_module.la
 lib/orbit-2.0/Accessibility_module.so
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.py
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.py
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/event.py
+%%PYTHON_SITELIBDIR%%/pyatspi/event.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/event.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.py
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.py
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyo
 libdata/bonobo/servers/Accessibility_Registry.server
 libdata/pkgconfig/cspi-1.0.pc
 libdata/pkgconfig/libloginhelper-1.0.pc
 libdata/pkgconfig/libspi-1.0.pc
 libexec/at-spi-registryd
-share/gnome/idl/at-spi-1.0/Accessibility.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Accessible.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Action.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Application.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Component.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Desktop.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Document.idl
-share/gnome/idl/at-spi-1.0/Accessibility_EditableText.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Event.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Hyperlink.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Hypertext.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Image.idl
-share/gnome/idl/at-spi-1.0/Accessibility_LoginHelper.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Registry.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Relation.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Role.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Selection.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Selector.idl
-share/gnome/idl/at-spi-1.0/Accessibility_State.idl
-share/gnome/idl/at-spi-1.0/Accessibility_StreamableContent.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Table.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Text.idl
-share/gnome/idl/at-spi-1.0/Accessibility_Value.idl
+share/idl/at-spi-1.0/Accessibility.idl
+share/idl/at-spi-1.0/Accessibility_Accessible.idl
+share/idl/at-spi-1.0/Accessibility_Action.idl
+share/idl/at-spi-1.0/Accessibility_Application.idl
+share/idl/at-spi-1.0/Accessibility_Collection.idl
+share/idl/at-spi-1.0/Accessibility_Component.idl
+share/idl/at-spi-1.0/Accessibility_Desktop.idl
+share/idl/at-spi-1.0/Accessibility_Document.idl
+share/idl/at-spi-1.0/Accessibility_EditableText.idl
+share/idl/at-spi-1.0/Accessibility_Event.idl
+share/idl/at-spi-1.0/Accessibility_Hyperlink.idl
+share/idl/at-spi-1.0/Accessibility_Hypertext.idl
+share/idl/at-spi-1.0/Accessibility_Image.idl
+share/idl/at-spi-1.0/Accessibility_LoginHelper.idl
+share/idl/at-spi-1.0/Accessibility_Registry.idl
+share/idl/at-spi-1.0/Accessibility_Relation.idl
+share/idl/at-spi-1.0/Accessibility_Role.idl
+share/idl/at-spi-1.0/Accessibility_Selection.idl
+share/idl/at-spi-1.0/Accessibility_Selector.idl
+share/idl/at-spi-1.0/Accessibility_State.idl
+share/idl/at-spi-1.0/Accessibility_StreamableContent.idl
+share/idl/at-spi-1.0/Accessibility_Table.idl
+share/idl/at-spi-1.0/Accessibility_Text.idl
+share/idl/at-spi-1.0/Accessibility_Value.idl
 share/locale/ar/LC_MESSAGES/at-spi.mo
 share/locale/az/LC_MESSAGES/at-spi.mo
 share/locale/be/LC_MESSAGES/at-spi.mo
@@ -121,6 +142,7 @@ share/locale/nb/LC_MESSAGES/at-spi.mo
 share/locale/ne/LC_MESSAGES/at-spi.mo
 share/locale/nl/LC_MESSAGES/at-spi.mo
 share/locale/nn/LC_MESSAGES/at-spi.mo
+share/locale/oc/LC_MESSAGES/at-spi.mo
 share/locale/or/LC_MESSAGES/at-spi.mo
 share/locale/pa/LC_MESSAGES/at-spi.mo
 share/locale/pl/LC_MESSAGES/at-spi.mo
@@ -145,12 +167,13 @@ share/locale/xh/LC_MESSAGES/at-spi.mo
 share/locale/zh_CN/LC_MESSAGES/at-spi.mo
 share/locale/zh_HK/LC_MESSAGES/at-spi.mo
 share/locale/zh_TW/LC_MESSAGES/at-spi.mo
-@dirrm share/gnome/idl/at-spi-1.0
-@dirrmtry lib/orbit-2.0
+@dirrm share/idl/at-spi-1.0
+@dirrm %%PYTHON_SITELIBDIR%%/pyatspi
 @dirrm include/at-spi-1.0/login-helper
 @dirrm include/at-spi-1.0/libspi
 @dirrm include/at-spi-1.0/cspi
 @dirrm include/at-spi-1.0
+@dirrmtry lib/orbit-2.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -161,6 +184,8 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
 @dirrmtry share/locale/sr@ije
 @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