The never ending gnome story:

Update "libgtop" package to version 0.99.2.

5 files changed, 32 insertions, 108 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index c59ebdfb330..e893076724f 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.8 1999/01/02 19:50:17 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/01/16 04:10:05 tron Exp $
 #
 
-DISTNAME=	libgtop-0.99.0
+DISTNAME=	libgtop-0.99.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
-		ftp://ftp.gnome.org/pub/GNOME/sources/ \
-		ftp://ftp.geo.net/pub/gnome/sources/
+MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/ \
+		ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/libgtop
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 
-DEPENDS+=	gnome-libs-0.99.0:../../x11/gnome-libs
+DEPENDS+=	gnome-libs-0.99.3:../../x11/gnome-libs
 DEPENDS+=	guile-1.3:../../lang/guile
 DEPENDS+=	gettext-0.10.35:../../devel/gettext
 
diff --git a/devel/libgtop/files/md5 b/devel/libgtop/files/md5
index fb620808001..2efbc466eb1 100644
--- a/devel/libgtop/files/md5
+++ b/devel/libgtop/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/01/02 19:50:17 tron Exp $
+$NetBSD: md5,v 1.4 1999/01/16 04:10:06 tron Exp $
 
-MD5 (libgtop-0.99.0.tar.gz) = 7fc6084220d3436968d7faa646ccc15d
+MD5 (libgtop-0.99.2.tar.gz) = 5c854b828a20ba966ed429dd6773cea6
diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa
index 9dff7557ea5..abe25063bd8 100644
--- a/devel/libgtop/patches/patch-aa
+++ b/devel/libgtop/patches/patch-aa
@@ -1,41 +1,40 @@
-$NetBSD: patch-aa,v 1.3 1999/01/02 19:50:17 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/01/16 04:10:06 tron Exp $
 
---- configure.orig	Thu Dec 17 18:18:58 1998
-+++ configure	Sat Jan  2 20:25:49 1999
-@@ -1951,6 +1951,7 @@
+--- configure.orig	Tue Jan  5 20:51:05 1999
++++ configure	Sat Jan 16 04:49:53 1999
+@@ -2021,6 +2021,7 @@
  
  
  # Always use our own libtool.
 +if false; then
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
- 
-@@ -2030,7 +2031,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ # Check for any special flags to pass to ltconfig.
+@@ -2065,6 +2066,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
 +fi
  
- 
-   # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
-@@ -4391,6 +4392,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -4425,6 +4427,7 @@
  
  
  # Always use our own libtool.
 +if false; then
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
- 
-@@ -4470,6 +4472,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ # Check for any special flags to pass to ltconfig.
+@@ -4469,6 +4472,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 +fi
  
