5 files changed, 86 insertions, 69 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 5650b2ddde22..351989e86eba 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,21 +1,26 @@
 # New ports collection makefile for:	libgtop
-# Version required:		0.26.2
+# Version required:		0.99.0
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1998/11/08 00:24:03 asami Exp $
+# $Id: Makefile,v 1.8 1998/11/17 15:28:08 vanilla Exp $
 #
 
-DISTNAME=	libgtop-0.26.2
+DISTNAME=	libgtop-0.99.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.home-of-linux.org/pub/libgtop/0.26.2/
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/
+#		ftp://ftp.home-of-linux.org/pub/libgtop/0.26.2/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	glib11.0:${PORTSDIR}/devel/glib \
-		gnome.0:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	glib11d.1:${PORTSDIR}/devel/glib11-devel \
+		gnome.0:${PORTSDIR}/x11/gnomelibs \
+		guile.4:${PORTSDIR}/lang/guile
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
 USE_GMAKE=	yes
 
 post-install:
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index bf13b4e88e81..b9219b97db87 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1 +1 @@
-MD5 (libgtop-0.26.2.tar.gz) = 5d0636375fa2e5732732c8adbc5412e8
+MD5 (libgtop-0.99.0.tar.gz) = 7fc6084220d3436968d7faa646ccc15d
diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab
index 1d5ab14bf9d3..165efe523563 100644
--- a/devel/libgtop2/files/patch-ab
+++ b/devel/libgtop2/files/patch-ab
@@ -1,65 +1,65 @@
---- lib/Makefile.in.orig	Sun Sep 27 22:28:31 1998
-+++ lib/Makefile.in	Wed Sep 30 01:47:05 1998
-@@ -125,7 +125,7 @@
+--- lib/Makefile.in.orig	Fri Dec 25 22:09:27 1998
++++ lib/Makefile.in	Fri Dec 25 22:50:30 1998
+@@ -128,7 +128,7 @@
  LT_CURRENT = @LT_CURRENT@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
 -LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = --version-info 0:0:0
++LT_VERSION_INFO = -version-info 0:99:0
  MAKEINFO = @MAKEINFO@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
---- sysdeps/common/Makefile.in.orig	Sun Sep 27 22:28:06 1998
-+++ sysdeps/common/Makefile.in	Wed Sep 30 01:48:11 1998
-@@ -125,7 +125,7 @@
+ NM = @NM@
+--- sysdeps/common/Makefile.in.orig	Fri Dec 25 22:51:31 1998
++++ sysdeps/common/Makefile.in	Fri Dec 25 22:51:52 1998
+@@ -128,7 +128,7 @@
  LT_CURRENT = @LT_CURRENT@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
 -LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = --version-info 0:0:0
++LT_VERSION_INFO = -version-info 0:99:0
  MAKEINFO = @MAKEINFO@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
---- sysdeps/freebsd/Makefile.in.orig	Sun Sep 27 22:28:24 1998
-+++ sysdeps/freebsd/Makefile.in	Wed Sep 30 01:48:46 1998
-@@ -124,7 +124,7 @@
+ NM = @NM@
+--- sysdeps/freebsd/Makefile.in.orig	Fri Dec 25 22:51:58 1998
++++ sysdeps/freebsd/Makefile.in	Fri Dec 25 22:52:15 1998
+@@ -128,7 +128,7 @@
  LT_CURRENT = @LT_CURRENT@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
 -LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = --version-info 0:0:0
++LT_VERSION_INFO = -version-info 0:99:0
  MAKEINFO = @MAKEINFO@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
---- sysdeps/names/Makefile.in.orig	Sun Sep 27 22:28:15 1998
-+++ sysdeps/names/Makefile.in	Wed Sep 30 01:49:10 1998
-@@ -125,7 +125,7 @@
+ NM = @NM@
+--- sysdeps/names/Makefile.in.orig	Fri Dec 25 22:52:24 1998
++++ sysdeps/names/Makefile.in	Fri Dec 25 22:52:44 1998
+@@ -128,7 +128,7 @@
  LT_CURRENT = @LT_CURRENT@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
 -LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = --version-info 0:0:0
++LT_VERSION_INFO = -version-info 0:99:0
  MAKEINFO = @MAKEINFO@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
---- Makefile.in.orig	Sun Sep 27 22:27:55 1998
-+++ Makefile.in	Wed Sep 30 03:49:17 1998
-@@ -163,8 +163,7 @@
- @GUILE_TRUE@guile_SUBDIRS = guile
- @GUILE_FALSE@guile_SUBDIRS =
+ NM = @NM@
+--- Makefile.in.orig	Fri Dec 25 22:52:51 1998
++++ Makefile.in	Fri Dec 25 22:54:19 1998
+@@ -170,8 +170,7 @@
  
