Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

4 files changed, 79 insertions, 14 deletions

diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 8e3f85bd910d..101c9a7fc002 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	zenity
-PORTVERSION=	1.8
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
-DIST_SUBDIR=	gnome2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+DIST_SUBDIR=    gnome2
 
 MAINTAINER=	klammer@webonaut.com
 COMMENT=	Display GNOME dialogs from the command line
@@ -33,8 +32,6 @@ MAN1=		zenity.1
 
 CONFLICTS=	gtkada-1.2.*
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-
 pre-configure:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|@DATADIRNAME@|share|'
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 23099319f87d..e799a4fb343f 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/zenity-1.8.tar.bz2) = 28dc31137f8eb983a26b198b3d93e2d4
-SIZE (gnome2/zenity-1.8.tar.bz2) = 440948
+MD5 (gnome2/zenity-2.6.0.tar.bz2) = 4799af349c692f6a421d751711a81331
+SIZE (gnome2/zenity-2.6.0.tar.bz2) = 611617
diff --git a/x11/zenity/pkg-descr b/x11/zenity/pkg-descr
index 34a2188c0603..384c19680d45 100644
--- a/x11/zenity/pkg-descr
+++ b/x11/zenity/pkg-descr
@@ -1,4 +1,3 @@
-This is zenity - a rewrite of gdialog, the GNOME port of dialog
-which allows you to display dialog boxes from the commandline
-and shell scripts. If you understand, things are just as they 
-are. If you don't understand, things are just as they are.
+Zenity allows dialog boxes to be created and displayed from the
+commandline.  This provides a simple way to create a GUI for
+a shell script.
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index b6d62fb390ac..7f585be8ab44 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -1,7 +1,5 @@
 bin/gdialog
 bin/zenity
-share/gnome/omf/zenity/zenity-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/help/zenity/C/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-error-screenshot.png
@@ -14,6 +12,22 @@ share/gnome/help/zenity/C/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/C/legal.xml
 share/gnome/help/zenity/C/zenity.xml
+share/gnome/help/zenity/sr/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/sr/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/sr/legal.xml
+share/gnome/help/zenity/sr/zenity.xml
+share/gnome/omf/zenity/zenity-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/zenity/zenity-sr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true
 share/gnome/zenity/clothes/gnome-tshirt.png
 share/gnome/zenity/clothes/hawaii-shirt.png
 share/gnome/zenity/clothes/monk.png
@@ -27,10 +41,65 @@ share/gnome/zenity/zenity-progress.png
 share/gnome/zenity/zenity-text.png
 share/gnome/zenity/zenity.glade
 share/gnome/zenity/zenity.png
+share/locale/am/LC_MESSAGES/zenity-0.1.mo
+share/locale/ar/LC_MESSAGES/zenity-0.1.mo
+share/locale/az/LC_MESSAGES/zenity-0.1.mo
+share/locale/be/LC_MESSAGES/zenity-0.1.mo
+share/locale/bn/LC_MESSAGES/zenity-0.1.mo
+share/locale/ca/LC_MESSAGES/zenity-0.1.mo
+share/locale/cs/LC_MESSAGES/zenity-0.1.mo
+share/locale/cy/LC_MESSAGES/zenity-0.1.mo
+share/locale/da/LC_MESSAGES/zenity-0.1.mo
+share/locale/de/LC_MESSAGES/zenity-0.1.mo
+share/locale/el/LC_MESSAGES/zenity-0.1.mo
+share/locale/en_GB/LC_MESSAGES/zenity-0.1.mo
+share/locale/es/LC_MESSAGES/zenity-0.1.mo
+share/locale/et/LC_MESSAGES/zenity-0.1.mo
+share/locale/eu/LC_MESSAGES/zenity-0.1.mo
+share/locale/fa/LC_MESSAGES/zenity-0.1.mo
+share/locale/fi/LC_MESSAGES/zenity-0.1.mo
+share/locale/fr/LC_MESSAGES/zenity-0.1.mo
+share/locale/ga/LC_MESSAGES/zenity-0.1.mo
+share/locale/hi/LC_MESSAGES/zenity-0.1.mo
+share/locale/hr/LC_MESSAGES/zenity-0.1.mo
+share/locale/hu/LC_MESSAGES/zenity-0.1.mo
+share/locale/is/LC_MESSAGES/zenity-0.1.mo
+share/locale/it/LC_MESSAGES/zenity-0.1.mo
+share/locale/ja/LC_MESSAGES/zenity-0.1.mo
+share/locale/ko/LC_MESSAGES/zenity-0.1.mo
+share/locale/lt/LC_MESSAGES/zenity-0.1.mo
+share/locale/ml/LC_MESSAGES/zenity-0.1.mo
+share/locale/mn/LC_MESSAGES/zenity-0.1.mo
+share/locale/ms/LC_MESSAGES/zenity-0.1.mo
+share/locale/ne/LC_MESSAGES/zenity-0.1.mo
+share/locale/nl/LC_MESSAGES/zenity-0.1.mo
+share/locale/nn/LC_MESSAGES/zenity-0.1.mo
+share/locale/no/LC_MESSAGES/zenity-0.1.mo
+share/locale/pa/LC_MESSAGES/zenity-0.1.mo
+share/locale/pl/LC_MESSAGES/zenity-0.1.mo
+share/locale/pt/LC_MESSAGES/zenity-0.1.mo
+share/locale/pt_BR/LC_MESSAGES/zenity-0.1.mo
+share/locale/ro/LC_MESSAGES/zenity-0.1.mo
+share/locale/ru/LC_MESSAGES/zenity-0.1.mo
+share/locale/sk/LC_MESSAGES/zenity-0.1.mo
+share/locale/sl/LC_MESSAGES/zenity-0.1.mo
+share/locale/sq/LC_MESSAGES/zenity-0.1.mo
+share/locale/sr/LC_MESSAGES/zenity-0.1.mo
+share/locale/sr@Latn/LC_MESSAGES/zenity-0.1.mo
+share/locale/sv/LC_MESSAGES/zenity-0.1.mo
+share/locale/ta/LC_MESSAGES/zenity-0.1.mo
+share/locale/th/LC_MESSAGES/zenity-0.1.mo
+share/locale/uk/LC_MESSAGES/zenity-0.1.mo
+share/locale/vi/LC_MESSAGES/zenity-0.1.mo
+share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo
+share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo
 @dirrm share/gnome/omf/zenity
 @dirrm share/gnome/help/zenity/C/figures
 @dirrm share/gnome/help/zenity/C
+@dirrm share/gnome/help/zenity/sr/figures
+@dirrm share/gnome/help/zenity/sr
 @dirrm share/gnome/help/zenity
 @dirrm share/gnome/zenity/clothes
 @dirrm share/gnome/zenity
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true