5 files changed, 27 insertions, 42 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 23309c6bfe87..4ac81aba8756 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	libgtop
-# Version required:		1.1.0
+# Version required:		1.0.6
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	libgtop-1.1.0
+DISTNAME=	libgtop-1.0.6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libgtop
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 65fd653f653c..54e8fe6b3247 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.1.0.tar.gz) = 680c7e0f9ce17f937038e835e805f97a
+MD5 (libgtop-1.0.6.tar.gz) = ad63df637697915b5326494a0ae4a337
diff --git a/devel/libgtop/files/patch-ab b/devel/libgtop/files/patch-ab
index 9d436834f449..3072888d0891 100644
--- a/devel/libgtop/files/patch-ab
+++ b/devel/libgtop/files/patch-ab
@@ -9,27 +9,18 @@
  
  
  EXTRA_DIST = server_config.h.in server_config.pl
---- Makefile.in.orig	Mon May 31 08:47:42 1999
-+++ Makefile.in	Mon Jul 12 12:54:34 1999
-@@ -182,7 +182,7 @@
+--- Makefile.in.orig	Tue Oct 19 06:04:23 1999
++++ Makefile.in	Tue Oct 26 11:42:07 1999
+@@ -187,7 +187,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 RELNOTES-1.0.x libgtop-sysdeps.m4 README 	libgtop-mirror.sh
  
  
- include_HEADERS = glibtop.h
--configincludedir = $(pkglibdir)/include
-+configincludedir = $(includedir)
- 
- 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 README NEWS.old libgtop-mirror.sh
- 
-@@ -192,7 +192,7 @@
- 
- BUILT_SOURCES = stamp-gc-h #note: not glibtop-config.h
- 
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = $(top_builddir)/libgtopConf.sh 		  $(top_builddir)/libgtop-features.def
  
  
-@@ -587,7 +587,7 @@
+@@ -558,7 +558,7 @@
  $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
  
  libgtopConf.sh: libgtopConf.sh.in Makefile
@@ -38,7 +29,7 @@
  	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
  	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
  	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-@@ -616,7 +616,7 @@
+@@ -587,7 +587,7 @@
  	  && mv libgtopConf.tmp libgtopConf.sh
  
  libgtop-config: libgtop-config.in Makefile
diff --git a/devel/libgtop/files/patch-ac b/devel/libgtop/files/patch-ac
index ce85ad183b59..9db028375fb8 100644
--- a/devel/libgtop/files/patch-ac
+++ b/devel/libgtop/files/patch-ac
@@ -1,5 +1,5 @@
---- configure.orig	Thu May 27 17:06:48 1999
-+++ configure	Mon Jul 12 12:56:26 1999
+--- configure.orig	Tue Oct 19 04:16:30 1999
++++ configure	Tue Oct 26 11:46:41 1999
 @@ -971,9 +971,9 @@
  
  # libtool versioning
@@ -13,7 +13,7 @@
  LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
  
  
-@@ -7895,7 +7895,7 @@
+@@ -8005,7 +8005,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -22,12 +22,3 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -10557,7 +10557,7 @@
- 
- 
- LIBGTOP_LIBS='-L$(libdir)'
--LIBGTOP_INCS='-I$(includedir) -I$(pkglibdir)/include'
-+LIBGTOP_INCS='-I$(includedir)'
- 
- if test x$libgtop_use_machine_h = xyes ; then
-   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 43f42ecc0390..7e55aba7dde8 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -1,13 +1,9 @@
+bin/libgtop-config
 bin/libgtop_daemon
 bin/libgtop_server
-bin/libgtop-config
-etc/libgtopConf.sh
 etc/libgtop-features.def
+etc/libgtopConf.sh
 include/glibtop.h
-include/glibtop-config.h
-include/glibtop_machine.h
-include/glibtop_server.h
-include/glibtop_suid.h
 include/glibtop/close.h
 include/glibtop/command.h
 include/glibtop/cpu.h
@@ -16,7 +12,6 @@ include/glibtop/fsusage.h
 include/glibtop/global.h
 include/glibtop/gnuserv.h
 include/glibtop/inodedb.h
-include/glibtop/limits.h
 include/glibtop/loadavg.h
 include/glibtop/mem.h
 include/glibtop/mountlist.h
@@ -49,6 +44,9 @@ include/glibtop/uptime.h
 include/glibtop/version.h
 include/glibtop/write.h
 include/glibtop/xmalloc.h
+include/glibtop_machine.h
+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
@@ -78,12 +76,8 @@ lib/libgtop_sysdeps_suid.so
 lib/libgtop_sysdeps_suid.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/locale/da/LC_MESSAGES/libgtop.mo
 share/locale/de/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/no/LC_MESSAGES/libgtop.mo
-share/locale/ko/LC_MESSAGES/libgtop.mo
 share/locale/es/LC_MESSAGES/libgtop.mo
 share/locale/es_DO/LC_MESSAGES/libgtop.mo
 share/locale/es_GT/LC_MESSAGES/libgtop.mo
@@ -92,4 +86,13 @@ 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/gl/LC_MESSAGES/libgtop.mo
+share/locale/ja/LC_MESSAGES/libgtop.mo
+share/locale/ko/LC_MESSAGES/libgtop.mo
+share/locale/nl/LC_MESSAGES/libgtop.mo
+share/locale/no/LC_MESSAGES/libgtop.mo
+share/locale/pl/LC_MESSAGES/libgtop.mo
+share/locale/sv/LC_MESSAGES/libgtop.mo
 @dirrm include/glibtop