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

3 files changed, 65 insertions, 36 deletions

diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index c8727ca30603..a4bd361d41d0 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Franz Klammer <klammer@webonaut.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/zenity/Makefile,v 1.77 2007/03/11 19:58:27 mezz Exp $
+#   $MCom: ports/x11/zenity/Makefile,v 1.87 2007/09/17 20:34:06 ahze Exp $
 #
 
 PORTNAME=	zenity
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Display GNOME dialogs from the command line
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
@@ -33,8 +33,4 @@ MAN1=		zenity.1
 
 CONFLICTS=	gtkada-1.2.*
 
-pre-configure:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@DATADIRNAME@|share|'
-
 .include <bsd.port.mk>
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 782940456e59..b33e0c475830 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.18.2.tar.bz2) = 6eb60cebdfddd7f9ad302d0b5477382e
-SHA256 (gnome2/zenity-2.18.2.tar.bz2) = 6cef03198402125dfe56591c1db1f6e95075b9e4cb9e5ff3ac8e05ae38008813
-SIZE (gnome2/zenity-2.18.2.tar.bz2) = 1752871
+MD5 (gnome2/zenity-2.20.0.tar.bz2) = 64992cdbb38c9f8ea8cd9ea07c1dfc38
+SHA256 (gnome2/zenity-2.20.0.tar.bz2) = 811a27ef5ed951ceb4874f8d19a5a79a0c9802571822cc342e706839768b2ac1
+SIZE (gnome2/zenity-2.20.0.tar.bz2) = 1787052
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 32293545e64c..8082156fb76f 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -25,6 +25,18 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/bg/zenity.xml
+share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/en_GB/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/en_GB/zenity.xml
 share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/es/figures/zenity-error-screenshot.png
@@ -49,6 +61,18 @@ share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/fr/zenity.xml
+share/gnome/help/zenity/oc/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/oc/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/oc/zenity.xml
 share/gnome/help/zenity/ru/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/ru/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/ru/figures/zenity-error-screenshot.png
@@ -85,28 +109,6 @@ share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/uk/zenity.xml
-share/gnome/omf/zenity/zenity-C.omf
-share/gnome/omf/zenity/zenity-bg.omf
-share/gnome/omf/zenity/zenity-es.omf
-share/gnome/omf/zenity/zenity-fr.omf
-share/gnome/omf/zenity/zenity-ru.omf
-share/gnome/omf/zenity/zenity-sv.omf
-share/gnome/omf/zenity/zenity-uk.omf
-share/gnome/zenity/clothes/gnome-tshirt.png
-share/gnome/zenity/clothes/hawaii-shirt.png
-share/gnome/zenity/clothes/monk.png
-share/gnome/zenity/clothes/sunglasses.png
-share/gnome/zenity/clothes/surfboard.png
-share/gnome/zenity/zenity-calendar.png
-share/gnome/zenity/zenity-entry.png
-share/gnome/zenity/zenity-file.png
-share/gnome/zenity/zenity-list.png
-share/gnome/zenity/zenity-notification.png
-share/gnome/zenity/zenity-progress.png
-share/gnome/zenity/zenity-scale.png
-share/gnome/zenity/zenity-text.png
-share/gnome/zenity/zenity.glade
-share/gnome/zenity/zenity.png
 share/locale/am/LC_MESSAGES/zenity.mo
 share/locale/ar/LC_MESSAGES/zenity.mo
 share/locale/az/LC_MESSAGES/zenity.mo
@@ -157,6 +159,7 @@ share/locale/nb/LC_MESSAGES/zenity.mo
 share/locale/ne/LC_MESSAGES/zenity.mo
 share/locale/nl/LC_MESSAGES/zenity.mo
 share/locale/nn/LC_MESSAGES/zenity.mo
+share/locale/oc/LC_MESSAGES/zenity.mo
 share/locale/or/LC_MESSAGES/zenity.mo
 share/locale/pa/LC_MESSAGES/zenity.mo
 share/locale/pl/LC_MESSAGES/zenity.mo
@@ -181,19 +184,47 @@ share/locale/xh/LC_MESSAGES/zenity.mo
 share/locale/zh_CN/LC_MESSAGES/zenity.mo
 share/locale/zh_HK/LC_MESSAGES/zenity.mo
 share/locale/zh_TW/LC_MESSAGES/zenity.mo
-@dirrm share/gnome/zenity/clothes
-@dirrm share/gnome/zenity
-@dirrm share/gnome/omf/zenity
+share/omf/zenity/zenity-C.omf
+share/omf/zenity/zenity-bg.omf
+share/omf/zenity/zenity-en_GB.omf
+share/omf/zenity/zenity-es.omf
+share/omf/zenity/zenity-fr.omf
+share/omf/zenity/zenity-oc.omf
+share/omf/zenity/zenity-ru.omf
+share/omf/zenity/zenity-sv.omf
+share/omf/zenity/zenity-uk.omf
+%%DATADIR%%/clothes/gnome-tshirt.png
+%%DATADIR%%/clothes/hawaii-shirt.png
+%%DATADIR%%/clothes/monk.png
+%%DATADIR%%/clothes/sunglasses.png
+%%DATADIR%%/clothes/surfboard.png
+%%DATADIR%%/zenity-calendar.png
+%%DATADIR%%/zenity-entry.png
+%%DATADIR%%/zenity-file.png
+%%DATADIR%%/zenity-list.png
+%%DATADIR%%/zenity-notification.png
+%%DATADIR%%/zenity-progress.png
+%%DATADIR%%/zenity-scale.png
+%%DATADIR%%/zenity-text.png
+%%DATADIR%%/zenity.glade
+%%DATADIR%%/zenity.png
+@dirrm %%DATADIR%%/clothes
+@dirrm %%DATADIR%%
+@dirrm share/omf/zenity
 @dirrm share/gnome/help/zenity/uk/figures
 @dirrm share/gnome/help/zenity/uk
 @dirrm share/gnome/help/zenity/sv/figures
 @dirrm share/gnome/help/zenity/sv
 @dirrm share/gnome/help/zenity/ru/figures
 @dirrm share/gnome/help/zenity/ru
+@dirrm share/gnome/help/zenity/oc/figures
+@dirrm share/gnome/help/zenity/oc
 @dirrm share/gnome/help/zenity/fr/figures
 @dirrm share/gnome/help/zenity/fr
 @dirrm share/gnome/help/zenity/es/figures
 @dirrm share/gnome/help/zenity/es
+@dirrm share/gnome/help/zenity/en_GB/figures
+@dirrm share/gnome/help/zenity/en_GB
 @dirrm share/gnome/help/zenity/bg/figures
 @dirrm share/gnome/help/zenity/bg
 @dirrm share/gnome/help/zenity/C/figures
@@ -207,6 +238,8 @@ share/locale/zh_TW/LC_MESSAGES/zenity.mo
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mg/LC_MESSAGES