Upgrade to GNOME 1.0. The following are the details:

 ports/audio/esound			0.2.7    ->  0.2.8	PR ports/10422
 ports/audio/gnomeaudio			0.99.8   ->  1.0.0	PR ports/10426
 ports/audio/libaudiofile		0.1.5    ->  0.1.6	PR ports/10421
 ports/deskutils/gnomepim		0.99.8.1 ->  1.0.1	PR ports/10435
 ports/devel/ORBit			0.3.98   ->  0.4.0	PR ports/10423
 ports/devel/gettext			shared libs now		PR ports/10293
 ports/devel/glib12			1.1.16   ->  1.2.0	PR ports/10419
 ports/devel/libgtop			0.99.8   ->  1.0.1	PR ports/10430
 ports/games/gnomegames			0.99.8   ->  1.0.1	PR ports/10436
 ports/graphics/electriceyes		distfile moved		PR ports/10437
 ports/graphics/imlib			1.9.3    ->  1.9.4	PR ports/10424
 ports/lang/gnomeobjc			0.99.3   ->  1.0.1	PR ports/10441
 ports/math/gnumeric			0.6      ->  0.15	PR ports/10439
 ports/misc/gnomeutils			0.99.5   ->  1.0.1	PR ports/10442
 ports/sysutils/gnomeadmin		0.99.1   ->  1.0.1	PR ports/10445
 ports/sysutils/gnomecontrolcenter	0.99.3.1 ->  1.0.1	PR ports/10446
 ports/sysutils/gtop			0.99.2   ->  1.0.1	PR ports/10477
 ports/textproc/libxml			0.99.8   ->  1.0.0	PR ports/10438
 ports/www/libghttp			distfile moved		PR ports/10429
 ports/x11/gnome			0.99.3   ->  1.0.0	PR ports/10450
 ports/x11/gnomecore			0.99.8.1 ->  1.0.1	PR ports/10432
 ports/x11/gnomelibs			0.99.8.1 ->  1.0.1	PR ports/10425
 ports/x11-fm/gnomemc			4.5.10   ->  4.5.23	PR ports/10448
 ports/x11-toolkits/gtk-engines		0.1      ->  0.5	PR ports/10427
 ports/x11-toolkits/gtk12		1.1.6    ->  1.2.0	PR ports/10420

Note that repository copies were made before this commit, as follows:

 ports/devel/glib11-devel       -> ports/devel/glib12
 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12

Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

4 files changed, 42 insertions, 121 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 5ec60bc9473..20c8a4d1930 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	libgtop
-# Version required:		0.99.8
+# Version required:		1.0.1
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.15 1999/02/18 18:56:34 vanilla Exp $
+# $Id: Makefile,v 1.16 1999/02/25 01:17:23 asami Exp $
 #
 
-DISTNAME=	libgtop-0.99.8
+DISTNAME=	libgtop-1.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	libgtop
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
@@ -17,13 +17,14 @@ LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
 		guile.4:${PORTSDIR}/lang/guile
 
 # implicit dependencies:
-# gettext, glib11-devel
+# gettext, glib12
 
