Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

4 files changed, 28 insertions, 6 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index f3f9905c93d1..5a83dd5fa647 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnumeric2
-PORTVERSION=	1.1.15
+PORTVERSION=	1.1.16
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.1
@@ -15,10 +15,10 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
-		gal-2-0.2:${PORTSDIR}/x11-toolkits/gal2 \
+LIB_DEPENDS=	gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gal-2.0.0:${PORTSDIR}/x11-toolkits/gal2 \
 		gda-2.1:${PORTSDIR}/databases/libgda2 \
-		gsf-1.7:${PORTSDIR}/devel/libgsf
+		gsf-1.8:${PORTSDIR}/devel/libgsf
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -32,7 +32,7 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--without-guile --with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
-		DEFS="-I${X11BASE}/include/gal-2-0"
+		DEFS="-I${X11BASE}/include/gal-2.0"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 PLIST_SUB=	VERSION=${PORTVERSION}-bonobo
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 7d5b738b18b8..9e4e8cf952f5 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnumeric-1.1.15.tar.bz2) = d41d9beebefc64d28709f3c665d37603
+MD5 (gnome2/gnumeric-1.1.16.tar.bz2) = 6961bbceafa2a7b2355dbb2a43002919
diff --git a/math/gnumeric2/files/patch-po_de.po b/math/gnumeric2/files/patch-po_de.po
new file mode 100644
index 000000000000..437ddbca0403
--- /dev/null
+++ b/math/gnumeric2/files/patch-po_de.po
@@ -0,0 +1,11 @@
+--- po/de.po.orig	Fri Feb  7 01:56:00 2003
++++ po/de.po	Fri Feb  7 02:13:28 2003
+@@ -36,7 +36,7 @@
+ "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
+ "Language-Team: German <gnome-de@gnome.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ #: GNOME_Gnumeric.server.in.in.h:1
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 64dd20257d34..02187948933a 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,4 +1,6 @@
 bin/gnumeric
+etc/gconf/gconf.xml.defaults/apps/gnome-settings/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-settings/gnumeric/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/autocorrect/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/autoformat/%gconf.xml
@@ -25,6 +27,8 @@ etc/gconf/gconf.xml.defaults/apps/gnumeric/plugins/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/printing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/printsetup/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/undo/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/gnumeric/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autocorrect/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autoformat/%gconf.xml
@@ -85,6 +89,8 @@ lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
+lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc
@@ -681,6 +687,7 @@ share/gnome/pixmaps/gnumeric/stock.xpm
 share/gnome/pixmaps/gnumeric/surface.xpm
 share/gnome/pixmaps/gnumeric/top_border
 share/gnome/pixmaps/gnumeric_splash.jpg
+share/locale/am/LC_MESSAGES/gnumeric.mo
 share/locale/bg/LC_MESSAGES/gnumeric.mo
 share/locale/ca/LC_MESSAGES/gnumeric.mo
 share/locale/cs/LC_MESSAGES/gnumeric.mo
@@ -797,6 +804,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autoformat
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autocorrect
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/gnumeric
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/undo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/printsetup
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/printing
@@ -823,4 +832,6 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/autoformat
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/autocorrect
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-settings/gnumeric
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-settings
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnumeric/gnumeric-C.omf 2>/dev/null || /usr/bin/true