Say hello to GNOME 1.2

	audio/gnomemedia		1.2.0
	deskutils/gnomepim		1.2.0
	devel/bugbuddy			1.0
	devel/glade			0.5.9
	devel/libgtop			1.0.9
	games/gnomegames		1.2.0
	graphics/imlib			1.9.8.1
	misc/gnomeusersguide		1.2
	misc/gnomeutils			1.2.0
	sysutils/gnomecontrolcenter	1.2.0
	sysutils/gtop			1.0.8
	x11-fm/gmomemc			4.5.50
	x11/gnomecore			1.2.0
	x11/gnomelibs			1.2.1

Along with cosmetic changes to other parts of the metaport
for the new shared library version numbers.

Plus.  The metaport has been reworked to bring in a few more
often-requested items.

Please note that you absolutely need GTK/GLIB 1.2.8 or higher
for this release.

4 files changed, 144 insertions, 13 deletions

diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index d90a50c052ea..73d2d6cb6711 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomegames
-PORTVERSION=	1.0.51
+PORTVERSION=	1.2.0
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-games
@@ -14,8 +14,7 @@ DISTNAME=	gnome-games-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -23,8 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index f7a4a06afa65..7c72f3010138 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome-games-1.0.51.tar.gz) = 81c3a9c749d8574e3fbc6cc8e3c195f9
+MD5 (gnome-games-1.2.0.tar.gz) = 681f8c880daa8e4e4a264039e6e8cb3c
diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab
index b36831ec5ecb..9b356b08e058 100644
--- a/games/gnomegames2/files/patch-ab
+++ b/games/gnomegames2/files/patch-ab
@@ -123,6 +123,13 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
+--- gnobots2/help/da/Makefile.in.orig	Sun May 21 23:51:03 2000
++++ gnobots2/help/da/Makefile.in	Tue May 30 17:11:59 2000
+@@ -131,3 +131,3 @@
+ 
+-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/da
++gnobots2_helpdir = $(datadir)/help/gnobots2/da
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- gnobots2/help/es/Makefile.in.orig	Sun Sep 26 13:29:04 1999
 +++ gnobots2/help/es/Makefile.in	Mon Sep 27 09:34:44 1999
 @@ -128,7 +128,7 @@
@@ -198,15 +205,16 @@
  libgnomekoban_la_LIBADD = 
  libgnomekoban_la_OBJECTS =  gnomekoban.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- gnometris/Makefile.in.orig	Sun Sep 26 13:29:31 1999
-+++ gnometris/Makefile.in	Mon Sep 27 09:36:59 1999
-@@ -127,9 +127,9 @@
+--- gnometris/Makefile.in.orig	Sun May 21 23:51:13 2000
++++ gnometris/Makefile.in	Tue May 30 16:14:41 2000
+@@ -127,10 +127,10 @@
  
  SUBDIRS = pix
  scoredir = $(localstatedir)/games
 -Gamesdir = $(datadir)/gnome/apps/Games
 +Gamesdir = $(datadir)/apps/Games
  
+ CPPFLAGS = -pedantic -Wall
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	$(GNOME_INCLUDEDIR)
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	$(GNOME_INCLUDEDIR)
  
@@ -222,7 +230,7 @@
 +Gamesdir = $(datadir)/apps/Games
  
 -INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
  
  
  bin_PROGRAMS = gnomine
@@ -240,6 +248,20 @@
  
  
  bin_PROGRAMS = gnotravex
+--- gnotski/Makefile.in.orig	Sun May 21 23:51:10 2000
++++ gnotski/Makefile.in	Tue May 30 16:46:09 2000
+@@ -128,9 +128,9 @@
+ 
+ scoredir = $(localstatedir)/games
+ pixmapdir = $(datadir)/pixmaps/gnotski
+-Gamesdir = $(datadir)/gnome/apps/Games
++Gamesdir = $(datadir)/apps/Games
+ 
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ 
+ bin_PROGRAMS = gnotski
 --- gtali/Makefile.in.orig	Sun Sep 26 13:28:57 1999
 +++ gtali/Makefile.in	Mon Sep 27 09:44:54 1999
 @@ -125,12 +125,12 @@
