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.

22 files changed, 89 insertions, 36 deletions

diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index d2d4ce5..f4488fb 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bugbuddy
-PORTVERSION=	0.90
+PORTVERSION=	1.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/bug-buddy
@@ -14,8 +14,7 @@ DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
-		glade.3:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index ba78978..eaeb61f 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-0.90.tar.gz) = 7ff1a83f3d1f2ed9107b32bf553e3e47
+MD5 (bug-buddy-1.0.tar.gz) = 69f6bea3a2acf5bf4557a06a62bf0fea
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index d2d4ce5..f4488fb 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bugbuddy
-PORTVERSION=	0.90
+PORTVERSION=	1.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/bug-buddy
@@ -14,8 +14,7 @@ DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
-		glade.3:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo
index ba78978..eaeb61f 100644
--- a/devel/bugbuddy/distinfo
+++ b/devel/bugbuddy/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-0.90.tar.gz) = 7ff1a83f3d1f2ed9107b32bf553e3e47
+MD5 (bug-buddy-1.0.tar.gz) = 69f6bea3a2acf5bf4557a06a62bf0fea
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index d2d4ce5..f4488fb 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bugbuddy
-PORTVERSION=	0.90
+PORTVERSION=	1.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/bug-buddy
@@ -14,8 +14,7 @@ DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
-		glade.3:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo
index ba78978..eaeb61f 100644
--- a/devel/bugbuddy2/distinfo
+++ b/devel/bugbuddy2/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-0.90.tar.gz) = 7ff1a83f3d1f2ed9107b32bf553e3e47
+MD5 (bug-buddy-1.0.tar.gz) = 69f6bea3a2acf5bf4557a06a62bf0fea
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 66dcb08..a805cd9 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	glade
-PORTVERSION=	0.5.8
+PORTVERSION=	0.5.9
 CATEGORIES=	devel gnome
-MASTER_SITES=   http://glade.pn.org/
+MASTER_SITES=   ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/glade
 
 MAINTAINER=     ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/devel/glade/distinfo b/devel/glade/distinfo
index 9406a6a..6cf6182 100644
--- a/devel/glade/distinfo
+++ b/devel/glade/distinfo
@@ -1 +1 @@
-MD5 (glade-0.5.8.tar.gz) = 17843aa65191fe78d5f64710a2c68701
+MD5 (glade-0.5.9.tar.gz) = 198531c9895a4edb94020ea7b6799c8a
diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist
index 910994c..0b3b4f6 100644
--- a/devel/glade/pkg-plist
+++ b/devel/glade/pkg-plist
@@ -42,6 +42,21 @@ share/gnome/help/glade/C/faq/stylesheet-images/toc-plus.gif
 share/gnome/help/glade/C/faq/stylesheet-images/up.gif
 share/gnome/help/glade/C/faq/stylesheet-images/warning.gif
 share/gnome/help/glade/C/topic.dat
+share/gnome/help/glade/C/turbo-start/docbook.css
+share/gnome/help/glade/C/turbo-start/index.html
+share/gnome/help/glade/C/turbo-start/ln7.html
+share/gnome/help/glade/C/turbo-start/stylesheet-images/caution.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/home.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/important.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/next.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/note.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/prev.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/tip.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-blank.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-minus.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-plus.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/up.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/warning.gif
 share/gnome/help/glade/C/user-guide/authors.html
 share/gnome/help/glade/C/user-guide/docbook.css
 share/gnome/help/glade/C/user-guide/edit-menu.html
@@ -95,6 +110,7 @@ share/gnome/help/glade/C/user-guide/windows.html
 share/gnome/help/glade/C/user-guide/x230.html
 share/gnome/help/glade/C/user-guide/x329.html
 share/gnome/pixmaps/glade.png
+share/gnome/pixmaps/glade/glade_logo.png
 share/locale/ca/LC_MESSAGES/glade.mo
 share/locale/cs/LC_MESSAGES/glade.mo
 share/locale/da/LC_MESSAGES/glade.mo
@@ -113,9 +129,12 @@ share/locale/pt_BR/LC_MESSAGES/glade.mo
 share/locale/ru/LC_MESSAGES/glade.mo
 share/locale/sv/LC_MESSAGES/glade.mo
 share/locale/uk/LC_MESSAGES/glade.mo