- 
- # Check whether --with-glib-prefix or --without-glib-prefix was given.
-@@ -9890,10 +9895,10 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -9907,10 +9911,10 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/devel/libgtop/patches/patch-ab b/devel/libgtop/patches/patch-ab
deleted file mode 100644
index 2bc4538586b..00000000000
--- a/devel/libgtop/patches/patch-ab
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ab,v 1.4 1999/01/02 19:50:17 tron Exp $
-
---- Makefile.in.orig	Thu Dec 17 18:20:38 1998
-+++ Makefile.in	Sat Jan  2 01:40:10 1999
-@@ -170,7 +170,7 @@
- 
- @BUILD_GNOME_SUPPORT_TRUE@support = support
- 
--SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
-+SUBDIRS = intl $(support) macros misc include sysdeps lib src \
- 	  $(examples_SUBDIRS)
- 
- include_HEADERS = glibtop.h
-@@ -508,35 +508,35 @@
- $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
- 
- libgtopConf.sh: libgtopConf.sh.in Makefile
--	sed -e 's,\@LIBGTOP_LIBDIR\@,$(libdir),g' \
--	    -e 's,\@LIBGTOP_INCLUDEDIR\@,$(includedir),g' \
--	    -e 's,\@LIBGTOP_EXTRA_LIBS\@,$(LIBGTOP_EXTRA_LIBS),g' \
--	    -e 's,\@LIBGTOP_LIBS\@,$(LIBGTOP_LIBS),g' \
--	    -e 's,\@LIBGTOP_INCS\@,$(LIBGTOP_INCS),g' \
--	    -e 's,\@LIBGTOP_NAMES_LIBS\@,$(LIBGTOP_NAMES_LIBS),g' \
--	    -e 's,\@LIBGTOP_NAMES_INCS\@,$(LIBGTOP_NAMES_INCS),g' \
--	    -e 's,\@LIBGTOP_GUILE_LIBS\@,$(LIBGTOP_GUILE_LIBS),g' \
--	    -e 's,\@LIBGTOP_GUILE_INCS\@,$(LIBGTOP_GUILE_INCS),g' \
--	    -e 's,\@LIBGTOP_GUILE_NAMES_LIBS\@,$(LIBGTOP_GUILE_NAMES_LIBS),g' \
--	    -e 's,\@LIBGTOP_GUILE_NAMES_INCS\@,$(LIBGTOP_GUILE_NAMES_INCS),g' \
--	    -e 's,\@LIBGTOP_BINDIR\@,$(LIBGTOP_BINDIR),g' \
--	    -e 's,\@LIBGTOP_SERVER\@,$(LIBGTOP_SERVER),g' \
--	    -e 's,\@LIBGTOP_MAJOR_VERSION\@,$(LIBGTOP_MAJOR_VERSION),g' \
--	    -e 's,\@LIBGTOP_MINOR_VERSION\@,$(LIBGTOP_MINOR_VERSION),g' \
--	    -e 's,\@LIBGTOP_MICRO_VERSION\@,$(LIBGTOP_MICRO_VERSION),g' \
--	    -e 's,\@LIBGTOP_VERSION\@,$(LIBGTOP_VERSION),g' \
--	    -e 's,\@LIBGTOP_VERSION_CODE\@,$(LIBGTOP_VERSION_CODE),g' \
--	    -e 's,\@LIBGTOP_SERVER_VERSION\@,$(LIBGTOP_SERVER_VERSION),g' \
--	    -e 's,\@libgtop_sysdeps_dir\@,$(libgtop_sysdeps_dir),g' \
--	    -e 's,\@libgtop_need_server\@,$(libgtop_need_server),g' \
--	    -e 's,\@libgtop_use_machine_h\@,$(libgtop_use_machine_h),g' \
--	    -e 's,\@libgtop_guile_found\@,$(libgtop_guile_found),g' \
--	    -e 's,\@libgtop_want_examples\@,$(libgtop_want_examples),g' \
-+	sed -e 's%\@LIBGTOP_LIBDIR\@%$(libdir)%g' \
-+	    -e 's%\@LIBGTOP_INCLUDEDIR\@%$(includedir)%g' \
-+	    -e 's%\@LIBGTOP_EXTRA_LIBS\@%$(LIBGTOP_EXTRA_LIBS)%g' \
-+	    -e 's%\@LIBGTOP_LIBS\@%$(LIBGTOP_LIBS)%g' \
-+	    -e 's%\@LIBGTOP_INCS\@%$(LIBGTOP_INCS)%g' \
-+	    -e 's%\@LIBGTOP_NAMES_LIBS\@%$(LIBGTOP_NAMES_LIBS)%g' \
-+	    -e 's%\@LIBGTOP_NAMES_INCS\@%$(LIBGTOP_NAMES_INCS)%g' \
-+	    -e 's%\@LIBGTOP_GUILE_LIBS\@%$(LIBGTOP_GUILE_LIBS)%g' \
-+	    -e 's%\@LIBGTOP_GUILE_INCS\@%$(LIBGTOP_GUILE_INCS)%g' \
-+	    -e 's%\@LIBGTOP_GUILE_NAMES_LIBS\@%$(LIBGTOP_GUILE_NAMES_LIBS)%g' \
-+	    -e 's%\@LIBGTOP_GUILE_NAMES_INCS\@%$(LIBGTOP_GUILE_NAMES_INCS)%g' \
-+	    -e 's%\@LIBGTOP_BINDIR\@%$(LIBGTOP_BINDIR)%g' \
-+	    -e 's%\@LIBGTOP_SERVER\@%$(LIBGTOP_SERVER)%g' \
-+	    -e 's%\@LIBGTOP_MAJOR_VERSION\@%$(LIBGTOP_MAJOR_VERSION)%g' \
-+	    -e 's%\@LIBGTOP_MINOR_VERSION\@%$(LIBGTOP_MINOR_VERSION)%g' \
-+	    -e 's%\@LIBGTOP_MICRO_VERSION\@%$(LIBGTOP_MICRO_VERSION)%g' \
-+	    -e 's%\@LIBGTOP_VERSION\@%$(LIBGTOP_VERSION)%g' \
-+	    -e 's%\@LIBGTOP_VERSION_CODE\@%$(LIBGTOP_VERSION_CODE)%g' \
-+	    -e 's%\@LIBGTOP_SERVER_VERSION\@%$(LIBGTOP_SERVER_VERSION)%g' \
-+	    -e 's%\@libgtop_sysdeps_dir\@%$(libgtop_sysdeps_dir)%g' \
-+	    -e 's%\@libgtop_need_server\@%$(libgtop_need_server)%g' \
-+	    -e 's%\@libgtop_use_machine_h\@%$(libgtop_use_machine_h)%g' \
-+	    -e 's%\@libgtop_guile_found\@%$(libgtop_guile_found)%g' \
-+	    -e 's%\@libgtop_want_examples\@%$(libgtop_want_examples)%g' \
- 	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
- 	  && mv libgtopConf.tmp libgtopConf.sh
- 
- libgtop-config: libgtop-config.in Makefile
--	sed -e 's,\@LIBGTOP_LIBDIR\@,$(libdir),g' \
-+	sed -e 's%\@LIBGTOP_LIBDIR\@%$(libdir)%g' \
- 	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
- 	  && mv libgtop-config.tmp libgtop-config && \
- 		chmod 755 libgtop-config
diff --git a/devel/libgtop/pkg/PLIST b/devel/libgtop/pkg/PLIST
index 3f1ef92b32e..4724c1769f5 100644
--- a/devel/libgtop/pkg/PLIST
+++ b/devel/libgtop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/01/02 19:50:19 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 1999/01/16 04:10:07 tron Exp $
 bin/libgtop_daemon
 bin/libgtop_server
 bin/libgtop-config
