Build fix from Kamil Rytarowski in PR pkg/49934.

While here set LICENSE.

4 files changed, 45 insertions, 2 deletions

diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
index 3c148454940..0bcbcc4ea81 100644
--- a/sysutils/libgtop/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2014/05/29 23:37:29 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2015/06/06 10:59:57 prlw1 Exp $
 
 DISTNAME=		libgtop-2.28.4
 PKGREVISION=		7
@@ -9,6 +9,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Library to retrieve system information, used in GNOME2
+LICENSE=		gnu-gpl-v2
 
 OSVERSION_SPECIFIC=	YES
 
diff --git a/sysutils/libgtop/distinfo b/sysutils/libgtop/distinfo
index 08eca1d9e40..c5deb4d0d37 100644
--- a/sysutils/libgtop/distinfo
+++ b/sysutils/libgtop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2013/02/26 15:54:16 jperkin Exp $
+$NetBSD: distinfo,v 1.29 2015/06/06 10:59:57 prlw1 Exp $
 
 SHA1 (libgtop-2.28.4.tar.bz2) = b6f002cc80a61dc0908dd96e0b543113a46bc4b7
 RMD160 (libgtop-2.28.4.tar.bz2) = 96ac76aa409bbd202bedacd94df14cd549e10d6b
@@ -36,6 +36,8 @@ SHA1 (patch-dk) = c95e5aa709dff7685af03f19e830d15fd17c0315
 SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a
 SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50
 SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb
+SHA1 (patch-sysdeps_bsd_sem_limits.c) = 0cdc5e85a4d8d1297f2f658c1f345bf54abfb02c
+SHA1 (patch-sysdeps_bsd_shm_limits.c) = 2750d6b5c440f6071111c62ef1069d07867edcf2
 SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8
 SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726
 SHA1 (patch-sysdeps_solaris_procopenfiles.c) = 8aef9e53cdd9d2e13a964e0cde43e71b507fcfa5
diff --git a/sysutils/libgtop/patches/patch-sysdeps_bsd_sem_limits.c b/sysutils/libgtop/patches/patch-sysdeps_bsd_sem_limits.c
new file mode 100644
index 00000000000..7a8b779581c
--- /dev/null
+++ b/sysutils/libgtop/patches/patch-sysdeps_bsd_sem_limits.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-sysdeps_bsd_sem_limits.c,v 1.1 2015/06/06 10:59:57 prlw1 Exp $
+
+struct seminfo is available without the need for _KERNEL.
+
+--- sysdeps/bsd/sem_limits.c.orig	2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/bsd/sem_limits.c
+@@ -45,11 +45,13 @@ glibtop_get_sem_limits_p (glibtop *serve
+ 
+ /* #define KERNEL to get declaration of `struct seminfo'. */
+ 
++#ifndef __NetBSD__
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
+ #define KERNEL 1
+ #else
+ #define _KERNEL 1
+ #endif
++#endif
+ 
+ #include <sys/ipc.h>
+ #include <sys/sem.h>
diff --git a/sysutils/libgtop/patches/patch-sysdeps_bsd_shm_limits.c b/sysutils/libgtop/patches/patch-sysdeps_bsd_shm_limits.c
new file mode 100644
index 00000000000..327626da543
--- /dev/null
+++ b/sysutils/libgtop/patches/patch-sysdeps_bsd_shm_limits.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-sysdeps_bsd_shm_limits.c,v 1.1 2015/06/06 10:59:57 prlw1 Exp $
+
+struct shminfo is available without the need for _KERNEL.
+
+--- sysdeps/bsd/shm_limits.c.orig	2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/bsd/shm_limits.c
+@@ -45,11 +45,13 @@ glibtop_get_shm_limits_p (glibtop *serve
+ 
+ /* #define KERNEL to get declaration of `struct shminfo'. */
+ 
++#ifndef __NetBSD__
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
+ #define KERNEL 1
+ #else
+ #define _KERNEL 1
+ #endif
++#endif
+ 
+ #include <sys/ipc.h>
+ #include <sys/shm.h>