Update to 2.28.5.

Add patch from ports to fix build on 11.0.
Stageify.


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

4 files changed, 44 insertions, 11 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 07eb922d0..ae0f9a0fd 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-#   $MCom: ports/trunk/devel/libgtop/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $FreeBSD: head/devel/libgtop/Makefile 330901 2013-10-19 16:21:20Z kwm $
+#   $MCom$
 
 PORTNAME=	libgtop
-PORTVERSION=	2.28.4
+PORTVERSION=	2.28.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -11,15 +11,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 top library
 
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_PERL5=	build
 USE_XORG=	xau
 USES=		gettext gmake pathfix perl5 pkgconfig
-USE_GNOME=	gnomeprefix glib20 ltverhack intlhack
+USE_GNOME=	gnomeprefix glib20 ltverhack intlhack introspection:build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H -D_WANT_IFADDR
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-introspection
 
@@ -31,8 +30,6 @@ post-configure:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
 
 post-install:
-	@${CHGRP} kmem ${PREFIX}/bin/libgtop_server2
-	@${CHMOD} 2555 ${PREFIX}/bin/libgtop_server2
-	@${CAT} ${PKGMESSAGE}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtop-2.0.so.7
 
 .include <bsd.port.mk>
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 96dc6955e..596bbf22b 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgtop-2.28.4.tar.xz) = b6619cfd1540267ee81d456d1a26c72c793261586f1b00a7b9a7a229d0abe1d8
-SIZE (gnome2/libgtop-2.28.4.tar.xz) = 653940
+SHA256 (gnome2/libgtop-2.28.5.tar.xz) = c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342
+SIZE (gnome2/libgtop-2.28.5.tar.xz) = 654828
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_netload.c b/devel/libgtop/files/patch-sysdeps_freebsd_netload.c
new file mode 100644
index 000000000..51cc5d237
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_netload.c
@@ -0,0 +1,32 @@
+--- sysdeps/freebsd/netload.c.orig	2013-11-13 14:46:58.000000000 -0500
++++ sysdeps/freebsd/netload.c	2013-11-13 15:01:52.000000000 -0500
+@@ -37,6 +37,7 @@
+ #include <net/if_types.h>
+ 
+ #ifdef HAVE_NET_IF_VAR_H
++#define _WANT_IFADDR 1
+ #include <net/if_var.h>
+ #endif
+ 
+@@ -116,7 +117,7 @@ glibtop_get_netload_p (glibtop *server, 
+         while (ifnetaddr)
+         {
+                 struct sockaddr_in *sin;
+-                register char *cp;
++                register uint8_t *cp;
+                 u_long ifaddraddr;
+ 
+                 {
+@@ -201,10 +202,10 @@ glibtop_get_netload_p (glibtop *server, 
+ 				continue;
+ 			}
+ 
+-#define CP(x) ((char *)(x))
++#define CP(x) ((uint8_t *)(x))
+                         cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
+                              CP(&ifaddr);
+-                        sa = (struct sockaddr *)cp;
++                        sa = (struct sockaddr *) cp;
+ 
+                         if (sa->sa_family == AF_LINK) {
+                                 struct sockaddr_dl *dl = (struct sockaddr_dl *) sa;
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 7f31d0731..0af76105b 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -1,5 +1,9 @@
 bin/libgtop_daemon2
+@group kmem
+@mode 2555
 bin/libgtop_server2
+@mode
+@group
 include/libgtop-2.0/glibtop.h
 include/libgtop-2.0/glibtop/close.h
 include/libgtop-2.0/glibtop/command.h