@@ -47,21 +47,21 @@ include/glibtop_machine.h
 include/glibtop_suid.h
 include/glibtop.h
 lib/libgtop-features.def
-lib/libgtop_sysdeps.so.0.0
+lib/libgtop_sysdeps.so.0.2
 lib/libgtop_sysdeps.a
-lib/libgtop_sysdeps_suid.so.0.0
+lib/libgtop_sysdeps_suid.so.0.2
 lib/libgtop_sysdeps_suid.a
-lib/libgtop_common.so.0.0
+lib/libgtop_common.so.0.2
 lib/libgtop_common.a
-lib/libgtop_suid_common.so.0.0
+lib/libgtop_suid_common.so.0.2
 lib/libgtop_suid_common.a
-lib/libgtop_names.so.0.0
+lib/libgtop_names.so.0.2
 lib/libgtop_names.a
-lib/libgtop_guile_names.so.0.0
+lib/libgtop_guile_names.so.0.2
 lib/libgtop_guile_names.a
-lib/libgtop_guile.so.0.0
+lib/libgtop_guile.so.0.2
 lib/libgtop_guile.a
-lib/libgtop.so.0.0
+lib/libgtop.so.0.2
 lib/libgtop.a
 lib/libgtopConf.sh
 @dirrm include/glibtop