@@ -268,6 +290,13 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
+--- gtali/help/da/Makefile.in.orig	Sun May 21 23:50:59 2000
++++ gtali/help/da/Makefile.in	Tue May 30 17:12:32 2000
+@@ -131,3 +131,3 @@
+ 
+-gtali_helpdir = $(datadir)/gnome/help/gtali/da
++gtali_helpdir = $(datadir)/help/gtali/da
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- gturing/Makefile.in.orig	Sun Sep 26 13:28:54 1999
 +++ gturing/Makefile.in	Mon Sep 27 09:37:08 1999
 @@ -125,12 +125,12 @@
@@ -312,6 +341,13 @@
  
  
  bin_PROGRAMS = iagno
+--- iagno/help/C/Makefile.in.orig	Sun May 21 23:51:06 2000
++++ iagno/help/C/Makefile.in	Tue May 30 17:13:41 2000
+@@ -128,3 +128,3 @@
+ 
+-iagno_helpdir = $(datadir)/gnome/help/iagno/C
++iagno_helpdir = $(datadir)/help/iagno/C
+ 
 --- mahjongg/Makefile.in.orig	Sun Sep 26 13:28:53 1999
 +++ mahjongg/Makefile.in	Mon Sep 27 09:46:10 1999
 @@ -128,10 +128,10 @@
@@ -353,6 +389,13 @@
 +same_gnome_helpdir = $(datadir)/help/samegnome/C
  
  same_gnome_help_DATA =  	index.html			topic.dat
+
+--- same-gnome/help/ru/Makefile.in.orig	Sun May 21 23:50:51 2000
++++ same-gnome/help/ru/Makefile.in	Tue May 30 17:13:02 2000
+@@ -128,3 +128,3 @@
+ 
+-same_gnome_helpdir = $(datadir)/gnome/help/samegnome/ru
++same_gnome_helpdir = $(datadir)/help/samegnome/ru
  
 --- scottfree/Makefile.in.orig	Sun Sep 26 13:28:52 1999
 +++ scottfree/Makefile.in	Mon Sep 27 09:52:29 1999
@@ -365,9 +408,18 @@
  
  
  bin_PROGRAMS = GnomeScott
---- xbill/Makefile.in.orig	Sun Sep 26 13:29:33 1999
-+++ xbill/Makefile.in	Mon Sep 27 09:53:11 1999
-@@ -143,7 +143,7 @@
+--- xbill/Makefile.in.orig	Sun May 21 23:51:14 2000
++++ xbill/Makefile.in	Tue May 30 16:30:13 2000
+@@ -131,7 +131,7 @@
+ # This is where the high score file goes ...
+ scoredir = $(localstatedir)/games
+ 
+-INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALDIR=\""$(datadir)/local"\"
++INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
+ bin_PROGRAMS = gnome-xbill
+ 
+ gnome_xbill_SOURCES = Bucket.cc Bucket.h Cable.cc Cable.h Computer.cc                       Computer.h Game.cc Game.h Horde.cc Horde.h Library.cc                       Library.h MCursor.cc MCursor.h Monster.cc Monster.h                       Network.cc Network.h Picture.cc Picture.h Spark.cc                       Spark.h Strings.h UI.cc UI.h objects.h x11-gtk.cc x11.h
+@@ -144,7 +144,7 @@
  pixmapdir = $(datadir)/pixmaps
  pixmap_DATA = xbill.png
  
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 4af7937c6669..90ffe83ebb06 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -10,6 +10,7 @@ bin/gnome-xbill
 bin/gnometris
 bin/gnomine
 bin/gnotravex