+@dirrm share/gnome/pixmaps/glade
 @dirrm share/gnome/help/glade/C/user-guide/user-guide-images
 @dirrm share/gnome/help/glade/C/user-guide/stylesheet-images
 @dirrm share/gnome/help/glade/C/user-guide
+@dirrm share/gnome/help/glade/C/turbo-start/stylesheet-images
+@dirrm share/gnome/help/glade/C/turbo-start
 @dirrm share/gnome/help/glade/C/faq/stylesheet-images
 @dirrm share/gnome/help/glade/C/faq
 @dirrm share/gnome/help/glade/C
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 66dcb08..a805cd9 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	glade
-PORTVERSION=	0.5.8
+PORTVERSION=	0.5.9
 CATEGORIES=	devel gnome
-MASTER_SITES=   http://glade.pn.org/
+MASTER_SITES=   ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/glade
 
 MAINTAINER=     ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index 9406a6a..6cf6182 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1 +1 @@
-MD5 (glade-0.5.8.tar.gz) = 17843aa65191fe78d5f64710a2c68701
+MD5 (glade-0.5.9.tar.gz) = 198531c9895a4edb94020ea7b6799c8a
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index 910994c..0b3b4f6 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -42,6 +42,21 @@ share/gnome/help/glade/C/faq/stylesheet-images/toc-plus.gif
 share/gnome/help/glade/C/faq/stylesheet-images/up.gif
 share/gnome/help/glade/C/faq/stylesheet-images/warning.gif
 share/gnome/help/glade/C/topic.dat
+share/gnome/help/glade/C/turbo-start/docbook.css
+share/gnome/help/glade/C/turbo-start/index.html
+share/gnome/help/glade/C/turbo-start/ln7.html
+share/gnome/help/glade/C/turbo-start/stylesheet-images/caution.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/home.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/important.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/next.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/note.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/prev.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/tip.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-blank.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-minus.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-plus.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/up.gif
+share/gnome/help/glade/C/turbo-start/stylesheet-images/warning.gif
 share/gnome/help/glade/C/user-guide/authors.html
 share/gnome/help/glade/C/user-guide/docbook.css
 share/gnome/help/glade/C/user-guide/edit-menu.html
@@ -95,6 +110,7 @@ share/gnome/help/glade/C/user-guide/windows.html
 share/gnome/help/glade/C/user-guide/x230.html
 share/gnome/help/glade/C/user-guide/x329.html
 share/gnome/pixmaps/glade.png
+share/gnome/pixmaps/glade/glade_logo.png
 share/locale/ca/LC_MESSAGES/glade.mo
 share/locale/cs/LC_MESSAGES/glade.mo
 share/locale/da/LC_MESSAGES/glade.mo
@@ -113,9 +129,12 @@ share/locale/pt_BR/LC_MESSAGES/glade.mo
 share/locale/ru/LC_MESSAGES/glade.mo
 share/locale/sv/LC_MESSAGES/glade.mo
 share/locale/uk/LC_MESSAGES/glade.mo
+@dirrm share/gnome/pixmaps/glade
 @dirrm share/gnome/help/glade/C/user-guide/user-guide-images
 @dirrm share/gnome/help/glade/C/user-guide/stylesheet-images
 @dirrm share/gnome/help/glade/C/user-guide