+USE_PERL5=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-USE_GMAKE=	yes
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 896262b866c..b94d8e68718 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1 +1 @@
-MD5 (libgtop-0.99.8.tar.gz) = 3cae59e8e94912483373561abf4937c4
+MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219
diff --git a/devel/libgtop/files/patch-ab b/devel/libgtop/files/patch-ab
index 54c2bf09c26..54222f5d5c8 100644
--- a/devel/libgtop/files/patch-ab
+++ b/devel/libgtop/files/patch-ab
@@ -1,99 +1,16 @@
--- lib/Makefile.in.orig	Wed Jan  6 03:54:31 1999
-+++ lib/Makefile.in	Thu Jan  7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/common/Makefile.in.orig	Wed Jan  6 03:53:49 1999
-+++ sysdeps/common/Makefile.in	Thu Jan  7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/freebsd/Makefile.in.orig	Wed Jan  6 03:54:24 1999
-+++ sysdeps/freebsd/Makefile.in	Thu Jan  7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/names/Makefile.in.orig	Wed Jan  6 03:54:09 1999
-+++ sysdeps/names/Makefile.in	Thu Jan  7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/guile/Makefile.in.orig	Fri Jan  8 11:23:00 1999
-+++ sysdeps/guile/Makefile.in	Fri Jan  8 11:26:57 1999
-@@ -126,9 +126,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
--LT_RELEASE = @LT_RELEASE@
--LT_REVISION = @LT_REVISION@
-+LT_CURRENT = 1
-+LT_RELEASE = 0
-+LT_REVISION = 0
- LT_VERSION_INFO = @LT_VERSION_INFO@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
---- sysdeps/guile/names/Makefile.in.orig	Wed Jan  6 03:54:02 1999
-+++ sysdeps/guile/names/Makefile.in	Fri Jan  8 11:27:22 1999
-@@ -126,9 +126,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
--LT_RELEASE = @LT_RELEASE@
--LT_REVISION = @LT_REVISION@
-+LT_CURRENT = 1
-+LT_RELEASE = 0
-+LT_REVISION = 0
- LT_VERSION_INFO = @LT_VERSION_INFO@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
---- po/Makefile.in.in.orig	Wed Jan  6 03:50:44 1999
-+++ po/Makefile.in.in	Thu Jan  7 21:47:02 1999
-@@ -18,7 +18,7 @@
+--- src/daemon/Makefile.in.orig	Tue Mar  2 18:48:38 1999
++++ src/daemon/Makefile.in	Tue Mar  2 18:49:07 1999
+@@ -191,7 +191,7 @@
  
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
---- Makefile.in.orig	Wed Feb 17 18:34:29 1999
-+++ Makefile.in	Fri Feb 19 01:58:32 1999
-@@ -174,7 +174,7 @@
- 
- @BUILD_GNOME_SUPPORT_TRUE@support = support
  
--SUBDIRS = po intl $(support) macros misc include sysdeps lib src 	  $(examples_SUBDIRS)
-+SUBDIRS = po intl macros misc include sysdeps lib src
+ libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
+-libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la 				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la 				  @LIBSUPPORT@
++libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la 				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la 				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
  
  
- include_HEADERS = glibtop.h
+ EXTRA_DIST = server_config.h.in server_config.pl
+--- Makefile.in.orig	Wed Feb 17 18:34:29 1999
++++ Makefile.in	Fri Feb 19 01:58:32 1999
 @@ -182,7 +182,7 @@
  EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 	RELNOTES-1.0 libgtop-sysdeps.m4 ANNOUNCE-0.25 ANNOUNCE-1.0 	README NEWS.old libgtop-mirror.sh
  
diff --git a/devel/libgtop/files/patch-ac b/devel/libgtop/files/patch-ac
index aa98d434341..4669680a312 100644
--- a/devel/libgtop/files/patch-ac
+++ b/devel/libgtop/files/patch-ac
@@ -1,21 +1,24 @@
---- configure.orig	Tue Feb 16 22:50:48 1999
-+++ configure	Fri Feb 19 02:02:47 1999
-@@ -2982,13 +2982,13 @@
- 	    fi
- 	
- 	    if test "$no_gnome_config" = "yes"; then
--              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:2987: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	      if test -f $gnome_prefix/gnomeConf.sh; then
-+              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:2987: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	      if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	        echo "$ac_t""found" 1>&6
- 	        echo "loading gnome configuration from" \
--		     "$gnome_prefix/gnomeConf.sh"
--	        . $gnome_prefix/gnomeConf.sh
-+		     "$prefix/share/gnome/gnomeConf.sh"
-+	        . $prefix/share/gnome/gnomeConf.sh
- 	        gnome_found=yes
- 	      else
- 	        echo "$ac_t""not found" 1>&6
+--- configure.orig	Sun Feb 28 13:10:54 1999
++++ configure	Tue Mar  2 18:33:43 1999
+@@ -965,9 +965,9 @@
+ 
+ # libtool versioning
+ LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
+-LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
+-LT_REVISION=$LIBGTOP_INTERFACE_AGE
+-LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
++LT_CURRENT=1
++LT_REVISION=0
++LT_AGE=0
+ LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
+ 
+ 
+@@ -7698,7 +7698,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo