The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

5 files changed, 32 insertions, 11 deletions

diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index d96b2299ae54..0f83b14b0bd8 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gcalctool/Makefile,v 1.82 2007/10/17 21:36:12 mezz Exp $
+#   $MCom: ports/math/gcalctool/Makefile,v 1.92 2008/03/10 15:55:04 ahze Exp $
 #
 
 PORTNAME=	gcalctool
-PORTVERSION=	5.20.2
-PORTREVISION=	1
+PORTVERSION=	5.22.0
 PORTEPOCH=	2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -25,7 +24,7 @@ USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils
+USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils libglade2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 215b552f6d76..a54547b6767a 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gcalctool-5.20.2.tar.bz2) = bcde10b8029d3a513183e8aac9506c1f
-SHA256 (gnome2/gcalctool-5.20.2.tar.bz2) = b871c8b7fa2c4afa78b6a1708cffe04ae389ee20ff34e5fb2ddb4b78071edacd
-SIZE (gnome2/gcalctool-5.20.2.tar.bz2) = 1343757
+MD5 (gnome2/gcalctool-5.22.0.tar.bz2) = 037ef812fe5562b4dda55b9eea82b77b
+SHA256 (gnome2/gcalctool-5.22.0.tar.bz2) = c9f675c14fdbaf1a2f61f3d457e3a941ae5257b111509ae73579325f7d010afb
+SIZE (gnome2/gcalctool-5.22.0.tar.bz2) = 1550068
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index c0964e2f6542..cbb7c6d2b0b9 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -1,6 +1,8 @@
 bin/gcalctool
 bin/gnome-calculator
 share/applications/gcalctool.desktop
+%%DATADIR%%/gcalctool.glade
+share/gnome/help/gcalctool/C/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png
@@ -14,48 +16,55 @@ share/gnome/help/gcalctool/bg/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/bg/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/bg/gcalctool.xml
 share/gnome/help/gcalctool/bg/legal.xml
+share/gnome/help/gcalctool/de/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/de/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/de/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/de/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/de/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/de/gcalctool.xml
+share/gnome/help/gcalctool/es/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/es/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/es/gcalctool.xml
+share/gnome/help/gcalctool/fr/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/fr/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/fr/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/fr/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/fr/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/fr/gcalctool.xml
+share/gnome/help/gcalctool/it/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/it/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/it/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/it/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/it/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/it/gcalctool.xml
-share/gnome/help/gcalctool/it/legal.xml
 share/gnome/help/gcalctool/ja/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/ja/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/ja/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/ja/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ja/gcalctool.xml
 share/gnome/help/gcalctool/ja/legal.xml
+share/gnome/help/gcalctool/ko/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ko/gcalctool.xml
+share/gnome/help/gcalctool/oc/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/oc/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/oc/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/oc/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/oc/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/oc/gcalctool.xml
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/pt_BR/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/pt_BR/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/pt_BR/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/pt_BR/gcalctool.xml
+share/gnome/help/gcalctool/sv/figures/gcalctool_advanced_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png
@@ -79,10 +88,13 @@ share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/zh_TW/gcalctool.xml
 share/gnome/help/gcalctool/zh_TW/legal.xml
+share/locale/af/LC_MESSAGES/gcalctool.mo
 share/locale/am/LC_MESSAGES/gcalctool.mo
 share/locale/ar/LC_MESSAGES/gcalctool.mo
+share/locale/as/LC_MESSAGES/gcalctool.mo
 share/locale/az/LC_MESSAGES/gcalctool.mo
 share/locale/be/LC_MESSAGES/gcalctool.mo
+share/locale/be@latin/LC_MESSAGES/gcalctool.mo
 share/locale/bg/LC_MESSAGES/gcalctool.mo
 share/locale/bn/LC_MESSAGES/gcalctool.mo
 share/locale/bn_IN/LC_MESSAGES/gcalctool.mo
@@ -114,6 +126,7 @@ share/locale/id/LC_MESSAGES/gcalctool.mo
 share/locale/it/LC_MESSAGES/gcalctool.mo
 share/locale/ja/LC_MESSAGES/gcalctool.mo
 share/locale/ka/LC_MESSAGES/gcalctool.mo
+share/locale/kn/LC_MESSAGES/gcalctool.mo
 share/locale/ko/LC_MESSAGES/gcalctool.mo
 share/locale/ku/LC_MESSAGES/gcalctool.mo
 share/locale/lt/LC_MESSAGES/gcalctool.mo
@@ -127,6 +140,7 @@ share/locale/ms/LC_MESSAGES/gcalctool.mo
 share/locale/nb/LC_MESSAGES/gcalctool.mo
 share/locale/ne/LC_MESSAGES/gcalctool.mo
 share/locale/nl/LC_MESSAGES/gcalctool.mo
+share/locale/nn/LC_MESSAGES/gcalctool.mo
 share/locale/oc/LC_MESSAGES/gcalctool.mo
 share/locale/or/LC_MESSAGES/gcalctool.mo
 share/locale/pa/LC_MESSAGES/gcalctool.mo
@@ -198,6 +212,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf
 @dirrm share/gnome/help/gcalctool/C/figures
 @dirrm share/gnome/help/gcalctool/C
 @dirrm share/gnome/help/gcalctool
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -222,4 +238,7 @@ share/omf/gcalctool/gcalctool-zh_TW.omf
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index d9ccdeefbce9..0785e8642d3f 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gnumeric/Makefile,v 1.39 2007/09/16 21:42:03 marcus Exp $
+#   $MCom: ports/math/gnumeric/Makefile,v 1.42 2008/03/11 12:45:31 ahze Exp $
 #
 
 PORTNAME=	gnumeric
@@ -60,6 +60,9 @@ post-extract:
 
 post-patch:
 	@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
+	@${REINPLACE_CMD} -e 's|gda-3.0 >= 3.1.1|gda-3.0 >= 3.0.1|g' \
+		-e 's|gnomedb-3.0 >= 3.0.1|gnomedb-3.0 >= 3.0.0|g' \
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/applications
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 953d7bb4d988..dd8c2595dc48 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -938,6 +938,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm include/libspreadsheet-1.8/spreadsheet
 @dirrm include/libspreadsheet-1.8
 @unexec update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -948,4 +949,3 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/applications