+@dirrm share/gnome/help/glade/C/turbo-start/stylesheet-images
+@dirrm share/gnome/help/glade/C/turbo-start
 @dirrm share/gnome/help/glade/C/faq/stylesheet-images
 @dirrm share/gnome/help/glade/C/faq
 @dirrm share/gnome/help/glade/C
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 8192261..fd22a2a 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	stable/sources/libglade
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		xml.5:${PORTSDIR}/textproc/libxml
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 8192261..fd22a2a 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	stable/sources/libglade
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		xml.5:${PORTSDIR}/textproc/libxml
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 4fb7f22..c1fb363 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	libgtop
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.9
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libgtop
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		guile.6:${PORTSDIR}/lang/guile
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -25,4 +25,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
+post-install:
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+	install-info --section="Programming \& development tools" \
+	--entry="* libgtop: (libgtop).	libgtop programming manual" \
+	${PREFIX}/info/libgtop.info ${PREFIX}/info/dir
+
 .include <bsd.port.mk>
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index ef3c8ba..6aa41c1 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.7.tar.gz) = 5853822967955a172978142156dbc010
+MD5 (libgtop-1.0.9.tar.gz) = 714ace1260fba2a6fe198c4a7672bb9e
diff --git a/devel/libgtop/files/patch-ai b/devel/libgtop/files/patch-ai
index ff5209b..bf211b5 100644
--- a/devel/libgtop/files/patch-ai
+++ b/devel/libgtop/files/patch-ai
@@ -1,11 +1,11 @@
---- sysdeps/freebsd/msg_limits.c.orig	Sat May 27 14:19:11 2000
-+++ sysdeps/freebsd/msg_limits.c	Sat May 27 14:21:05 2000
+--- sysdeps/freebsd/msg_limits.c.orig	Sun Feb 13 09:47:58 2000
++++ sysdeps/freebsd/msg_limits.c	Fri May 26 13:36:23 2000
 @@ -46,7 +46,7 @@
  
  /* #define KERNEL to get declaration of `struct msginfo'. */
  
 -#if (defined __FreeBSD__) || (defined __bsdi__)
-+#if (defined(__FreeBSD__) && __FreeBSD__ < 5) || (defined __bsdi__)
++#if ((defined __FreeBSD__) && (__FreeBSD_version < 500000)) || (defined __bsdi__)
  #define KERNEL 1
  #else
  #define _KERNEL 1
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 7e55aba..09ca13e 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -49,7 +49,7 @@ include/glibtop_server.h
 include/glibtop_suid.h
 @unexec install-info --delete %D/info/libgtop.info %D/info/dir
 info/libgtop.info
-@exec install-info %D/info/libgtop.info %D/info/dir
+@exec install-info --section="Programming \& development tools" --entry="* libgtop: (libgtop).	libgtop programming manual" %D/info/libgtop.info %D/info/dir
 lib/libgtop.a
 lib/libgtop.so
 lib/libgtop.so.1
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 4fb7f22..c1fb363 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	libgtop
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.9
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libgtop
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		guile.6:${PORTSDIR}/lang/guile
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -25,4 +25,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
+post-install:
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+	install-info --section="Programming \& development tools" \
+	--entry="* libgtop: (libgtop).	libgtop programming manual" \
+	${PREFIX}/info/libgtop.info ${PREFIX}/info/dir
+
 .include <bsd.port.mk>
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index ef3c8ba..6aa41c1 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.7.tar.gz) = 5853822967955a172978142156dbc010
+MD5 (libgtop-1.0.9.tar.gz) = 714ace1260fba2a6fe198c4a7672bb9e
diff --git a/devel/libgtop2/files/patch-ai b/devel/libgtop2/files/patch-ai
index ff5209b..bf211b5 100644
--- a/devel/libgtop2/files/patch-ai
+++ b/devel/libgtop2/files/patch-ai
@@ -1,11 +1,11 @@
---- sysdeps/freebsd/msg_limits.c.orig	Sat May 27 14:19:11 2000
-+++ sysdeps/freebsd/msg_limits.c	Sat May 27 14:21:05 2000
+--- sysdeps/freebsd/msg_limits.c.orig	Sun Feb 13 09:47:58 2000
++++ sysdeps/freebsd/msg_limits.c	Fri May 26 13:36:23 2000
 @@ -46,7 +46,7 @@
  
  /* #define KERNEL to get declaration of `struct msginfo'. */
  
 -#if (defined __FreeBSD__) || (defined __bsdi__)
-+#if (defined(__FreeBSD__) && __FreeBSD__ < 5) || (defined __bsdi__)
++#if ((defined __FreeBSD__) && (__FreeBSD_version < 500000)) || (defined __bsdi__)
  #define KERNEL 1
  #else
  #define _KERNEL 1
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 7e55aba..09ca13e 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -49,7 +49,7 @@ include/glibtop_server.h
 include/glibtop_suid.h
 @unexec install-info --delete %D/info/libgtop.info %D/info/dir
 info/libgtop.info
-@exec install-info %D/info/libgtop.info %D/info/dir
+@exec install-info --section="Programming \& development tools" --entry="* libgtop: (libgtop).	libgtop programming manual" %D/info/libgtop.info %D/info/dir
 lib/libgtop.a
 lib/libgtop.so
 lib/libgtop.so.1