--SUBDIRS = po intl support macros include sysdeps lib src \
+ @BUILD_GNOME_SUPPORT_TRUE@support = support
+ 
+-SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
 -	  $(examples_SUBDIRS)
-+SUBDIRS = po intl macros include sysdeps lib src
++SUBDIRS = po intl macros misc include sysdeps lib src
  
- DIST_SUBDIRS = po intl support macros include sysdeps src lib guile examples
+ include_HEADERS = glibtop.h
  
-@@ -174,7 +173,7 @@
- 	LIBGTOP-VERSION features.def perl/Makefile.PL.in perl/perl.awk \
- 	perl/MANIFEST perl/Changes libgtop-config.in RELNOTES-0.25
+@@ -179,7 +178,7 @@
+ 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
+ 	libgtop-sysdeps.m4
  
--confexecdir=$(libdir)
-+confexecdir=$(sysconfdir)
- confexec_DATA = $(top_builddir)/libgtopConf.sh
+-confexecdir	= $(libdir)
++confexecdir	= $(sysconfdir)
+ confexec_DATA	= $(top_builddir)/libgtopConf.sh \
+ 		  $(top_builddir)/libgtop-features.def
  
- bin_SCRIPTS = $(top_builddir)/libgtop-config
diff --git a/devel/libgtop2/files/patch-ac b/devel/libgtop2/files/patch-ac
index b7c266f0fbc2..e0234a593c99 100644
--- a/devel/libgtop2/files/patch-ac
+++ b/devel/libgtop2/files/patch-ac
@@ -1,20 +1,21 @@
---- configure.orig	Sun Sep 27 21:43:04 1998
-+++ configure	Wed Sep 30 01:50:52 1998
-@@ -2133,12 +2133,12 @@
- 
- 
- 	if test "$no_gnome_config" = "yes"; then
--          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:2138: 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:2138: 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
-+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+	    . $prefix/share/gnome/gnomeConf.sh
- 	    gnome_found=yes
- 	  else
- 	    echo "$ac_t""not found" 1>&6
+--- configure.orig	Fri Dec 18 01:18:58 1998
++++ configure	Sat Dec 26 13:04:43 1998
+@@ -2344,13 +2344,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:2349: 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:2349: 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
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 97c1f03becbd..f7c2e65327e1 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -2,10 +2,11 @@ bin/libgtop_daemon
 bin/libgtop_server
 bin/libgtop-config
 etc/libgtopConf.sh
+etc/libgtop-features.def
+include/glibtop.h
 include/glibtop_machine.h
 include/glibtop_server.h
 include/glibtop_suid.h
-include/glibtop.h
 include/glibtop/close.h
 include/glibtop/command.h
 include/glibtop/cpu.h
@@ -18,8 +19,11 @@ include/glibtop/loadavg.h
 include/glibtop/mem.h
 include/glibtop/mountlist.h
 include/glibtop/msg_limits.h
+include/glibtop/netload.h
 include/glibtop/open.h
 include/glibtop/parameter.h
+include/glibtop/ppp.h
+include/glibtop/procargs.h
 include/glibtop/prockernel.h
 include/glibtop/proclist.h
 include/glibtop/procmap.h
@@ -46,19 +50,27 @@ include/glibtop/xmalloc.h
 lib/libgtop.a
 lib/libgtop.la
 lib/libgtop.so
-lib/libgtop.so.0
+lib/libgtop.so.0.99
 lib/libgtop_common.a
 lib/libgtop_common.la
 lib/libgtop_common.so
-lib/libgtop_common.so.0
+lib/libgtop_common.so.0.99
+lib/libgtop_guile.a
+lib/libgtop_guile.la
+lib/libgtop_guile.so
+lib/libgtop_guile.so.0.99
+lib/libgtop_guile_names.a
+lib/libgtop_guile_names.la
+lib/libgtop_guile_names.so
+lib/libgtop_guile_names.so.0.99
 lib/libgtop_names.a
 lib/libgtop_names.la
 lib/libgtop_names.so
-lib/libgtop_names.so.0
+lib/libgtop_names.so.0.99
 lib/libgtop_suid_common.a
 lib/libgtop_suid_common.la
 lib/libgtop_suid_common.so
-lib/libgtop_suid_common.so.0
+lib/libgtop_suid_common.so.0.99
 lib/libgtop_sysdeps.a
 lib/libgtop_sysdeps.la
 lib/libgtop_sysdeps.so
@@ -66,8 +78,7 @@ lib/libgtop_sysdeps.so.0
 lib/libgtop_sysdeps_suid.a
 lib/libgtop_sysdeps_suid.la
 lib/libgtop_sysdeps_suid.so
-lib/libgtop_sysdeps_suid.so.0
+lib/libgtop_sysdeps_suid.so.0.99
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/locale/fr/LC_MESSAGES/libgtop.mo
 @dirrm include/glibtop