Update to GNOME 2.2.

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

3 files changed, 51 insertions, 14 deletions

diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index fbac3fb01b4f..ba50055baa69 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.0.6
-PORTREVISION=	2
+PORTVERSION=	2.2.0
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-games/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-games/2.2
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		guile.10:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
@@ -37,8 +36,6 @@ post-patch:
 	@find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|games\.games|games:games|g ; \
-		 s|[(]GCONF_CONFIG_SOURCE[)]|(GCONF_SCHEMA_CONFIG_SOURCE)|g'
-
+		's|games\.games|games:games|g'
 
 .include <bsd.port.mk>
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index 7b08ed8673f0..4b49a8fbb5d0 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.0.6.tar.bz2) = fc6b36ba0d08216a979e8bacbd583532
+MD5 (gnome2/gnome-games-2.2.0.tar.bz2) = 6bcb214c267faa51cfa002b607d87164
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 2dd61e01ef17..4b820549cadc 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -16,6 +16,8 @@ bin/iagno
 bin/mahjongg
 bin/same-gnome
 bin/sol
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/freecell/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/freecell/option/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/freecell/score/%gconf.xml
@@ -27,6 +29,8 @@ etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/freecell/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score/%gconf.xml
@@ -324,6 +328,10 @@ share/gnome/help/gnotravex/C/figures/gnotravex_game.png
 share/gnome/help/gnotravex/C/figures/gnotravex_mainwindow.png
 share/gnome/help/gnotravex/C/gnotravex.xml
 share/gnome/help/gnotravex/C/legal.xml
+share/gnome/help/gnotski/C/figures/gnotski_start_window.png
+share/gnome/help/gnotski/C/figures/gnotski_win.png
+share/gnome/help/gnotski/C/gnotski.xml
+share/gnome/help/gnotski/C/legal.xml
 share/gnome/help/gtali/C/figures/mainwindow.png
 share/gnome/help/gtali/C/figures/preferences.png
 share/gnome/help/gtali/C/gtali.xml
@@ -377,19 +385,35 @@ share/gnome/help/xbill/C/xbill.xml
 share/gnome/mime-info/gnome-stones.keys
 share/gnome/mime-info/gnome-stones.mime
 share/gnome/omf/gnome-games/aisleriot-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gataxx-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/glines-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnect-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnibbles-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnobots2-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnome-stones-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnomine-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gnotravex-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-games/gnotski-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/gtali-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/iagno-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/mahjongg-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/same-gnome-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-games/xbill-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/cards/backs/beige.png
 share/gnome/pixmaps/cards/backs/face.png
 share/gnome/pixmaps/cards/backs/grey.png
@@ -428,6 +452,7 @@ share/gnome/pixmaps/gataxx/flipblend.png
 share/gnome/pixmaps/gataxx/metal.png
 share/gnome/pixmaps/gataxx/metal2.png
 share/gnome/pixmaps/gataxx/shrink.png
+share/gnome/pixmaps/gataxx/sunmoon.png
 share/gnome/pixmaps/gataxx/woodtrim.png
 share/gnome/pixmaps/glines.png
 share/gnome/pixmaps/glines/ball.png
@@ -488,6 +513,7 @@ share/gnome/pixmaps/gnome-stones/frame.png
 share/gnome/pixmaps/gnome-stones/gnome.png
 share/gnome/pixmaps/gnome-stones/title.png
 share/gnome/pixmaps/gnome-stones/wall.png
+share/gnome/pixmaps/gnome-xbill.png
 share/gnome/pixmaps/gnometris/5blocks-tig.png
 share/gnome/pixmaps/gnometris/5blocks-tim.png
 share/gnome/pixmaps/gnometris/5blocks.png
@@ -525,6 +551,7 @@ share/gnome/pixmaps/iagno/flipblend.png
 share/gnome/pixmaps/iagno/metal.png
 share/gnome/pixmaps/iagno/metal2.png
 share/gnome/pixmaps/iagno/shrink.png
+share/gnome/pixmaps/iagno/sunmoon.png
 share/gnome/pixmaps/iagno/woodtrim.png
 share/gnome/pixmaps/mahjongg/bg/bg1.png
 share/gnome/pixmaps/mahjongg/bg/bg2.png
@@ -538,7 +565,6 @@ share/gnome/pixmaps/same-gnome/marbles.png
 share/gnome/pixmaps/same-gnome/planets.png
 share/gnome/pixmaps/same-gnome/rotate.png
 share/gnome/pixmaps/same-gnome/stones.png
-share/gnome/pixmaps/xbill.png
 share/gnome/sol-games/agnes.scm
 share/gnome/sol-games/auld_lang_syne.scm
 share/gnome/sol-games/bakers_dozen.scm
@@ -710,10 +736,8 @@ share/gnome/xbill/pixmaps/suse.xpm
 share/gnome/xbill/pixmaps/toaster.xpm
 share/gnome/xbill/pixmaps/turbolinux.xpm
 share/gnome/xbill/pixmaps/wingdows.xpm
-share/locale/am/LC_MESSAGES/gnome-games.mo
-share/locale/ar/LC_MESSAGES/gnome-games.mo
-share/locale/be/LC_MESSAGES/gnome-games.mo
 share/locale/bg/LC_MESSAGES/gnome-games.mo
+share/locale/be/LC_MESSAGES/gnome-games.mo
 share/locale/ca/LC_MESSAGES/gnome-games.mo
 share/locale/cs/LC_MESSAGES/gnome-games.mo
 share/locale/da/LC_MESSAGES/gnome-games.mo
@@ -727,6 +751,7 @@ share/locale/fi/LC_MESSAGES/gnome-games.mo
 share/locale/fr/LC_MESSAGES/gnome-games.mo
 share/locale/ga/LC_MESSAGES/gnome-games.mo
 share/locale/gl/LC_MESSAGES/gnome-games.mo
+share/locale/he/LC_MESSAGES/gnome-games.mo
 share/locale/hu/LC_MESSAGES/gnome-games.mo
 share/locale/it/LC_MESSAGES/gnome-games.mo
 share/locale/ja/LC_MESSAGES/gnome-games.mo
@@ -768,6 +793,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option
@@ -778,10 +805,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gtali
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris
 @dirrm etc/gconf/gconf.xml.defaults/apps/freecell/score
 @dirrm etc/gconf/gconf.xml.defaults/apps/freecell/option
 @dirrm etc/gconf/gconf.xml.defaults/apps/freecell
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true