[pkgsrc/trunk]: pkgsrc/devel/libstatgrab Use uvm/uvm_extern.h directly on Net...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95c80c1aa7a8
branches:  trunk
changeset: 432464:95c80c1aa7a8
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri May 22 13:45:11 2020 +0000

description:
Use uvm/uvm_extern.h directly on NetBSD.

diffstat:

 devel/libstatgrab/distinfo                              |   7 +-
 devel/libstatgrab/patches/patch-config.h.in             |  14 +++
 devel/libstatgrab/patches/patch-configure               |  63 +++++++++++++++++
 devel/libstatgrab/patches/patch-configure.ac            |  63 +++++++++++++++++
 devel/libstatgrab/patches/patch-src_libstatgrab_tools.h |  14 +++-
 5 files changed, 157 insertions(+), 4 deletions(-)

diffs (195 lines):

diff -r 15b4164dc8a3 -r 95c80c1aa7a8 devel/libstatgrab/distinfo
--- a/devel/libstatgrab/distinfo        Fri May 22 13:34:43 2020 +0000
+++ b/devel/libstatgrab/distinfo        Fri May 22 13:45:11 2020 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.15 2020/03/24 16:54:37 nia Exp $
+$NetBSD: distinfo,v 1.16 2020/05/22 13:45:11 joerg Exp $
 
 SHA1 (libstatgrab-0.92.tar.gz) = e929bf6d4566ad2cf30a878eb972c8583deef959
 RMD160 (libstatgrab-0.92.tar.gz) = 34d0e0fbfbff6879e866a79cfd02c4649f87317a
 SHA512 (libstatgrab-0.92.tar.gz) = a99c6be56d930779d0d8f6f81e64e2f31e19423009c39e925b39116a42aa2c6037651992ac2168c43a5c6ecadf3e4a58486ab6148cf96118c429b04fdcf65192
 Size (libstatgrab-0.92.tar.gz) = 815262 bytes
