Fri Jun 23 16:42:05 2017 UTC ()
Correct build failure on NetBSD 8.99.1

Fallout from <sys/user.h> removal.


(kamil)
diff -r1.32 -r1.33 pkgsrc/sysutils/libgtop/distinfo
diff -r1.4 -r1.5 pkgsrc/sysutils/libgtop/patches/patch-ai
diff -r1.4 -r1.5 pkgsrc/sysutils/libgtop/patches/patch-an
diff -r1.6 -r1.7 pkgsrc/sysutils/libgtop/patches/patch-al
diff -r0 -r1.1 pkgsrc/sysutils/libgtop/patches/patch-sysdeps_bsd_glibtop__machine.h
diff -r0 -r1.1 pkgsrc/sysutils/libgtop/patches/patch-sysdeps_bsd_procmap.c
cvs diff -r1.32 -r1.33 pkgsrc/sysutils/libgtop/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/libgtop/distinfo 2016/04/28 22:18:58 1.32
+++ pkgsrc/sysutils/libgtop/distinfo 2017/06/23 16:42:05 1.33
@@ -1,48 +1,50 @@ @@ -1,48 +1,50 @@
1$NetBSD: distinfo,v 1.32 2016/04/28 22:18:58 jperkin Exp $ 1$NetBSD: distinfo,v 1.33 2017/06/23 16:42:05 kamil Exp $
2 2
3SHA1 (libgtop-2.28.4.tar.bz2) = b6f002cc80a61dc0908dd96e0b543113a46bc4b7 3SHA1 (libgtop-2.28.4.tar.bz2) = b6f002cc80a61dc0908dd96e0b543113a46bc4b7
4RMD160 (libgtop-2.28.4.tar.bz2) = 96ac76aa409bbd202bedacd94df14cd549e10d6b 4RMD160 (libgtop-2.28.4.tar.bz2) = 96ac76aa409bbd202bedacd94df14cd549e10d6b
5SHA512 (libgtop-2.28.4.tar.bz2) = 3bfb844eb09e4afed1f15f2d948fe09bf2080be52f3914a35aebd026cc61576de16d5b3beebe293bb1141a1a4aee23a474fba0f2322ea861368940880aeafe1c 5SHA512 (libgtop-2.28.4.tar.bz2) = 3bfb844eb09e4afed1f15f2d948fe09bf2080be52f3914a35aebd026cc61576de16d5b3beebe293bb1141a1a4aee23a474fba0f2322ea861368940880aeafe1c
6Size (libgtop-2.28.4.tar.bz2) = 819576 bytes 6Size (libgtop-2.28.4.tar.bz2) = 819576 bytes
7SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc 7SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc
8SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161 8SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161
9SHA1 (patch-ac) = dc45ad98e21de821b4b23008cd0020c47064c9eb 9SHA1 (patch-ac) = dc45ad98e21de821b4b23008cd0020c47064c9eb
10SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e 10SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e
11SHA1 (patch-ae) = 6e8386473dde21f316f867b5212d8c3324abb747 11SHA1 (patch-ae) = 6e8386473dde21f316f867b5212d8c3324abb747
12SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf 12SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf
13SHA1 (patch-ai) = 856c457b14e384b2c991bf51274f97a3a9c853f1 13SHA1 (patch-ai) = f797c8c4f25a61735f99459a418b0dbc9092dc56
14SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422 14SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422
15SHA1 (patch-al) = 8d69828a73fd8f87cef08786bc5c3cd864210da6 15SHA1 (patch-al) = c1dcfd4f6bd01d690b9a6b47cf38f146093ac0bb
16SHA1 (patch-am) = e69e9fd4ea90d2bb467050b5b4e8490baa162ef7 16SHA1 (patch-am) = e69e9fd4ea90d2bb467050b5b4e8490baa162ef7
17SHA1 (patch-an) = 169366e6dc034db05eb54d6abb1416889f17a8e2 17SHA1 (patch-an) = 4e28ddb3fa77fa62eeedde0d891a4b352cca2f3a
18SHA1 (patch-ao) = f58a1bd19d63377b86478e72f23bd5a4cca5af76 18SHA1 (patch-ao) = f58a1bd19d63377b86478e72f23bd5a4cca5af76
19SHA1 (patch-aq) = 1d6f04fa2674f66a5702847c03f4740074b5dd24 19SHA1 (patch-aq) = 1d6f04fa2674f66a5702847c03f4740074b5dd24
20SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914 20SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
21SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8 21SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
22SHA1 (patch-ca) = 06bc86bce721155315a1905b750f795629460ff7 22SHA1 (patch-ca) = 06bc86bce721155315a1905b750f795629460ff7
23SHA1 (patch-cb) = cabc971530d8113694ff6d04108490749d40bcec 23SHA1 (patch-cb) = cabc971530d8113694ff6d04108490749d40bcec
24SHA1 (patch-cc) = 2cb1d2da57a8622c93ed255a416ed9c811e775a2 24SHA1 (patch-cc) = 2cb1d2da57a8622c93ed255a416ed9c811e775a2
25SHA1 (patch-cd) = cf96896ddde9c830c1e808d8bf37b9fdb611ed24 25SHA1 (patch-cd) = cf96896ddde9c830c1e808d8bf37b9fdb611ed24
26SHA1 (patch-da) = 62c34addf08890cf1aa28a2604347f69e2c8ad0c 26SHA1 (patch-da) = 62c34addf08890cf1aa28a2604347f69e2c8ad0c
27SHA1 (patch-db) = 35174f7d45aeae95c33e440cae59830f7a964915 27SHA1 (patch-db) = 35174f7d45aeae95c33e440cae59830f7a964915
28SHA1 (patch-dc) = 3922128034b005f0b86c98abb3e10c1b1d5107ac 28SHA1 (patch-dc) = 3922128034b005f0b86c98abb3e10c1b1d5107ac
29SHA1 (patch-dd) = 7f35b3263189d43473adc0ac13244159b58ac9ff 29SHA1 (patch-dd) = 7f35b3263189d43473adc0ac13244159b58ac9ff
30SHA1 (patch-de) = 85c5cb3d1185c8cc68ab09c7d16ed39e22a12093 30SHA1 (patch-de) = 85c5cb3d1185c8cc68ab09c7d16ed39e22a12093
31SHA1 (patch-df) = 8c1dab41b7449a2c706792036cf393553cebf9f0 31SHA1 (patch-df) = 8c1dab41b7449a2c706792036cf393553cebf9f0
32SHA1 (patch-dg) = b10933f50a1561d211afb6e817be9613cab37607 32SHA1 (patch-dg) = b10933f50a1561d211afb6e817be9613cab37607
33SHA1 (patch-dh) = 1c07bccae7a69974e4ab38ffc9ee74b3f10c4ba4 33SHA1 (patch-dh) = 1c07bccae7a69974e4ab38ffc9ee74b3f10c4ba4
34SHA1 (patch-di) = 95a8566cc319f6f00510135902f921e3e0686ad4 34SHA1 (patch-di) = 95a8566cc319f6f00510135902f921e3e0686ad4
35SHA1 (patch-dj) = 8389a0c6ca45e509022aa6bdbba51800bb57c4db 35SHA1 (patch-dj) = 8389a0c6ca45e509022aa6bdbba51800bb57c4db
36SHA1 (patch-dk) = c95e5aa709dff7685af03f19e830d15fd17c0315 36SHA1 (patch-dk) = c95e5aa709dff7685af03f19e830d15fd17c0315
37SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a 37SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a
38SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50 38SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50
39SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb 39SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb
 40SHA1 (patch-sysdeps_bsd_glibtop__machine.h) = 1682156e3cb21d335499e38b6b91b8c315f1b962
 41SHA1 (patch-sysdeps_bsd_procmap.c) = 8b65993423099040f20256ea8b3f797ecbca21b0
