6 files changed, 132 insertions, 61 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index aafc98ffce53..f454bebf33d9 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgtop
-PORTVERSION=	1.0.12
-PORTREVISION=	1
+PORTVERSION=	1.0.13
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libgtop
@@ -19,9 +18,8 @@ LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOMELIBS=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index d3030c0e1e50..d3d38c4652e1 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.12.tar.gz) = ac2cbd0245845dc13bfe262fd6a5577a
+MD5 (libgtop-1.0.13.tar.gz) = 305abba436c212f50d4be28464a14452
diff --git a/devel/libgtop/files/patch-ab b/devel/libgtop/files/patch-ab
index c1b39624b2fe..6c8bb313de70 100644
--- a/devel/libgtop/files/patch-ab
+++ b/devel/libgtop/files/patch-ab
@@ -1,6 +1,9 @@
---- Makefile.in.orig	Tue Oct 19 06:04:23 1999
-+++ Makefile.in	Tue Oct 26 11:42:07 1999
-@@ -187,7 +187,7 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Mon Jan 28 16:22:04 2002
++++ Makefile.in	Mon Jan 28 16:23:07 2002
+@@ -193,7 +193,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
  
  
@@ -9,16 +12,16 @@
  confexec_DATA = $(top_builddir)/libgtopConf.sh 		  $(top_builddir)/libgtop-features.def
  
  
-@@ -558,7 +558,7 @@
- $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
+@@ -565,7 +565,7 @@
+ $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
  
  libgtopConf.sh: libgtopConf.sh.in Makefile
 -	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
 +	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
- 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
+ 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-1.0#g' \
  	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
  	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-@@ -587,7 +587,7 @@
+@@ -594,7 +594,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 f2e96066aab2..586694a034dd 100644
--- a/devel/libgtop/files/patch-ac
+++ b/devel/libgtop/files/patch-ac
@@ -1,6 +1,24 @@
---- configure.orig	Tue Oct 19 04:16:30 1999
-+++ configure	Tue Oct 26 11:46:41 1999
-@@ -971,9 +971,9 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Jan 28 16:26:32 2002
++++ configure	Mon Jan 28 16:34:25 2002
+@@ -1260,10 +1260,10 @@
+ 
+ # The aliases save the names the user supplied, while $host etc.
+ # will get canonicalized.
+-test -n "$target_alias" &&
+-  test "$program_prefix$program_suffix$program_transform_name" = \
+-    NONENONEs,x,x, &&
+-  program_prefix=${target_alias}-
++#test -n "$target_alias" &&
++#  test "$program_prefix$program_suffix$program_transform_name" = \
++#    NONENONEs,x,x, &&
++#  program_prefix=${target_alias}-
+ 
+ # Extract the first word of "dc", so it can be a program name with args.
+ set dummy dc; ac_word=$2
+@@ -1580,9 +1580,9 @@
  
  # libtool versioning
  LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
@@ -12,4 +30,4 @@
 +LT_AGE=0
  LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
  
- 
+ if test x = y; then
diff --git a/devel/libgtop/files/patch-ltmain.sh b/devel/libgtop/files/patch-ltmain.sh
new file mode 100644
index 000000000000..3284d88e43f0
--- /dev/null
+++ b/devel/libgtop/files/patch-ltmain.sh
@@ -0,0 +1,42 @@
+
+$FreeBSD$
+
+--- ltmain.sh.orig	Sun Jan 20 16:11:07 2002
++++ ltmain.sh	Thu Jan 24 17:07:06 2002
+@@ -1058,8 +1058,13 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compiler_flags="$compiler_flags -pthread"
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2442,6 +2447,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4208,10 +4216,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index fde69f134d3c..2cb9702124e1 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -3,50 +3,50 @@ bin/libgtop_daemon
 bin/libgtop_server
 etc/libgtop-features.def
 etc/libgtopConf.sh