-SHA1 (patch-src_libstatgrab_tools.h) = 873a7f8e067561b0c4184fb9d4cbecbc59690b73
+SHA1 (patch-config.h.in) = dbb85d6a2ccfb6af8d3c104d6597868d7f9502f1
+SHA1 (patch-configure) = 1c1afc172f876893f793c55ceac0ab48ce577042
+SHA1 (patch-configure.ac) = 804bb49b775af9fc953a77d0ef34abb3f0874f57
+SHA1 (patch-src_libstatgrab_tools.h) = 992716718d84a0501a7e5c3f8a85bd2c713fa350
diff -r 15b4164dc8a3 -r 95c80c1aa7a8 devel/libstatgrab/patches/patch-config.h.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libstatgrab/patches/patch-config.h.in       Fri May 22 13:45:11 2020 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-config.h.in,v 1.1 2020/05/22 13:45:11 joerg Exp $
+
+--- config.h.in.orig   2020-05-22 12:08:49.505823625 +0000
++++ config.h.in
+@@ -791,6 +791,9 @@
+ /* Define to 1 if you have the <uvm/uvm.h> header file. */
+ #undef HAVE_UVM_UVM_H
+ 
++/* Define to 1 if you have the <uvm/uvm_extern.h> header file. */
++#undef HAVE_UVM_UVM_EXTERN_H
++
+ /* Define to 1 if the system has the type `vaddr_t'. */
+ #undef HAVE_VADDR_T
+ 
diff -r 15b4164dc8a3 -r 95c80c1aa7a8 devel/libstatgrab/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libstatgrab/patches/patch-configure Fri May 22 13:45:11 2020 +0000
@@ -0,0 +1,63 @@
+$NetBSD: patch-configure,v 1.1 2020/05/22 13:45:11 joerg Exp $
+
+--- configure.orig     2020-05-22 12:07:27.587902025 +0000
++++ configure
+@@ -11346,7 +11346,7 @@ $as_echo_n "checking for BSD specific fe
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+ 
+-              for ac_header in ifaddrs.h kinfo.h libproc.h net/if_media.h sys/dkstat.h sys/disk.h sys/iostat.h sys/resource.h sys/sched.h sys/ucred.h sys/user.h uvm/uvm.h sys/vmmeter.h vm/vm_param.h
++              for ac_header in ifaddrs.h kinfo.h libproc.h net/if_media.h sys/dkstat.h sys/disk.h sys/iostat.h sys/resource.h sys/sched.h sys/ucred.h sys/user.h uvm/uvm.h uvm/uvm_extern.h 
sys/vmmeter.h vm/vm_param.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+@@ -12282,6 +12282,9 @@ $ac_includes_default
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+ 
+ "
+ if test "x$ac_cv_type_struct_uvmexp_sysctl" = xyes; then :
+@@ -12307,6 +12310,9 @@ $ac_includes_default
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+ 
+ "
+ if test "x$ac_cv_type_struct_uvmexp" = xyes; then :
+@@ -12332,6 +12338,9 @@ fi
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+ 
+ 
+ "
+@@ -12353,6 +12362,9 @@ fi
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+ 
+ 
+ "
+@@ -12374,6 +12386,9 @@ fi
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+ 
+ 
+ "
diff -r 15b4164dc8a3 -r 95c80c1aa7a8 devel/libstatgrab/patches/patch-configure.ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libstatgrab/patches/patch-configure.ac      Fri May 22 13:45:11 2020 +0000
@@ -0,0 +1,63 @@
+$NetBSD: patch-configure.ac,v 1.1 2020/05/22 13:45:11 joerg Exp $
+
+--- configure.ac.orig  2020-05-22 12:16:29.426920019 +0000
++++ configure.ac
+@@ -688,7 +688,7 @@ AS_CASE([$host_os],
+               AC_MSG_CHECKING([for BSD specific features])
+               AC_MSG_RESULT([])
+ 
+-              AC_CHECK_HEADERS([ifaddrs.h kinfo.h libproc.h net/if_media.h sys/dkstat.h sys/disk.h sys/iostat.h sys/resource.h sys/sched.h sys/ucred.h sys/user.h uvm/uvm.h sys/vmmeter.h 
vm/vm_param.h], , , [AC_LANG_SOURCE([
++              AC_CHECK_HEADERS([ifaddrs.h kinfo.h libproc.h net/if_media.h sys/dkstat.h sys/disk.h sys/iostat.h sys/resource.h sys/sched.h sys/ucred.h sys/user.h uvm/uvm.h uvm/uvm_extern.h 
sys/vmmeter.h vm/vm_param.h], , , [AC_LANG_SOURCE([
+ AC_INCLUDES_DEFAULT
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+@@ -1088,6 +1088,9 @@ AC_INCLUDES_DEFAULT
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+               ])])
+ 
+               AS_IF(  [test "x$ac_cv_type_struct_uvmexp_sysctl" != "xyes"], [
+@@ -1102,6 +1105,9 @@ AC_INCLUDES_DEFAULT
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+                       ])])
+ 
+                       AS_IF(  [test "x$ac_cv_type_struct_uvmexp" = "xyes"], [
+@@ -1119,6 +1125,9 @@ AC_INCLUDES_DEFAULT
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+                                               ]
+                               )])
+ 
+@@ -1136,6 +1145,9 @@ AC_INCLUDES_DEFAULT
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+                                               ]
+                               )])
+ 
+@@ -1153,6 +1165,9 @@ AC_INCLUDES_DEFAULT
+ #ifdef HAVE_UVM_UVM_H
+ #include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++#include <uvm/uvm_extern.h>
++#endif
+                                               ]
+                               )])
+                       ])
diff -r 15b4164dc8a3 -r 95c80c1aa7a8 devel/libstatgrab/patches/patch-src_libstatgrab_tools.h
--- a/devel/libstatgrab/patches/patch-src_libstatgrab_tools.h   Fri May 22 13:34:43 2020 +0000
+++ b/devel/libstatgrab/patches/patch-src_libstatgrab_tools.h   Fri May 22 13:45:11 2020 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_libstatgrab_tools.h,v 1.1 2017/07/05 19:43:53 wiedi Exp $
+$NetBSD: patch-src_libstatgrab_tools.h,v 1.2 2020/05/22 13:45:11 joerg Exp $
 
 Add include for LOCK_SH
---- src/libstatgrab/tools.h.orig       2014-06-19 11:41:10.000000000 +0000
+--- src/libstatgrab/tools.h.orig       2019-07-16 16:05:37.000000000 +0000
 +++ src/libstatgrab/tools.h
 @@ -36,6 +36,10 @@
  # include <sys/stat.h>
@@ -14,3 +14,13 @@
  #include <stdio.h>
  #ifdef STDC_HEADERS
  # include <assert.h>
+@@ -252,6 +256,9 @@ extern "C" strcasecmp(const char *s1, co
+ #ifdef HAVE_UVM_UVM_H
+ # include <uvm/uvm.h>
+ #endif
++#ifdef HAVE_UVM_UVM_EXTERN_H
++# include <uvm/uvm_extern.h>
++#endif
+ #ifdef HAVE_SYS_VMMETER_H
+ #include <sys/vmmeter.h>
+ #endif