Re: pkg/49934: libgtop doesn't build after the sysvcompat modularization

["Kamil Rytarowski" <n54%gmx.com@localhost>]

The following reply was made to PR pkg/49934; it has been noted by GNATS.

From: "Kamil Rytarowski" <n54%gmx.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: pgoyette%NetBSD.org@localhost
Subject: Re: pkg/49934: libgtop doesn't build after the sysvcompat
 modularization
Date: Sat, 30 May 2015 21:11:34 +0200

 I was asked to clean up the patch.
 
 Index: distinfo
 ===================================================================
 RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/distinfo,v
 retrieving revision 1.28
 diff -u -r1.28 distinfo
 --- distinfo	26 Feb 2013 15:54:16 -0000	1.28
 +++ distinfo	30 May 2015 17:16:12 -0000
 @@ -36,6 +36,8 @@
  SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a
  SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50
  SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb
 +SHA1 (patch-sysdeps_bsd_sem__limits.c) = 4f21d01b86f415e42fc5d4d0b6446ae8d3e8fee8
 +SHA1 (patch-sysdeps_bsd_shm__limits.c) = 7b96f6b3084354dc105cececba0b1a0ce7704151
  SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8
  SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726
  SHA1 (patch-sysdeps_solaris_procopenfiles.c) = 8aef9e53cdd9d2e13a964e0cde43e71b507fcfa5
 Index: patches/patch-sysdeps_bsd_sem__limits.c
 ===================================================================
 RCS file: patches/patch-sysdeps_bsd_sem__limits.c
 diff -N patches/patch-sysdeps_bsd_sem__limits.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ patches/patch-sysdeps_bsd_sem__limits.c	30 May 2015 16:47:50 -0000
 @@ -0,0 +1,15 @@
 +$NetBSD$
 +
 +--- sysdeps/bsd/sem_limits.c.orig	2011-06-01 15:40:47.000000000 +0000
 ++++ sysdeps/bsd/sem_limits.c
 +@@ -47,7 +47,9 @@ glibtop_get_sem_limits_p (glibtop *serve
 + 
 + #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
 + #define KERNEL 1
 +-#else
 ++#elif !defined(__NetBSD__)
 ++/* it's public on NetBSD, defining it here intruduces problems,
 ++ * including <sys/sysctl.h> without _KERNEL defined and then <sys/ipc.h> with _KERNEL defined is fatal */
 + #define _KERNEL 1
 + #endif
 + 
 Index: patches/patch-sysdeps_bsd_shm__limits.c
 ===================================================================
 RCS file: patches/patch-sysdeps_bsd_shm__limits.c
 diff -N patches/patch-sysdeps_bsd_shm__limits.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ patches/patch-sysdeps_bsd_shm__limits.c	30 May 2015 16:47:50 -0000
 @@ -0,0 +1,20 @@
 +$NetBSD$
 +
 +--- sysdeps/bsd/shm_limits.c.orig	2011-06-01 15:40:47.000000000 +0000
 ++++ sysdeps/bsd/shm_limits.c
 +@@ -47,7 +47,9 @@ glibtop_get_shm_limits_p (glibtop *serve
 + 
 + #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
 + #define KERNEL 1
 +-#else
 ++#elif !defined(__NetBSD__)
 ++/* it's public on NetBSD, defining it here intruduces problems,
 ++ * including <sys/sysctl.h> without _KERNEL defined and then <sys/ipc.h> with _KERNEL defined is fatal */
 + #define _KERNEL 1
 + #endif
 + 
 +@@ -111,4 +113,3 @@ glibtop_get_shm_limits_p (glibtop *serve
 + }
 + 
 + #endif /* either a newer BSDI or no BSDI at all. */
 +-