-include/glibtop.h
-include/glibtop/close.h
-include/glibtop/command.h
-include/glibtop/cpu.h
-include/glibtop/error.h
-include/glibtop/fsusage.h
-include/glibtop/global.h
-include/glibtop/gnuserv.h
-include/glibtop/inodedb.h
-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
-include/glibtop/procmem.h
-include/glibtop/procsegment.h
-include/glibtop/procsignal.h
-include/glibtop/procstate.h
-include/glibtop/proctime.h
-include/glibtop/procuid.h
-include/glibtop/read.h
-include/glibtop/read_data.h
-include/glibtop/sem_limits.h
-include/glibtop/shm_limits.h
-include/glibtop/signal.h
-include/glibtop/swap.h
-include/glibtop/sysdeps.h
-include/glibtop/sysinfo.h
-include/glibtop/types.h
-include/glibtop/union.h
-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
+include/libgtop-1.0/glibtop.h
+include/libgtop-1.0/glibtop/close.h
+include/libgtop-1.0/glibtop/command.h
+include/libgtop-1.0/glibtop/cpu.h
+include/libgtop-1.0/glibtop/error.h
+include/libgtop-1.0/glibtop/fsusage.h
+include/libgtop-1.0/glibtop/global.h
+include/libgtop-1.0/glibtop/gnuserv.h
+include/libgtop-1.0/glibtop/inodedb.h
+include/libgtop-1.0/glibtop/loadavg.h
+include/libgtop-1.0/glibtop/mem.h
+include/libgtop-1.0/glibtop/mountlist.h
+include/libgtop-1.0/glibtop/msg_limits.h
+include/libgtop-1.0/glibtop/netload.h
+include/libgtop-1.0/glibtop/open.h
+include/libgtop-1.0/glibtop/parameter.h
+include/libgtop-1.0/glibtop/ppp.h
+include/libgtop-1.0/glibtop/procargs.h
+include/libgtop-1.0/glibtop/prockernel.h
+include/libgtop-1.0/glibtop/proclist.h
+include/libgtop-1.0/glibtop/procmap.h
+include/libgtop-1.0/glibtop/procmem.h
+include/libgtop-1.0/glibtop/procsegment.h
+include/libgtop-1.0/glibtop/procsignal.h
+include/libgtop-1.0/glibtop/procstate.h
+include/libgtop-1.0/glibtop/proctime.h
+include/libgtop-1.0/glibtop/procuid.h
+include/libgtop-1.0/glibtop/read.h
+include/libgtop-1.0/glibtop/read_data.h
+include/libgtop-1.0/glibtop/sem_limits.h
+include/libgtop-1.0/glibtop/shm_limits.h
+include/libgtop-1.0/glibtop/signal.h
+include/libgtop-1.0/glibtop/swap.h
+include/libgtop-1.0/glibtop/sysdeps.h
+include/libgtop-1.0/glibtop/sysinfo.h
+include/libgtop-1.0/glibtop/types.h
+include/libgtop-1.0/glibtop/union.h
+include/libgtop-1.0/glibtop/uptime.h
+include/libgtop-1.0/glibtop/version.h
+include/libgtop-1.0/glibtop/write.h
+include/libgtop-1.0/glibtop/xmalloc.h
+include/libgtop-1.0/glibtop_machine.h
+include/libgtop-1.0/glibtop_server.h
+include/libgtop-1.0/glibtop_suid.h
 @unexec install-info --delete %D/info/libgtop.info %D/info/dir
 info/libgtop.info
 @exec install-info --section="Programming \& development tools" --entry="* libgtop: (libgtop).	libgtop programming manual" %D/info/libgtop.info %D/info/dir
@@ -75,6 +75,7 @@ lib/libgtop_sysdeps_suid.a
 lib/libgtop_sysdeps_suid.so
 lib/libgtop_sysdeps_suid.so.1
 share/locale/az/LC_MESSAGES/libgtop.mo
+share/locale/ca/LC_MESSAGES/libgtop.mo
 share/locale/da/LC_MESSAGES/libgtop.mo
 share/locale/de/LC_MESSAGES/libgtop.mo
 share/locale/el/LC_MESSAGES/libgtop.mo
@@ -88,14 +89,23 @@ 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/ga/LC_MESSAGES/libgtop.mo
 share/locale/gl/LC_MESSAGES/libgtop.mo
+share/locale/hu/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/pt/LC_MESSAGES/libgtop.mo
 share/locale/pt_BR/LC_MESSAGES/libgtop.mo
+share/locale/ru/LC_MESSAGES/libgtop.mo
 share/locale/sk/LC_MESSAGES/libgtop.mo
 share/locale/sl/LC_MESSAGES/libgtop.mo
 share/locale/sv/LC_MESSAGES/libgtop.mo
-@dirrm include/glibtop
+share/locale/tr/LC_MESSAGES/libgtop.mo
+share/locale/uk/LC_MESSAGES/libgtop.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/libgtop.mo
+share/locale/zh_TW/LC_MESSAGES/libgtop.mo
+@dirrm include/libgtop-1.0/glibtop
+@dirrm include/libgtop-1.0