40SHA1 (patch-sysdeps_bsd_sem_limits.c) = 0cdc5e85a4d8d1297f2f658c1f345bf54abfb02c 42SHA1 (patch-sysdeps_bsd_sem_limits.c) = 0cdc5e85a4d8d1297f2f658c1f345bf54abfb02c
41SHA1 (patch-sysdeps_bsd_shm_limits.c) = 2750d6b5c440f6071111c62ef1069d07867edcf2 43SHA1 (patch-sysdeps_bsd_shm_limits.c) = 2750d6b5c440f6071111c62ef1069d07867edcf2
42SHA1 (patch-sysdeps_darwin_glibtop__suid.h) = 1887511f74e27c7ed628ae37d5eec173db71ee81 44SHA1 (patch-sysdeps_darwin_glibtop__suid.h) = 1887511f74e27c7ed628ae37d5eec173db71ee81
43SHA1 (patch-sysdeps_darwin_proclist.c) = ee8e4df9376f4516787ae2e25453de6d871357d2 45SHA1 (patch-sysdeps_darwin_proclist.c) = ee8e4df9376f4516787ae2e25453de6d871357d2
44SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8 46SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8
45SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726 47SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726
46SHA1 (patch-sysdeps_solaris_netlist.c) = f26cfcee588fc40ad550bcd219d9538d20095e62 48SHA1 (patch-sysdeps_solaris_netlist.c) = f26cfcee588fc40ad550bcd219d9538d20095e62
47SHA1 (patch-sysdeps_solaris_netload.c) = e4ba72bf3855621eab0c05918da2094165f158cb 49SHA1 (patch-sysdeps_solaris_netload.c) = e4ba72bf3855621eab0c05918da2094165f158cb
48SHA1 (patch-sysdeps_solaris_procopenfiles.c) = efd621e3e9e45ba65e7f2b1f7c94ffdb79b6d199 50SHA1 (patch-sysdeps_solaris_procopenfiles.c) = efd621e3e9e45ba65e7f2b1f7c94ffdb79b6d199
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/libgtop/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/sysutils/libgtop/patches/patch-ai 2007/11/05 19:06:04 1.4
+++ pkgsrc/sysutils/libgtop/patches/patch-ai 2017/06/23 16:42:05 1.5
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-ai,v 1.4 2007/11/05 19:06:04 drochner Exp $ 1$NetBSD: patch-ai,v 1.5 2017/06/23 16:42:05 kamil Exp $
2 2
3--- sysdeps/bsd/prockernel.c.orig 2007-04-27 00:27:34.000000000 +0200 3--- sysdeps/bsd/prockernel.c.orig 2011-06-01 15:40:47.000000000 +0000
4+++ sysdeps/bsd/prockernel.c 4+++ sysdeps/bsd/prockernel.c
 5@@ -30,7 +30,7 @@
 6 #include <sys/param.h>
 7 #include <sys/sysctl.h>
 8 #include <sys/proc.h>
 9-#if (!defined __OpenBSD__) && (!defined __bsdi__)
 10+#if (!defined __OpenBSD__) && (!defined __bsdi__) && (!defined __NetBSD__)
 11 #include <sys/user.h>
 12 #endif
 13 #if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && \
