Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.32/

This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.

This release features commits by avl, marcus, mezz and myself.

The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:

Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX
Bapt <baptiste.daroussin@gmail.com>
jsa@
miwi@
Sergio de Almeida Lenzi <lenzi.sergio@gmail.com>
Maxim Samsonov <xors@mne.ru>
Kris Moore

And pav@ for 2 exp-runs

PR:		ports/152255
		ports/143260
		ports/141033
		ports/149629
		ports/150350
		ports/151523
With hat:	gnome@

6 files changed, 120 insertions, 24 deletions

diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 5d2c13098eca..e7457a9c87f9 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/math/gcalctool/Makefile,v 1.11 2010/06/23 15:50:52 kwm Exp $
+#   $MCom: ports/math/gcalctool/Makefile,v 1.140 2010/11/15 22:06:10 kwm Exp $
 #
 
 PORTNAME=	gcalctool
-PORTVERSION=	5.30.2
-PORTREVISION=	1
+PORTVERSION=	5.32.1
 PORTEPOCH=	2
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
@@ -17,6 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME 2 calculator tool based on the old calctool for OpenWindows
 
+CONFLICTS=	gcalctool-2.31.*
+
 USE_BZIP2=	yes
 USE_BISON=	build
 USE_GETTEXT=	yes
@@ -27,6 +28,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gcalctool.1
-GCONF_SCHEMAS=	gcalctool.schemas
+GLIB_SCHEMAS=	org.gnome.gcalctool.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 76eb245b3106..1b7eb1df4cef 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gcalctool-5.30.2.tar.bz2) = 9357de6835da305ee4f0ebad509b509a
-SHA256 (gnome2/gcalctool-5.30.2.tar.bz2) = 214580306a0029d8247b79e3e710a40328b9e022f8fcee1cd448c5d2467d8c4b
-SIZE (gnome2/gcalctool-5.30.2.tar.bz2) = 1126899
+SHA256 (gnome2/gcalctool-5.32.1.tar.bz2) = 3938913d22876fc7acaa18b9b5b15fd110d6cb63bfa6d2079a2b1341e28564f4
+SIZE (gnome2/gcalctool-5.32.1.tar.bz2) = 1260032
diff --git a/math/gcalctool/files/patch-configure b/math/gcalctool/files/patch-configure
new file mode 100644
index 000000000000..330200143e4a
--- /dev/null
+++ b/math/gcalctool/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	2010-08-17 10:19:07.000000000 +0200
++++ configure	2010-08-17 10:21:04.000000000 +0200
+@@ -5741,8 +5741,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+ 
+ gsettings__base_list = \
+-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++  sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++  sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+ 
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ 	@$(NORMAL_INSTALL)
diff --git a/math/gcalctool/files/patch-po__zh_CN.po b/math/gcalctool/files/patch-po__zh_CN.po
deleted file mode 100644
index 5d874eb0cab9..000000000000
--- a/math/gcalctool/files/patch-po__zh_CN.po
+++ /dev/null
@@ -1,14 +0,0 @@
-
---- po/zh_CN.po.old	2010-10-02 02:25:46.507328082 +0800
-+++ po/zh_CN.po	2010-10-02 02:27:12.744004376 +0800
-@@ -1028,7 +1028,7 @@
- #. Translators: Digits localized for the given language
- #: ../src/calctool.c:175
- msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
--msgstr "零,一,二,三,四,五,六,七,八,九,十,A,B,C,D,E,F"
-+msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
- 
- #: ../src/currency.h:18
- msgid "Australian dollar"
-
-
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index f9f618bfdd12..344ee94c5bb5 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -2,8 +2,11 @@ bin/gcalccmd
 bin/gcalctool
 bin/gnome-calculator
 share/applications/gcalctool.desktop
