Update "libgtop" package to version 1.0.5 included in GNOME 1.0.53 release.

5 files changed, 49 insertions, 42 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 18de1138611..7be6ae3a741 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.23 1999/10/22 07:54:15 agc Exp $
-#
+# $NetBSD: Makefile,v 1.24 1999/10/22 23:47:58 tron Exp $
 
-DISTNAME=		libgtop-1.0.2
+DISTNAME=		libgtop-1.0.5
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0/sources/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0.53/sources/}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.home-of-linux.org/gnome/libgtop/
 
+BUILD_DEPENDS=		${PERL}:../../lang/perl5
 DEPENDS+=		gettext-0.10.35:../../devel/gettext
-DEPENDS+=		gnome-libs-1.0.16:../../x11/gnome-libs
+DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
 DEPENDS+=		guile-1.3.2:../../lang/guile
 
-IGNORE=			"got broken by removal of Mach VM"
-
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
@@ -21,13 +19,18 @@ USE_LIBTOOL=		yes
 
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -lintl
+PERL=			${LOCALBASE}/bin/perl
 
 # The following CPPFLAGS are for debugging purposes.
 CPPFLAGS+=		-DLIBGTOP_ENABLE_DEBUG -DLIBGTOP_FATAL_WARNINGS
 
 CONFIGURE_ARGS+=	--with-glib-prefix=${LOCALBASE} \
 			--with-libgtop-guile --with-catgets
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"  \
+CONFIGURE_ENV+=		AWK="${AWK}" \
+			CPP="${CPP}" \
+			LN_S="${LN} -s" \
+			PERL="${PERL}" \
+			CPPFLAGS="${CPPFLAGS}"  \
 			LOCALBASE=${LOCALBASE} \
 			X11BASE=${X11BASE}
 
diff --git a/devel/libgtop/files/md5 b/devel/libgtop/files/md5
index 31ce9d88351..9236d699c6e 100644
--- a/devel/libgtop/files/md5
+++ b/devel/libgtop/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/08/30 08:54:03 jlam Exp $
+$NetBSD: md5,v 1.7 1999/10/22 23:47:58 tron Exp $
 
-MD5 (libgtop-1.0.2.tar.gz) = 223d09d2c190e26109d731b1697f1bc8
+MD5 (libgtop-1.0.5.tar.gz) = 0fe92d6f13d3f4a93373349e293fa087
diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum
index 1d7599c3049..1c98503e6b4 100644
--- a/devel/libgtop/files/patch-sum
+++ b/devel/libgtop/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/08/30 08:54:03 jlam Exp $
+$NetBSD: patch-sum,v 1.3 1999/10/22 23:47:58 tron Exp $
 
-MD5 (patch-aa) = 633903ff35ed178ac071904d1c750798
+MD5 (patch-aa) = ff5a586a4aaf732a48a7dc7d614683ff
 MD5 (patch-ab) = 1be0d48b1e41fea46ee459a320fb11c7
 MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf
diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa
index 1778f982116..94cd5e7bc56 100644
--- a/devel/libgtop/patches/patch-aa
+++ b/devel/libgtop/patches/patch-aa
@@ -1,36 +1,35 @@
-$NetBSD: patch-aa,v 1.6 1999/08/30 08:54:03 jlam Exp $
+$NetBSD: patch-aa,v 1.7 1999/10/22 23:47:58 tron Exp $
 
---- configure.orig	Thu May 27 20:43:55 1999
-+++ configure	Sun Aug 29 18:59:43 1999
-@@ -2466,6 +2466,7 @@
- USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
+--- configure.orig	Wed Sep 29 02:47:35 1999
++++ configure	Sat Oct 23 00:27:20 1999
+@@ -2254,6 +2254,7 @@
  
- # Always use our own libtool.
-+if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
  # Check for any special flags to pass to ltconfig.
-@@ -2697,6 +2698,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; }
++if false; then
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+@@ -2406,6 +2407,7 @@
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -5116,7 +5118,7 @@
- 
+@@ -5627,6 +5629,7 @@
+ rm -f confcache
  
  
--
 +if false; then
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+@@ -5651,6 +5654,7 @@
+ 
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -5349,6 +5351,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
  
  # Redirect the config.log output again, so that the ltconfig log is not
diff --git a/devel/libgtop/pkg/PLIST b/devel/libgtop/pkg/PLIST
index 606228e9864..dd70fe67033 100644
--- a/devel/libgtop/pkg/PLIST
+++ b/devel/libgtop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 1999/08/30 08:54:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 1999/10/22 23:47:59 tron Exp $
 bin/libgtop-config
 bin/libgtop_daemon
 bin/libgtop_server
@@ -51,22 +51,23 @@ info/libgtop.info
 @exec install-info %D/info/libgtop.info %D/info/dir
 lib/libgtop-features.def
 lib/libgtop.a
-lib/libgtop.so.1.1
+lib/libgtop.so.1.4
 lib/libgtopConf.sh
 lib/libgtop_common.a
-lib/libgtop_common.so.1.1
+lib/libgtop_common.so.1.4
 lib/libgtop_guile.a
-lib/libgtop_guile.so.1.1
+lib/libgtop_guile.so.1.4
 lib/libgtop_guile_names.a
-lib/libgtop_guile_names.so.1.1
+lib/libgtop_guile_names.so.1.4
 lib/libgtop_names.a
-lib/libgtop_names.so.1.1
+lib/libgtop_names.so.1.4
 lib/libgtop_suid_common.a
-lib/libgtop_suid_common.so.1.1
+lib/libgtop_suid_common.so.1.4
 lib/libgtop_sysdeps.a
-lib/libgtop_sysdeps.so.1.1
+lib/libgtop_sysdeps.so.1.4
 lib/libgtop_sysdeps_suid.a
-lib/libgtop_sysdeps_suid.so.1.1
+lib/libgtop_sysdeps_suid.so.1.4
+share/locale/da/LC_MESSAGES/libgtop.mo
 share/locale/de/LC_MESSAGES/libgtop.mo
 share/locale/es/LC_MESSAGES/libgtop.mo
 share/locale/es_DO/LC_MESSAGES/libgtop.mo
@@ -76,8 +77,12 @@ share/locale/es_MX/LC_MESSAGES/libgtop.mo
 share/locale/es_PA/LC_MESSAGES/libgtop.mo
 share/locale/es_PE/LC_MESSAGES/libgtop.mo
 share/locale/es_SV/LC_MESSAGES/libgtop.mo
+share/locale/fi/LC_MESSAGES/libgtop.mo
 share/locale/fr/LC_MESSAGES/libgtop.mo
 share/locale/ja/LC_MESSAGES/libgtop.mo
 share/locale/ko/LC_MESSAGES/libgtop.mo
 share/locale/no/LC_MESSAGES/libgtop.mo
+share/locale/nl/LC_MESSAGES/libgtop.mo
+share/locale/pl/LC_MESSAGES/libgtop.mo
+share/locale/sv/LC_MESSAGES/libgtop.mo
 @dirrm include/glibtop