5@@ -45,6 +45,7 @@ 14@@ -45,6 +45,7 @@
6 #include <osreldate.h> 15 #include <osreldate.h>
7 #endif 16 #endif
8  17
9+#if 0 18+#if 0
10 #ifdef __NetBSD__ 19 #ifdef __NetBSD__
11 #include <machine/vmparam.h> 20 #include <machine/vmparam.h>
12 #include <machine/pmap.h> 21 #include <machine/pmap.h>
13@@ -60,17 +61,22 @@ 22@@ -60,17 +61,22 @@
14 #define KERNBASE KERNEL_BASE 23 #define KERNBASE KERNEL_BASE
15 #endif 24 #endif
16 #endif 25 #endif
17- 26-
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/libgtop/patches/patch-an (expand / switch to unified diff)

--- pkgsrc/sysutils/libgtop/patches/patch-an 2007/11/05 19:06:05 1.4
+++ pkgsrc/sysutils/libgtop/patches/patch-an 2017/06/23 16:42:05 1.5
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-an,v 1.4 2007/11/05 19:06:05 drochner Exp $ 1$NetBSD: patch-an,v 1.5 2017/06/23 16:42:05 kamil Exp $
2 2
3--- sysdeps/bsd/procstate.c.orig 2007-04-27 00:27:34.000000000 +0200 3--- sysdeps/bsd/procstate.c.orig 2011-06-01 15:40:47.000000000 +0000
4+++ sysdeps/bsd/procstate.c 4+++ sysdeps/bsd/procstate.c
 5@@ -26,7 +26,7 @@
 6
 7 #include <glibtop_suid.h>
 8
 9-#if !defined(__OpenBSD__)
 10+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
 11 /* && (!defined __bsdi__) */
 12 #include <sys/user.h>
 13 #endif