-%%DATADIR%%/gcalctool.ui
-%%DATADIR%%/financial.ui
+%%DATADIR%%/buttons-advanced.ui
+%%DATADIR%%/buttons-basic.ui
+%%DATADIR%%/buttons-financial.ui
+%%DATADIR%%/buttons-programming.ui
+%%DATADIR%%/preferences.ui
 share/gnome/help/gcalctool/C/absolute.page
 share/gnome/help/gcalctool/C/base.page
 share/gnome/help/gcalctool/C/boolean.page
@@ -228,6 +231,34 @@ share/gnome/help/gcalctool/eu/scientific.page
 share/gnome/help/gcalctool/eu/superscript.page
 share/gnome/help/gcalctool/eu/trigonometry.page
 share/gnome/help/gcalctool/eu/variables.page
+share/gnome/help/gcalctool/fi/absolute.page
+share/gnome/help/gcalctool/fi/base.page
+share/gnome/help/gcalctool/fi/boolean.page
+share/gnome/help/gcalctool/fi/complex.page
+share/gnome/help/gcalctool/fi/conv-base.page
+share/gnome/help/gcalctool/fi/conv-character.page
+share/gnome/help/gcalctool/fi/conv-currency.page
+share/gnome/help/gcalctool/fi/conv-length.page
+share/gnome/help/gcalctool/fi/conv-time.page
+share/gnome/help/gcalctool/fi/conv-weight.page
+share/gnome/help/gcalctool/fi/equation.page
+share/gnome/help/gcalctool/fi/factorial.page
+share/gnome/help/gcalctool/fi/factorize.page
+share/gnome/help/gcalctool/fi/financial.page
+share/gnome/help/gcalctool/fi/functions.page
+share/gnome/help/gcalctool/fi/index.page
+share/gnome/help/gcalctool/fi/keyboard.page
+share/gnome/help/gcalctool/fi/legal.xml
+share/gnome/help/gcalctool/fi/logarithm.page
+share/gnome/help/gcalctool/fi/modulus.page
+share/gnome/help/gcalctool/fi/mouse.page
+share/gnome/help/gcalctool/fi/number-display.page
+share/gnome/help/gcalctool/fi/percentage.page
+share/gnome/help/gcalctool/fi/power.page
+share/gnome/help/gcalctool/fi/scientific.page
+share/gnome/help/gcalctool/fi/superscript.page
+share/gnome/help/gcalctool/fi/trigonometry.page
+share/gnome/help/gcalctool/fi/variables.page
 share/gnome/help/gcalctool/fr/absolute.page
 share/gnome/help/gcalctool/fr/base.page
 share/gnome/help/gcalctool/fr/boolean.page
@@ -256,6 +287,62 @@ share/gnome/help/gcalctool/fr/scientific.page
 share/gnome/help/gcalctool/fr/superscript.page
 share/gnome/help/gcalctool/fr/trigonometry.page
 share/gnome/help/gcalctool/fr/variables.page
