Update libgtop to 2.31.4.

freebsd · Aug 13, 2015 · 422a418 · 422a418
1 parent 944caa7
commit 422a418
Show file tree

Hide file tree

Showing 6 changed files with 148 additions and 188 deletions.
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
@@ -1,24 +1,22 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/libgtop/Makefile 19959 2014-10-15 14:06:28Z kwm $
 
 PORTNAME=	libgtop
-PORTVERSION=	2.30.0
-PORTREVISION=	4
+PORTVERSION=	2.31.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 top library
+COMMENT=	GNOME top library
 
 USE_PERL5=	build
 USE_XORG=	xau
 USES=		gettext gmake libtool makeinfo pathfix perl5 pkgconfig tar:xz
 USE_GNOME=	gnomeprefix glib20 intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib -lutil
+#LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--enable-introspection
 

diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgtop-2.30.0.tar.xz) = 463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5
-SIZE (gnome2/libgtop-2.30.0.tar.xz) = 664476
+SHA256 (gnome2/libgtop-2.31.4.tar.xz) = 5bbef0e638a1e77d004be0e28cbd4735af4a067ee57c6f01eba2735e9b541c97
+SIZE (gnome2/libgtop-2.31.4.tar.xz) = 664492
diff --git a/devel/libgtop/files/patch-config.h.in b/devel/libgtop/files/patch-config.h.in
@@ -1,10 +1,10 @@
---- config.h.in.orig	2008-12-06 16:05:23.000000000 -0500
-+++ config.h.in	2008-12-06 16:05:27.000000000 -0500
+--- config.h.in.orig	2015-08-13 20:06:02.824731000 +0200
++++ config.h.in	2015-08-13 20:07:06.011319000 +0200
 @@ -115,6 +115,9 @@
  /* defined if you have linux/isdn.h */
  #undef HAVE_ISDN_H
 
-+/* Define if you have the kinfo_getfile function */
++/* defined if you have kinfo_getfile in -lutil */
 +#undef HAVE_KINFO_GETFILE
 +
  /* Define to 1 if you have the `lchown' function. */

diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure
@@ -1,21 +1,17 @@
---- configure.orig	2014-04-29 10:12:29.633996234 +0000
-+++ configure	2014-04-29 10:14:19.976988652 +0000
-@@ -13638,6 +13638,79 @@
+--- configure.orig	2015-08-13 20:06:09.161030000 +0200
++++ configure	2015-08-13 20:07:04.020683000 +0200
+@@ -14503,6 +14503,57 @@
 
- done
+ fi
 
-+               { 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getfile in -lutil" >&5
++$as_echo_n "checking for kinfo_getfile in -lutil... " >&6; }
++if ${ac_cv_lib_util_kinfo_getfile+:} false; then :
++  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lutil  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Override any GCC internal prototype to avoid an error.
@@ -33,50 +29,32 @@
 +  return 0;
 +}
 +_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  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 -s conftest$ac_exeext &&
-+	       $as_test_x conftest$ac_exeext; then
++if ac_fn_c_try_link "$LINENO"; 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
++rm -f core conftest.err conftest.$ac_objext \
++    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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_kinfo_getfile" >&5
++$as_echo "$ac_cv_lib_util_kinfo_getfile" >&6; }
++if test "x$ac_cv_lib_util_kinfo_getfile" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBUTIL 1
 +_ACEOF
-+  
-+else
-+  :
++
++  LIBS="-lutil $LIBS"
++
 +fi
 +
++if test xac_cv_lib_kinfo_getfile_util = xyes ; then
++
++$as_echo "#define HAVE_KINFO_GETFILE 1" >>confdefs.h
++
++fi
 +
- 	  { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+ if ${ac_cv_c_const+:} false; then :