self-git: porting to NetBSD

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Jul 22 07:14:04 2019 +0200
Changeset:	9ccde062bdd8c786037e6a77b92379c91a1055af

Modified Files:
	self-git/distinfo
	self-git/patches/patch-vm_src_unix_os_os__includes__unix.hh
	self-git/patches/patch-vm_src_unix_os_os__unix.hh

Log Message:
self-git: porting to NetBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9ccde062bdd8c786037e6a77b92379c91a1055af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 self-git/distinfo                                          |  4 ++--
 .../patches/patch-vm_src_unix_os_os__includes__unix.hh     | 14 ++++++++------
 self-git/patches/patch-vm_src_unix_os_os__unix.hh          |  9 +++++++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diffs:
diff --git a/self-git/distinfo b/self-git/distinfo
index 22f84f364a..061bcc1122 100644
--- a/self-git/distinfo
+++ b/self-git/distinfo
@@ -15,9 +15,9 @@ SHA1 (patch-vm_src_i386_runtime_interruptedCtx__i386.cpp) = 9119d6c869c4b3424e12
 SHA1 (patch-vm_src_i386_runtime_runtime__i386.hh) = 1506e59e2e0fc4369317fdd74bb77f91c64aaec5
 SHA1 (patch-vm_src_unix_os_errorCodes__unix.cpp) = c5cb8f7ca2da40aca5dc56440f1d917d3c2faa95
 SHA1 (patch-vm_src_unix_os_itimer__unix.cpp) = e3f5e5abf9b62e69cf2b99b8846436af4309886f
-SHA1 (patch-vm_src_unix_os_os__includes__unix.hh) = 203d7d5655a6b3870a3335364757ee3049a4e215
+SHA1 (patch-vm_src_unix_os_os__includes__unix.hh) = 0644c041ec9e3eb028b56d00f52c7494995640f2
 SHA1 (patch-vm_src_unix_os_os__unix.cpp) = 016c0c42da6d81afa77ebfb779ac1561a491eef6
-SHA1 (patch-vm_src_unix_os_os__unix.hh) = 0822df62ebd9c879fd96ffda669afe71343c49d8
+SHA1 (patch-vm_src_unix_os_os__unix.hh) = 8e25a24b116e681d08c91267d4abe524606d488d
 SHA1 (patch-vm_src_unix_os_sig__unix.cpp) = a62733df62c355be7b1b210298cdee6bddedf23e
 SHA1 (patch-vm_src_unix_os_sig__unix.hh) = 0179a4af82a0c15219d68033ec1ce0735b8d9001
 SHA1 (patch-vm_src_unix_prims_unixPrims.cpp) = ca010b6985bad6b86e6c774c0d3e161e8f97e8ed
diff --git a/self-git/patches/patch-vm_src_unix_os_os__includes__unix.hh b/self-git/patches/patch-vm_src_unix_os_os__includes__unix.hh
index 0714a9eaf3..ef612e1108 100644
--- a/self-git/patches/patch-vm_src_unix_os_os__includes__unix.hh
+++ b/self-git/patches/patch-vm_src_unix_os_os__includes__unix.hh
@@ -11,18 +11,20 @@ $NetBSD$
  # include <alloca.h>
  #endif
  
-@@ -78,6 +78,10 @@ extern "C" { 
+@@ -78,6 +78,12 @@ extern "C" { 
  #   include <termios.h>
  #   include <sys/ioctl.h>
  #   include <pthread.h>
 +# elif TARGET_OS_VERSION == NETBSD_VERSION
 +#   include <sys/types.h>
++#   include <sys/ioctl.h>
 +#   include <sys/sysctl.h>
 +#   include <termios.h>
++#   include <pthread.h>
  # else
  #   include <termio.h>
  # endif
-@@ -103,7 +107,8 @@ extern "C" { 
+@@ -103,7 +109,8 @@ extern "C" { 
    typedef sigcontext       self_sig_context_t;
    typedef struct sigstack  self_stack_t;
  # elif TARGET_OS_VERSION == MACOSX_VERSION \
@@ -32,7 +34,7 @@ $NetBSD$
    typedef siginfo_t        self_code_info_t;
    typedef ucontext_t       self_sig_context_t;
    typedef stack_t          self_stack_t;
-@@ -164,7 +169,8 @@ extern "C" {
+@@ -164,7 +171,8 @@ extern "C" {
  
  
  # if TARGET_OS_VERSION != SOLARIS_VERSION  \
@@ -42,7 +44,7 @@ $NetBSD$
    #  include <sys/vadvise.h>
     extern "C" {
       int vadvise(int);
-@@ -205,6 +211,8 @@ extern "C" {
+@@ -205,6 +213,8 @@ extern "C" {
  # define FORK vfork
  # elif  TARGET_OS_VERSION == LINUX_VERSION
  # define FORK vfork
@@ -51,7 +53,7 @@ $NetBSD$
  # else
     error which?
  #endif
-@@ -228,7 +236,8 @@ const int Last_OS_Signal = SIGUSR2+1+20;
+@@ -228,7 +238,8 @@ const int Last_OS_Signal = SIGUSR2+1+20;
  
  # if  TARGET_OS_VERSION == SOLARIS_VERSION \
    ||  TARGET_OS_VERSION ==  MACOSX_VERSION \
@@ -61,7 +63,7 @@ $NetBSD$
  
    typedef void (*Signal_Handler_t)(int sig, self_code_info_t *info, self_sig_context_t *con);
  
-@@ -247,4 +256,4 @@ extern "C" { int malloc_verify(); }
+@@ -247,4 +258,4 @@ extern "C" { int malloc_verify(); }
  
  # if TARGET_OS_VERSION == MACOSX_VERSION
    typedef size_t nbytes_t;
diff --git a/self-git/patches/patch-vm_src_unix_os_os__unix.hh b/self-git/patches/patch-vm_src_unix_os_os__unix.hh
index ad053bcbed..98b48425fa 100644
--- a/self-git/patches/patch-vm_src_unix_os_os__unix.hh
+++ b/self-git/patches/patch-vm_src_unix_os_os__unix.hh
@@ -11,8 +11,13 @@ $NetBSD$
  # else
       static const int logname_max = LOGNAME_MAX;
  # endif
-@@ -30,4 +32,3 @@
-   ||  TARGET_OS_VERSION ==  LINUX_VERSION
+@@ -27,7 +29,7 @@
+ 
+ # if  TARGET_OS_VERSION == SOLARIS_VERSION \
+   ||  TARGET_OS_VERSION == MACOSX_VERSION  \
+-  ||  TARGET_OS_VERSION ==  LINUX_VERSION
++  ||  TARGET_OS_VERSION ==  LINUX_VERSION \
++  ||  TARGET_OS_VERSION == NETBSD_VERSION
      static void setPageAdvisory(char *start, char *end, int code);
  # endif
 -