CVS commit: pkgsrc/devel/ptlib

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Sep 16 15:13:10 UTC 2017

Modified Files:
        pkgsrc/devel/ptlib: distinfo
        pkgsrc/devel/ptlib/patches: patch-unix-socket.cxx

Log Message:
ptlib: fix build on -current


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ptlib/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ptlib/patches/patch-unix-socket.cxx

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

Modified files:

Index: pkgsrc/devel/ptlib/distinfo
diff -u pkgsrc/devel/ptlib/distinfo:1.22 pkgsrc/devel/ptlib/distinfo:1.23
--- pkgsrc/devel/ptlib/distinfo:1.22    Tue Jul 19 12:46:06 2016
+++ pkgsrc/devel/ptlib/distinfo Sat Sep 16 15:13:09 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/07/19 12:46:06 jperkin Exp $
+$NetBSD: distinfo,v 1.23 2017/09/16 15:13:09 tnn Exp $
 
 SHA1 (ptlib-2.10.7.tar.xz) = 51077b76aed30ab614e31b2a18cb383848d4332c
 RMD160 (ptlib-2.10.7.tar.xz) = 0c05b57f5435f4646af05278e66718e0e433a10a
@@ -28,6 +28,6 @@ SHA1 (patch-unix-ossaix.cxx) = 3e7a902eb
 SHA1 (patch-unix-osutil.cxx) = e907fc2c068f3e20af2f0e97540a1f4e47895a18
 SHA1 (patch-unix-pmachdep.h) = b96cdc036af8a1957cd56831c49c2a1d27ca9bf5
 SHA1 (patch-unix-serchan.cxx) = f77eb9839a84db91a16b72faafdc8d1499e78b31
-SHA1 (patch-unix-socket.cxx) = 80ff4d0bc67f4bf59e5bfd3e17e3b380f7774bbb
+SHA1 (patch-unix-socket.cxx) = 9806b53f6884698be9ec86c335fe2b0ea50c908a
 SHA1 (patch-unix-switch.cxx) = 2c1bc4057a79b6b34651b299042876d2452a84b7
 SHA1 (patch-unix-tlib.cxx) = 1685b856cf0991168954f5951f93b9b9f1e08db2

Index: pkgsrc/devel/ptlib/patches/patch-unix-socket.cxx
diff -u pkgsrc/devel/ptlib/patches/patch-unix-socket.cxx:1.2 pkgsrc/devel/ptlib/patches/patch-unix-socket.cxx:1.3
--- pkgsrc/devel/ptlib/patches/patch-unix-socket.cxx:1.2        Sat Oct 13 00:49:39 2012
+++ pkgsrc/devel/ptlib/patches/patch-unix-socket.cxx    Sat Sep 16 15:13:10 2017
@@ -1,6 +1,7 @@
-$NetBSD: patch-unix-socket.cxx,v 1.2 2012/10/13 00:49:39 darcy Exp $
+$NetBSD: patch-unix-socket.cxx,v 1.3 2017/09/16 15:13:10 tnn Exp $
 
 - Add DragonFly support
+- NetBSD no longer has RTF_LLINFO, RTF_CLONED, etc since net/route.h r1.98.
 
 --- src/ptlib/unix/socket.cxx.orig     2012-08-23 02:12:27.000000000 +0000
 +++ src/ptlib/unix/socket.cxx
@@ -49,7 +50,26 @@ $NetBSD: patch-unix-socket.cxx,v 1.2 201
  
  PBoolean process_rtentry(struct rt_msghdr *rtm, char *ptr, unsigned long *p_net_addr,
                       unsigned long *p_net_mask, unsigned long *p_dest_addr, int *p_metric);
-@@ -1966,7 +1966,7 @@ PBoolean PIPSocket::GetInterfaceTable(In
+@@ -1194,10 +1194,15 @@ PBoolean process_rtentry(struct rt_msghd
+     return PFalse;
+   }
+ 
+-  if ((~rtm->rtm_flags&RTF_LLINFO)
+-#if defined(P_NETBSD) || defined(P_QNX)
++  if (
++#if defined(RTF_LLINFO)
++           (~rtm->rtm_flags&RTF_LLINFO)
++#else
++      1
++#endif
++#if defined(RTF_CLONED)
+         && (~rtm->rtm_flags&RTF_CLONED)     // Net BSD has flag one way
+-#elif !defined(P_OPENBSD) && !defined(P_FREEBSD)
++#elif defined(RTF_WASCLONED)
+         && (~rtm->rtm_flags&RTF_WASCLONED)  // MAC has it another
+ #else
+                                             // Open/Free BSD does not have it at all!
+@@ -1966,7 +1971,7 @@ PBoolean PIPSocket::GetInterfaceTable(In
          }
        }