+bin/gnotski
 bin/gtali
 bin/gturing
 bin/iagno
@@ -35,6 +36,7 @@ share/gnome/apps/Games/gnome-stones.desktop
 share/gnome/apps/Games/gnometris.desktop
 share/gnome/apps/Games/gnomine.desktop
 share/gnome/apps/Games/gnotravex.desktop
+share/gnome/apps/Games/gnotski.desktop
 share/gnome/apps/Games/gtali.desktop
 share/gnome/apps/Games/gturing.desktop
 share/gnome/apps/Games/iagno.desktop
@@ -73,6 +75,26 @@ share/gnome/games/gnotravex.3x3.scores
 share/gnome/games/gnotravex.4x4.scores
 share/gnome/games/gnotravex.5x5.scores
 share/gnome/games/gnotravex.6x6.scores
+share/gnome/games/gnotski.1.scores
+share/gnome/games/gnotski.11.scores
+share/gnome/games/gnotski.12.scores
+share/gnome/games/gnotski.13.scores
+share/gnome/games/gnotski.14.scores
+share/gnome/games/gnotski.15.scores
+share/gnome/games/gnotski.16.scores
+share/gnome/games/gnotski.17.scores
+share/gnome/games/gnotski.2.scores
+share/gnome/games/gnotski.21.scores
+share/gnome/games/gnotski.22.scores
+share/gnome/games/gnotski.23.scores
+share/gnome/games/gnotski.24.scores
+share/gnome/games/gnotski.25.scores
+share/gnome/games/gnotski.26.scores
+share/gnome/games/gnotski.3.scores
+share/gnome/games/gnotski.4.scores
+share/gnome/games/gnotski.5.scores
+share/gnome/games/gnotski.6.scores
+share/gnome/games/gnotski.7.scores
 share/gnome/games/gtali.scores
 share/gnome/games/iagno.b1.scores
 share/gnome/games/iagno.b2.scores
@@ -132,12 +154,36 @@ share/gnome/gturing/examples/dec2bin.tur
 share/gnome/gturing/examples/subst.tur
 share/gnome/help/gnobots2/C/index.html
 share/gnome/help/gnobots2/C/topic.dat
+share/gnome/help/gnobots2/da/index.html
+share/gnome/help/gnobots2/da/topic.dat
 share/gnome/help/gnobots2/es/index.html
 share/gnome/help/gnobots2/es/topic.dat
 share/gnome/help/gnobots2/it/index.html
 share/gnome/help/gnobots2/it/topic.dat
 share/gnome/help/gtali/C/index.html
 share/gnome/help/gtali/C/topic.dat
+share/gnome/help/gtali/da/index.html
+share/gnome/help/gtali/da/topic.dat
+share/gnome/help/iagno/C/ANIMATION.png
+share/gnome/help/iagno/C/BLOCK.png
+share/gnome/help/iagno/C/FIRST.png
+share/gnome/help/iagno/C/PLAYER.png
+share/gnome/help/iagno/C/START.png
+share/gnome/help/iagno/C/animations.html
+share/gnome/help/iagno/C/bugs.html
+share/gnome/help/iagno/C/credits.html
+share/gnome/help/iagno/C/docbook.css
+share/gnome/help/iagno/C/index.html
+share/gnome/help/iagno/C/license.html
+share/gnome/help/iagno/C/ln7.html
+share/gnome/help/iagno/C/playing.html
+share/gnome/help/iagno/C/settings.html
+share/gnome/help/iagno/C/stylesheet-images/caution.png
+share/gnome/help/iagno/C/stylesheet-images/important.png
+share/gnome/help/iagno/C/stylesheet-images/note.png
+share/gnome/help/iagno/C/stylesheet-images/tip.png
+share/gnome/help/iagno/C/stylesheet-images/warning.png
+share/gnome/help/iagno/C/topic.dat
 share/gnome/help/samegnome/C/authors.html
 share/gnome/help/samegnome/C/book1.html
 share/gnome/help/samegnome/C/bugs.html
