Update libgtop to 2.30.0.

Remove patch-sysdeps_freebsd_Makefile.in and
patch-sysdeps_freebsd_Makefile.in and add -lutils to LDFLAGS. Those
two patches should add -lutil if kinfo_getfile is detected instead
of adding -lutil to the LDFLAGS. Will try to bring back those
patches in the future and stop using the LDFLAGS solution.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19599 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 34 insertions, 54 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index c97e15069..4b59cd84f 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	libgtop
-PORTVERSION=	2.28.5
+PORTVERSION=	2.30.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -19,9 +19,9 @@ USE_GNOME=	gnomeprefix glib20 intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H -D_WANT_IFADDR
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -lutil
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--disable-introspection
+CONFIGURE_ARGS=	--enable-introspection
 
 INFO=		libgtop2
 
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 596bbf22b..ac73cba27 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgtop-2.28.5.tar.xz) = c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342
-SIZE (gnome2/libgtop-2.28.5.tar.xz) = 654828
+SHA256 (gnome2/libgtop-2.30.0.tar.xz) = 463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5
+SIZE (gnome2/libgtop-2.30.0.tar.xz) = 664476
diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure
index 5c7cb8a2a..7ff8677ab 100644
--- a/devel/libgtop/files/patch-configure
+++ b/devel/libgtop/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig	2011-03-30 10:06:27.000000000 +0200
-+++ configure	2011-03-30 10:07:52.000000000 +0200
-@@ -13230,6 +13230,78 @@
- 		if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
- 		    EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
- 		fi
-+		{ echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
+--- configure.orig	2014-04-29 10:12:29.633996234 +0000
++++ configure	2014-04-29 10:14:19.976988652 +0000
+@@ -13638,6 +13638,79 @@
+ 
+ done
+ 
++               { echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
 +echo $ECHO_N "checking for kinfo_getfile in -lutil... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_util_kinfo_getfile+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -47,35 +47,36 @@
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
++        test -z "$ac_c_werror_flag" ||
++        test ! -s conftest.err
 +       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++	       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_util_kinfo_getfile=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
-+	ac_cv_lib_util_kinfo_getfile=no
++       ac_cv_lib_util_kinfo_getfile=no
 +fi
-+
++ 
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
++	      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_kinfo_getfile" >&5
 +echo "${ECHO_T}$ac_cv_lib_util_kinfo_getfile" >&6; }
 +if test $ac_cv_lib_util_kinfo_getfile = yes; then
 +  EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
-+
++  
 +cat >>confdefs.h <<\_ACEOF
 +#define HAVE_KINFO_GETFILE 1
 +_ACEOF
-+
++  
 +else
 +  :
 +fi
 +
- 		;;
-           esac
- 
++
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for I4B" >&5
+ $as_echo_n "checking for I4B... " >&6; }
+ 	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/devel/libgtop/files/patch-libgtop-sysdeps.m4 b/devel/libgtop/files/patch-libgtop-sysdeps.m4
deleted file mode 100644
index 1805da02a..000000000
--- a/devel/libgtop/files/patch-libgtop-sysdeps.m4
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgtop-sysdeps.m4.orig	2008-04-21 14:58:38.000000000 -0400
-+++ libgtop-sysdeps.m4	2008-12-06 16:16:00.000000000 -0500
-@@ -158,6 +160,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
- 		if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
- 		    EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
- 		fi
-+		AC_CHECK_LIB(util, kinfo_getfile,
-+			[EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
-+			 AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
- 		;;
-           esac
- 
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_open.c
deleted file mode 100644
index 985caa1f4..000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_open.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- sysdeps/freebsd/open.c.orig	2011-07-24 15:13:56.000000000 -0400
-+++ sysdeps/freebsd/open.c	2011-12-28 16:26:48.000000000 -0500
-@@ -42,11 +42,5 @@ glibtop_open_s (glibtop *server, const c
- 	sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
- 	server->real_ncpu = ncpus - 1;
- 	server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
--
--#if defined(__FreeBSD_kernel__)
--	server->os_version_code = __FreeBSD_kernel_version;
--#else
- 	server->os_version_code = __FreeBSD_version;
--#endif
--
- }
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index d845a4de1..fe30e7870 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -47,15 +47,17 @@ include/libgtop-2.0/glibtop_private.h
 include/libgtop-2.0/glibtop_server.h
 include/libgtop-2.0/glibtop_suid.h
 include/libgtop-2.0/libgtopconfig.h
+lib/girepository-1.0/GTop-2.0.typelib
 lib/libgtop-2.0.a
 lib/libgtop-2.0.la
 lib/libgtop-2.0.so
-lib/libgtop-2.0.so.7
-lib/libgtop-2.0.so.7.2.0
+lib/libgtop-2.0.so.10
+lib/libgtop-2.0.so.10.0.0
 libdata/pkgconfig/libgtop-2.0.pc
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left-insensitive.png
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/libgtop-Close.html
 %%DOCSDIR%%/libgtop-Command.html
@@ -64,6 +66,9 @@ libdata/pkgconfig/libgtop-2.0.pc
 %%DOCSDIR%%/libgtop-Net-List.html
 %%DOCSDIR%%/libgtop-Net-Load.html
 %%DOCSDIR%%/libgtop-PPP.html
+%%DOCSDIR%%/libgtop-Process-Arguments.html
+%%DOCSDIR%%/libgtop-Process-List.html
+%%DOCSDIR%%/libgtop-Process-Time.html
 %%DOCSDIR%%/libgtop-Shared-Memory-Limits.html
 %%DOCSDIR%%/libgtop-Uptime.html
 %%DOCSDIR%%/libgtop-cpu.html
@@ -75,16 +80,13 @@ libdata/pkgconfig/libgtop-2.0.pc
 %%DOCSDIR%%/libgtop-msg-limits.html
 %%DOCSDIR%%/libgtop-open.html
 %%DOCSDIR%%/libgtop-parameter.html
-%%DOCSDIR%%/libgtop-procargs.html
 %%DOCSDIR%%/libgtop-prockernel.html
-%%DOCSDIR%%/libgtop-proclist.html
 %%DOCSDIR%%/libgtop-procmap.html
 %%DOCSDIR%%/libgtop-procmem.html
 %%DOCSDIR%%/libgtop-procopenfiles.html
 %%DOCSDIR%%/libgtop-procsegment.html
 %%DOCSDIR%%/libgtop-procsignal.html
 %%DOCSDIR%%/libgtop-procstate.html
-%%DOCSDIR%%/libgtop-proctime.html
 %%DOCSDIR%%/libgtop-procuid.html
 %%DOCSDIR%%/libgtop-sem-limits.html
 %%DOCSDIR%%/libgtop-signal.html
@@ -96,9 +98,12 @@ libdata/pkgconfig/libgtop-2.0.pc
 %%DOCSDIR%%/libgtop-white-paper-overview.html
 %%DOCSDIR%%/libgtop-white-paper.html
 %%DOCSDIR%%/libgtop.devhelp2
+%%DOCSDIR%%/right-insensitive.png
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
+%%DOCSDIR%%/up-insensitive.png
 %%DOCSDIR%%/up.png
+share/gir-1.0/GTop-2.0.gir
 share/locale/am/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
 share/locale/as/LC_MESSAGES/libgtop-2.0.mo