5@@ -54,7 +54,11 @@ glibtop_get_proc_state_p (glibtop *serve 14@@ -54,7 +54,11 @@ glibtop_get_proc_state_p (glibtop *serve
6 glibtop_proc_state *buf, 15 glibtop_proc_state *buf,
7 pid_t pid) 16 pid_t pid)
8 { 17 {
9+#if defined(__NetBSD__) 18+#if defined(__NetBSD__)
10+ struct kinfo_proc2 *pinfo; 19+ struct kinfo_proc2 *pinfo;
11+#else 20+#else
12 struct kinfo_proc *pinfo; 21 struct kinfo_proc *pinfo;
13+#endif 22+#endif
14 int count = 0; 23 int count = 0;
15  24
16 glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_STATE), 0); 25 glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_STATE), 0);
17@@ -65,7 +69,12 @@ glibtop_get_proc_state_p (glibtop *serve 26@@ -65,7 +69,12 @@ glibtop_get_proc_state_p (glibtop *serve
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/libgtop/patches/patch-al (expand / switch to unified diff)

--- pkgsrc/sysutils/libgtop/patches/patch-al 2007/11/05 19:06:05 1.6
+++ pkgsrc/sysutils/libgtop/patches/patch-al 2017/06/23 16:42:05 1.7
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-al,v 1.6 2007/11/05 19:06:05 drochner Exp $ 1$NetBSD: patch-al,v 1.7 2017/06/23 16:42:05 kamil Exp $
2 2
3--- sysdeps/bsd/procmem.c.orig 2007-04-27 00:27:34.000000000 +0200 3--- sysdeps/bsd/procmem.c.orig 2011-06-01 15:40:47.000000000 +0000
4+++ sysdeps/bsd/procmem.c 4+++ sysdeps/bsd/procmem.c
 5@@ -42,7 +42,7 @@
 6 #include <ufs/ufs/inode.h>
 7
 8 #include <sys/ucred.h>
 9-#if (!defined __OpenBSD__) && (!defined __bsdi__)
 10+#if (!defined __OpenBSD__) && (!defined __bsdi__) && (!defined __NetBSD__)
 11 #include <sys/user.h>
 12 #endif
 13 #include <sys/sysctl.h>
5@@ -116,6 +116,9 @@ void 14@@ -116,6 +116,9 @@ void
6 glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, 15 glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
7 pid_t pid) 16 pid_t pid)
8 { 17 {
9+#if defined (__NetBSD__) 18+#if defined (__NetBSD__)
10+ struct kinfo_proc2 *pinfo; 19+ struct kinfo_proc2 *pinfo;
11+#else 20+#else
12 struct kinfo_proc *pinfo; 21 struct kinfo_proc *pinfo;
13 struct vm_map_entry entry, *first; 22 struct vm_map_entry entry, *first;
14 struct vmspace *vms, vmspace; 23 struct vmspace *vms, vmspace;
15@@ -127,6 +130,7 @@ glibtop_get_proc_mem_p (glibtop *server, 24@@ -127,6 +130,7 @@ glibtop_get_proc_mem_p (glibtop *server,
16 #if (!defined(__FreeBSD__) || (__FreeBSD_version < 500013)) && !defined(__FreeBSD_kernel__) 25 #if (!defined(__FreeBSD__) || (__FreeBSD_version < 500013)) && !defined(__FreeBSD_kernel__)
17 struct plimit plimit; 26 struct plimit plimit;
File Added: pkgsrc/sysutils/libgtop/patches/patch-sysdeps_bsd_glibtop__machine.h
$NetBSD: patch-sysdeps_bsd_glibtop__machine.h,v 1.1 2017/06/23 16:42:05 kamil Exp $

<sys/user.h> in this context is freebsdism.

--- sysdeps/bsd/glibtop_machine.h.orig	2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/glibtop_machine.h
@@ -27,7 +27,9 @@
 #include <kvm.h>
 #include <sys/dkstat.h>
 #include <time.h>
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 #include <sys/user.h>
+#endif
 #include <sys/types.h>
 #include <sys/sysctl.h>
File Added: pkgsrc/sysutils/libgtop/patches/patch-sysdeps_bsd_procmap.c
$NetBSD: patch-sysdeps_bsd_procmap.c,v 1.1 2017/06/23 16:42:05 kamil Exp $

<sys/user.h> in this context is freebsdism.

--- sysdeps/bsd/procmap.c.orig	2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/procmap.c
@@ -58,7 +58,7 @@
 #include <ufs/ufs/inode.h>
 
 #include <sys/ucred.h>
-#if (!defined __OpenBSD__) && (!defined __bsdi__)
+#if (!defined __OpenBSD__) && (!defined __bsdi__) && (!defined __NetBSD__)
 #include <sys/user.h>
 #endif
 #include <sys/sysctl.h>