@@ -147,6 +193,15 @@ share/gnome/help/samegnome/C/index.html
 share/gnome/help/samegnome/C/ln9.html
 share/gnome/help/samegnome/C/newthemes.html
 share/gnome/help/samegnome/C/topic.dat
+share/gnome/help/samegnome/ru/authors.html
+share/gnome/help/samegnome/ru/book1.html
+share/gnome/help/samegnome/ru/bugs.html
+share/gnome/help/samegnome/ru/c11.html
+share/gnome/help/samegnome/ru/docbook.css
+share/gnome/help/samegnome/ru/index.html
+share/gnome/help/samegnome/ru/ln9.html
+share/gnome/help/samegnome/ru/newthemes.html
+share/gnome/help/samegnome/ru/topic.dat
 share/gnome/mime-info/gnome-stones.keys
 share/gnome/mime-info/gnome-stones.mime
 share/gnome/pixmaps/cards/backs/beige.png
@@ -240,6 +295,7 @@ share/gnome/pixmaps/gnometris/bg/vortex-bg.png
 share/gnome/pixmaps/gnometris/bg/weirdo-bg.png
 share/gnome/pixmaps/gnotravex/gnotravex.png
 share/gnome/pixmaps/gnotravex/gnome-gnotravex.png
+share/gnome/pixmaps/gnotski/gnotski.png
 share/gnome/pixmaps/iagno.png
 share/gnome/pixmaps/iagno/blend.png
 share/gnome/pixmaps/iagno/classic.png
@@ -277,6 +333,7 @@ share/gnome/sol-games/hopscotch.scm
 share/gnome/sol-games/kansas.scm
 share/gnome/sol-games/klondike.scm
 share/gnome/sol-games/lady_jane.scm
+share/gnome/sol-games/maze.scm
 share/gnome/sol-games/neighbor.scm
 share/gnome/sol-games/odessa.scm
 share/gnome/sol-games/osmosis.scm
@@ -313,21 +370,28 @@ share/gnome/sounds/gnobots2/yahoo.wav
 share/gnome/sounds/iagno/flip-piece.wav
 share/gnome/sounds/iagno/gameover.wav
 share/gnome/xbill/cursors/apple.xpm
+share/gnome/xbill/cursors/beos.xpm
 share/gnome/xbill/cursors/bsd.xpm
 share/gnome/xbill/cursors/bucket.xpm
+share/gnome/xbill/cursors/caldera.xpm
+share/gnome/xbill/cursors/debian.xpm
 share/gnome/xbill/cursors/hand_down.xpm
 share/gnome/xbill/cursors/hand_down_mask.xpm
 share/gnome/xbill/cursors/hand_up.xpm
 share/gnome/xbill/cursors/hand_up_mask.xpm
 share/gnome/xbill/cursors/hurd.xpm
 share/gnome/xbill/cursors/linux.xpm
+share/gnome/xbill/cursors/mandrake.xpm
 share/gnome/xbill/cursors/next.xpm
 share/gnome/xbill/cursors/os2.xpm
 share/gnome/xbill/cursors/redhat.xpm
 share/gnome/xbill/cursors/sgi.xpm
 share/gnome/xbill/cursors/sun.xpm
+share/gnome/xbill/cursors/suse.xpm
+share/gnome/xbill/cursors/turbolinux.xpm
 share/gnome/xbill/pixmaps/about.xpm
 share/gnome/xbill/pixmaps/apple.xpm
+share/gnome/xbill/pixmaps/beos.xpm
 share/gnome/xbill/pixmaps/billA_0.xpm
 share/gnome/xbill/pixmaps/billA_1.xpm
 share/gnome/xbill/pixmaps/billA_10.xpm