+share/gnome/help/gcalctool/gl/absolute.page
+share/gnome/help/gcalctool/gl/base.page
+share/gnome/help/gcalctool/gl/boolean.page
+share/gnome/help/gcalctool/gl/complex.page
+share/gnome/help/gcalctool/gl/conv-base.page
+share/gnome/help/gcalctool/gl/conv-character.page
+share/gnome/help/gcalctool/gl/conv-currency.page
+share/gnome/help/gcalctool/gl/conv-length.page
+share/gnome/help/gcalctool/gl/conv-time.page
+share/gnome/help/gcalctool/gl/conv-weight.page
+share/gnome/help/gcalctool/gl/equation.page
+share/gnome/help/gcalctool/gl/factorial.page
+share/gnome/help/gcalctool/gl/factorize.page
+share/gnome/help/gcalctool/gl/financial.page
+share/gnome/help/gcalctool/gl/functions.page
+share/gnome/help/gcalctool/gl/index.page
+share/gnome/help/gcalctool/gl/keyboard.page
+share/gnome/help/gcalctool/gl/legal.xml
+share/gnome/help/gcalctool/gl/logarithm.page
+share/gnome/help/gcalctool/gl/modulus.page
+share/gnome/help/gcalctool/gl/mouse.page
+share/gnome/help/gcalctool/gl/number-display.page
+share/gnome/help/gcalctool/gl/percentage.page
+share/gnome/help/gcalctool/gl/power.page
+share/gnome/help/gcalctool/gl/scientific.page
+share/gnome/help/gcalctool/gl/superscript.page
+share/gnome/help/gcalctool/gl/trigonometry.page
+share/gnome/help/gcalctool/gl/variables.page
+share/gnome/help/gcalctool/hu/absolute.page
+share/gnome/help/gcalctool/hu/base.page
+share/gnome/help/gcalctool/hu/boolean.page
+share/gnome/help/gcalctool/hu/complex.page
+share/gnome/help/gcalctool/hu/conv-base.page
+share/gnome/help/gcalctool/hu/conv-character.page
+share/gnome/help/gcalctool/hu/conv-currency.page
+share/gnome/help/gcalctool/hu/conv-length.page
+share/gnome/help/gcalctool/hu/conv-time.page
+share/gnome/help/gcalctool/hu/conv-weight.page
+share/gnome/help/gcalctool/hu/equation.page
+share/gnome/help/gcalctool/hu/factorial.page
+share/gnome/help/gcalctool/hu/factorize.page
+share/gnome/help/gcalctool/hu/financial.page
+share/gnome/help/gcalctool/hu/functions.page
+share/gnome/help/gcalctool/hu/index.page
+share/gnome/help/gcalctool/hu/keyboard.page
+share/gnome/help/gcalctool/hu/legal.xml
+share/gnome/help/gcalctool/hu/logarithm.page
+share/gnome/help/gcalctool/hu/modulus.page
+share/gnome/help/gcalctool/hu/mouse.page
+share/gnome/help/gcalctool/hu/number-display.page
+share/gnome/help/gcalctool/hu/percentage.page
+share/gnome/help/gcalctool/hu/power.page
+share/gnome/help/gcalctool/hu/scientific.page
+share/gnome/help/gcalctool/hu/superscript.page
+share/gnome/help/gcalctool/hu/trigonometry.page
+share/gnome/help/gcalctool/hu/variables.page
 share/gnome/help/gcalctool/it/absolute.page
 share/gnome/help/gcalctool/it/base.page
 share/gnome/help/gcalctool/it/boolean.page
@@ -560,6 +647,7 @@ share/locale/en@shaw/LC_MESSAGES/gcalctool.mo
 share/locale/en_CA/LC_MESSAGES/gcalctool.mo
 share/locale/en_GB/LC_MESSAGES/gcalctool.mo
 share/locale/en_US/LC_MESSAGES/gcalctool.mo
+share/locale/eo/LC_MESSAGES/gcalctool.mo
 share/locale/es/LC_MESSAGES/gcalctool.mo
 share/locale/et/LC_MESSAGES/gcalctool.mo
 share/locale/eu/LC_MESSAGES/gcalctool.mo
@@ -573,10 +661,12 @@ share/locale/he/LC_MESSAGES/gcalctool.mo
 share/locale/hi/LC_MESSAGES/gcalctool.mo
 share/locale/hr/LC_MESSAGES/gcalctool.mo
 share/locale/hu/LC_MESSAGES/gcalctool.mo
+share/locale/hy/LC_MESSAGES/gcalctool.mo
 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/kk/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
@@ -630,7 +720,10 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrm share/gnome/help/gcalctool/ko
 @dirrm share/gnome/help/gcalctool/ja
 @dirrm share/gnome/help/gcalctool/it
+@dirrm share/gnome/help/gcalctool/hu
+@dirrm share/gnome/help/gcalctool/gl
 @dirrm share/gnome/help/gcalctool/fr
+@dirrm share/gnome/help/gcalctool/fi
 @dirrm share/gnome/help/gcalctool/eu
 @dirrm share/gnome/help/gcalctool/es
 @dirrm share/gnome/help/gcalctool/el
@@ -664,6 +757,10 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
 @dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 66c4d3f76493..0f9765188dbe 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pspp
 PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	GNU