Update to version 1.1.0.

PR:		12781 (6 of 19)
Submitted by:	Ade Lovett <ade@lovett.com>

10 files changed, 74 insertions, 26 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 621ea55..a0c28de 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	libgtop
-# Version required:		1.0.1
+# Version required:		1.1.0
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.18 1999/04/08 18:08:32 steve Exp $
+# $Id: Makefile,v 1.19 1999/05/30 03:45:34 steve Exp $
 #
 
-DISTNAME=	libgtop-1.0.1
+DISTNAME=	libgtop-1.1.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libgtop
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index b94d8e6..65fd653 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219
+MD5 (libgtop-1.1.0.tar.gz) = 680c7e0f9ce17f937038e835e805f97a
diff --git a/devel/libgtop/files/patch-ab b/devel/libgtop/files/patch-ab
index 54222f5..9d43683 100644
--- a/devel/libgtop/files/patch-ab
+++ b/devel/libgtop/files/patch-ab
@@ -9,18 +9,27 @@
  
  
  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
+--- Makefile.in.orig	Mon May 31 08:47:42 1999
++++ Makefile.in	Mon Jul 12 12:54:34 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
  
  
+ 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
  
  
-@@ -550,7 +550,7 @@
+@@ -587,7 +587,7 @@
  $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
  
  libgtopConf.sh: libgtopConf.sh.in Makefile
@@ -29,7 +38,7 @@
  	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
  	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
  	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-@@ -579,7 +579,7 @@
+@@ -616,7 +616,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 4669680..ce85ad1 100644
--- a/devel/libgtop/files/patch-ac
+++ b/devel/libgtop/files/patch-ac
@@ -1,6 +1,6 @@
---- configure.orig	Sun Feb 28 13:10:54 1999
-+++ configure	Tue Mar  2 18:33:43 1999
-@@ -965,9 +965,9 @@
+--- configure.orig	Thu May 27 17:06:48 1999
++++ configure	Mon Jul 12 12:56:26 1999
+@@ -971,9 +971,9 @@
  
  # libtool versioning
  LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
@@ -13,7 +13,7 @@
  LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
  
  
-@@ -7698,7 +7698,7 @@
+@@ -7895,7 +7895,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -22,3 +22,12 @@
  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 2d0b33f..43f42ec 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -4,6 +4,7 @@ bin/libgtop-config
 etc/libgtopConf.sh
 etc/libgtop-features.def
 include/glibtop.h
+include/glibtop-config.h
 include/glibtop_machine.h
 include/glibtop_server.h
 include/glibtop_suid.h
@@ -15,6 +16,7 @@ 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
@@ -47,6 +49,9 @@ include/glibtop/uptime.h
 include/glibtop/version.h
 include/glibtop/write.h
 include/glibtop/xmalloc.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
 lib/libgtop.a
 lib/libgtop.so
 lib/libgtop.so.1
@@ -74,6 +79,7 @@ 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/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
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 621ea55..a0c28de 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	libgtop
-# Version required:		1.0.1
+# Version required:		1.1.0
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.18 1999/04/08 18:08:32 steve Exp $
+# $Id: Makefile,v 1.19 1999/05/30 03:45:34 steve Exp $
 #
 
-DISTNAME=	libgtop-1.0.1
+DISTNAME=	libgtop-1.1.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libgtop
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index b94d8e6..65fd653 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219
+MD5 (libgtop-1.1.0.tar.gz) = 680c7e0f9ce17f937038e835e805f97a
diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab
index 54222f5..9d43683 100644
--- a/devel/libgtop2/files/patch-ab
+++ b/devel/libgtop2/files/patch-ab
@@ -9,18 +9,27 @@
  
  
  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
+--- Makefile.in.orig	Mon May 31 08:47:42 1999
++++ Makefile.in	Mon Jul 12 12:54:34 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
  
  
+ 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
  
  
-@@ -550,7 +550,7 @@
+@@ -587,7 +587,7 @@
  $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
  
  libgtopConf.sh: libgtopConf.sh.in Makefile
@@ -29,7 +38,7 @@
  	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
  	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
  	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-@@ -579,7 +579,7 @@
+@@ -616,7 +616,7 @@
  	  && mv libgtopConf.tmp libgtopConf.sh
  
  libgtop-config: libgtop-config.in Makefile
diff --git a/devel/libgtop2/files/patch-ac b/devel/libgtop2/files/patch-ac
index 4669680..ce85ad1 100644
--- a/devel/libgtop2/files/patch-ac
+++ b/devel/libgtop2/files/patch-ac
@@ -1,6 +1,6 @@
---- configure.orig	Sun Feb 28 13:10:54 1999
-+++ configure	Tue Mar  2 18:33:43 1999
-@@ -965,9 +965,9 @@
+--- configure.orig	Thu May 27 17:06:48 1999
++++ configure	Mon Jul 12 12:56:26 1999
+@@ -971,9 +971,9 @@
  
  # libtool versioning
  LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
@@ -13,7 +13,7 @@
  LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
  
  
-@@ -7698,7 +7698,7 @@
+@@ -7895,7 +7895,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -22,3 +22,12 @@
  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/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 2d0b33f..43f42ec 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -4,6 +4,7 @@ bin/libgtop-config
 etc/libgtopConf.sh
 etc/libgtop-features.def
 include/glibtop.h
+include/glibtop-config.h
 include/glibtop_machine.h
 include/glibtop_server.h
 include/glibtop_suid.h
@@ -15,6 +16,7 @@ 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
@@ -47,6 +49,9 @@ include/glibtop/uptime.h
 include/glibtop/version.h
 include/glibtop/write.h
 include/glibtop/xmalloc.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
 lib/libgtop.a
 lib/libgtop.so
 lib/libgtop.so.1
@@ -74,6 +79,7 @@ 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/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