@@ -355,11 +419,14 @@ share/gnome/xbill/pixmaps/billR_2.xpm
 share/gnome/xbill/pixmaps/bsd.xpm
 share/gnome/xbill/pixmaps/bsdcpu.xpm
 share/gnome/xbill/pixmaps/bucket.xpm
+share/gnome/xbill/pixmaps/caldera.xpm
+share/gnome/xbill/pixmaps/debian.xpm
 share/gnome/xbill/pixmaps/hurd.xpm
 share/gnome/xbill/pixmaps/icon.xpm
 share/gnome/xbill/pixmaps/linux.xpm
 share/gnome/xbill/pixmaps/logo.xpm
 share/gnome/xbill/pixmaps/maccpu.xpm
+share/gnome/xbill/pixmaps/mandrake.xpm
 share/gnome/xbill/pixmaps/next.xpm
 share/gnome/xbill/pixmaps/nextcpu.xpm
 share/gnome/xbill/pixmaps/os2.xpm
@@ -371,21 +438,26 @@ share/gnome/xbill/pixmaps/spark_0.xpm
 share/gnome/xbill/pixmaps/spark_1.xpm
 share/gnome/xbill/pixmaps/sun.xpm
 share/gnome/xbill/pixmaps/suncpu.xpm
+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/cs/LC_MESSAGES/gnome-games.mo
 share/locale/da/LC_MESSAGES/gnome-games.mo
 share/locale/de/LC_MESSAGES/gnome-games.mo
+share/locale/el/LC_MESSAGES/gnome-games.mo
 share/locale/en_GB/LC_MESSAGES/gnome-games.mo
 share/locale/es/LC_MESSAGES/gnome-games.mo
 share/locale/et/LC_MESSAGES/gnome-games.mo
 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/hu/LC_MESSAGES/gnome-games.mo
 share/locale/it/LC_MESSAGES/gnome-games.mo
 share/locale/ja/LC_MESSAGES/gnome-games.mo
 share/locale/ko/LC_MESSAGES/gnome-games.mo
+share/locale/lt/LC_MESSAGES/gnome-games.mo
 share/locale/nl/LC_MESSAGES/gnome-games.mo
 share/locale/no/LC_MESSAGES/gnome-games.mo
 share/locale/pl/LC_MESSAGES/gnome-games.mo
@@ -393,7 +465,9 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-games.mo
 share/locale/ru/LC_MESSAGES/gnome-games.mo
 share/locale/sv/LC_MESSAGES/gnome-games.mo
+share/locale/uk/LC_MESSAGES/gnome-games.mo
 share/locale/wa/LC_MESSAGES/gnome-games.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-games.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/xbill/pixmaps
 @dirrm share/gnome/xbill/cursors
@@ -407,6 +481,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/mahjongg/bg
 @dirrm share/gnome/pixmaps/mahjongg
 @dirrm share/gnome/pixmaps/iagno
+@dirrm share/gnome/pixmaps/gnotski
 @dirrm share/gnome/pixmaps/gnotravex
 @dirrm share/gnome/pixmaps/gnometris/bg
 @dirrm share/gnome/pixmaps/gnometris
@@ -424,12 +499,18 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/cards/honors
 @dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
+@dirrm share/gnome/help/samegnome/ru
 @dirrm share/gnome/help/samegnome/C
 @dirrm share/gnome/help/samegnome
+@dirrm share/gnome/help/iagno/C/stylesheet-images
+@dirrm share/gnome/help/iagno/C
+@dirrm share/gnome/help/iagno
+@dirrm share/gnome/help/gtali/da
 @dirrm share/gnome/help/gtali/C
 @dirrm share/gnome/help/gtali
 @dirrm share/gnome/help/gnobots2/it
 @dirrm share/gnome/help/gnobots2/es
+@dirrm share/gnome/help/gnobots2/da
 @dirrm share/gnome/help/gnobots2/C
 @dirrm share/gnome/help/gnobots2
 @dirrm share/gnome/gturing/examples