Update to GNOME 2.2.

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

4 files changed, 24 insertions, 15 deletions

diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index eb188df43d13..ac31ed4041af 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	mergeant
-PORTVERSION=	0.9.0
+PORTVERSION=	0.10.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	gnomedb-2.1:${PORTSDIR}/databases/libgnomedb \
-		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index dd339327b3d9..f65e8c1f64af 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1 +1 @@
-MD5 (gnome2/mergeant-0.9.0.tar.bz2) = 4f821d296ac4d53ca7111242b70455ab
+MD5 (gnome2/mergeant-0.10.0.tar.bz2) = 2e8b98332288d07a5e1cbdfd0a828f2f
diff --git a/databases/mergeant/files/patch-configure b/databases/mergeant/files/patch-configure
index d718517b75ab..522cb695567f 100644
--- a/databases/mergeant/files/patch-configure
+++ b/databases/mergeant/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Sep  9 17:46:33 2002
-+++ configure	Sun Sep 15 02:43:36 2002
-@@ -7596,6 +7596,7 @@
+--- configure.orig	Mon Jan 27 20:50:17 2003
++++ configure	Fri Feb  7 01:02:04 2003
+@@ -7948,6 +7948,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10065,13 +10066,13 @@
+@@ -9405,13 +9406,13 @@
  
  MERGEANT_Pixmapdir=${datadir}/pixmaps/${PACKAGE}
  
@@ -19,8 +19,8 @@
  
  MERGEANT_Plugdir=${datadir}/${PACKAGE}/plugins
  
--MERGEANT_Helpdir=${datadir}/doc/${PACKAGE}
-+MERGEANT_Helpdir=${prefix}/share/doc/${PACKAGE}
+-MERGEANT_Helpdir=${datadir}/gnome/help/${PACKAGE}
++MERGEANT_Helpdir=${datadir}/help/${PACKAGE}
  
  
  
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index ac52b84072cd..dea19a0e9515 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -1,12 +1,16 @@
 bin/mergeant
-share/doc/mergeant/C/topic.dat
+share/gnome/application-registry/mergeant.applications
 share/gnome/applications/mergeant.desktop
+share/gnome/help/mergeant/C/topic.dat
 share/gnome/mergeant/dtd/mergeant.dtd
 share/gnome/mergeant/plugins/libPnetaddr.so
 share/gnome/mergeant/plugins/libPpicts.so
 share/gnome/mergeant/plugins/libPsample.so
+share/gnome/mime-info/mergeant.keys
+share/gnome/mime-info/mergeant.mime
 share/gnome/omf/mergeant/mergeant-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/mergeant/mergeant-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png
 share/gnome/pixmaps/mergeant/mergeant.png
 share/gnome/pixmaps/mergeant/mergeant_connect.png
 share/gnome/pixmaps/mergeant/mergeant_connect_small.png
@@ -19,6 +23,9 @@ share/gnome/pixmaps/mergeant/mergeant_rels.png
 share/gnome/pixmaps/mergeant/mergeant_rels_small.png
 share/gnome/pixmaps/mergeant/mergeant_sequences.png
 share/gnome/pixmaps/mergeant/mergeant_tables.png
+share/gnome/pixmaps/mergeant/query-view-query_16x16.png
+share/gnome/pixmaps/mergeant/query-view-table_16x16.png
+share/gnome/pixmaps/mergeant/query-view-view_16x16.png
 share/locale/cs/LC_MESSAGES/mergeant.mo
 share/locale/da/LC_MESSAGES/mergeant.mo
 share/locale/de/LC_MESSAGES/mergeant.mo
@@ -26,6 +33,8 @@ share/locale/es/LC_MESSAGES/mergeant.mo
 share/locale/fr/LC_MESSAGES/mergeant.mo
 share/locale/it/LC_MESSAGES/mergeant.mo
 share/locale/ms/LC_MESSAGES/mergeant.mo
+share/locale/nl/LC_MESSAGES/mergeant.mo
+share/locale/no/LC_MESSAGES/mergeant.mo
 share/locale/pl/LC_MESSAGES/mergeant.mo
 share/locale/pt_BR/LC_MESSAGES/mergeant.mo
 share/locale/ru/LC_MESSAGES/mergeant.mo
@@ -38,8 +47,8 @@ share/locale/vi/LC_MESSAGES/mergeant.mo
 @dirrm share/gnome/mergeant/plugins
 @dirrm share/gnome/mergeant/dtd
 @dirrm share/gnome/mergeant
-@dirrm share/doc/mergeant/C/stylesheet-images
-@dirrm share/doc/mergeant/C/images
-@dirrm share/doc/mergeant/C
-@dirrm share/doc/mergeant
+@dirrm share/gnome/help/mergeant/C/stylesheet-images
+@dirrm share/gnome/help/mergeant/C/images
+@dirrm share/gnome/help/mergeant/C
+@dirrm share/gnome/help/mergeant
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/mergeant/mergeant-C.omf 2>/dev/null || /usr/bin/true