Mon Aug 28 10:29:41 2017 UTC ()
Add a patch to make this build on NetBSD again.
The hack to let lib/bsd-list.h substitute for <sys/queue.h> and
prevent the latter's processing fails miserably on NetBSD, because
on NetBSD, <net/if.h> requires the TAILQ_* macros which are not
defined in lib/bsd-list.h.
No PKGREVISION bump since this is a build fix only.


(he)
diff -r1.22 -r1.23 pkgsrc/net/ns/distinfo
diff -r0 -r1.1 pkgsrc/net/ns/patches/patch-lib_bsd-list.h
cvs diff -r1.22 -r1.23 pkgsrc/net/ns/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ns/distinfo 2015/11/04 00:35:16 1.22
+++ pkgsrc/net/ns/distinfo 2017/08/28 10:29:41 1.23
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1$NetBSD: distinfo,v 1.22 2015/11/04 00:35:16 agc Exp $ 1$NetBSD: distinfo,v 1.23 2017/08/28 10:29:41 he Exp $
2 2
3SHA1 (ns-src-2.35.tar.gz) = 785d4045711d92c0042a6f8f5620d5eb74732980 3SHA1 (ns-src-2.35.tar.gz) = 785d4045711d92c0042a6f8f5620d5eb74732980
4RMD160 (ns-src-2.35.tar.gz) = 197e6874b97c56819ce9a722ffab9fe80a5cfe21 4RMD160 (ns-src-2.35.tar.gz) = 197e6874b97c56819ce9a722ffab9fe80a5cfe21
5SHA512 (ns-src-2.35.tar.gz) = bea5127a4b0c80ff50a5640b3b75ab42557ec50eb9a2b21d08b80b3adf1e65f51cff154c529a29db03eda50c0468ed078f689958f125a663da2dfda6f30cf3d5 5SHA512 (ns-src-2.35.tar.gz) = bea5127a4b0c80ff50a5640b3b75ab42557ec50eb9a2b21d08b80b3adf1e65f51cff154c529a29db03eda50c0468ed078f689958f125a663da2dfda6f30cf3d5
6Size (ns-src-2.35.tar.gz) = 43897172 bytes 6Size (ns-src-2.35.tar.gz) = 43897172 bytes
7SHA1 (patch-aa) = 3b25eab34d7bdad7d370cea8450eb3c09c18c640 7SHA1 (patch-aa) = 3b25eab34d7bdad7d370cea8450eb3c09c18c640
8SHA1 (patch-ab) = 7c93e4540faa1b16a9e40bd063ffce510f5bc063 8SHA1 (patch-ab) = 7c93e4540faa1b16a9e40bd063ffce510f5bc063
9SHA1 (patch-ad) = 5f35152de976c2195dcff20abbe8610321dd9969 9SHA1 (patch-ad) = 5f35152de976c2195dcff20abbe8610321dd9969
10SHA1 (patch-ae) = c971d28448ae1b495119e3ec2c8de185468b9be2 10SHA1 (patch-ae) = c971d28448ae1b495119e3ec2c8de185468b9be2
11SHA1 (patch-af) = bc29b20fd017d81a5459f6603b4b4013ec5139dd 11SHA1 (patch-af) = bc29b20fd017d81a5459f6603b4b4013ec5139dd
12SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd 12SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd
13SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a 13SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
14SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc 14SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
15SHA1 (patch-ak) = ea478696cdddc44ba7a76d1f31d4a6a97a88aaef 15SHA1 (patch-ak) = ea478696cdddc44ba7a76d1f31d4a6a97a88aaef
16SHA1 (patch-al) = 628733a1e9ccf34c677711666e833c1ede27b5b1 16SHA1 (patch-al) = 628733a1e9ccf34c677711666e833c1ede27b5b1
17SHA1 (patch-am) = d721e6187c2ed3f485fbab5bf1235de037453a05 17SHA1 (patch-am) = d721e6187c2ed3f485fbab5bf1235de037453a05
18SHA1 (patch-an) = 05cf59b46305f81195a0bf4542cfbb264a683df6 18SHA1 (patch-an) = 05cf59b46305f81195a0bf4542cfbb264a683df6
19SHA1 (patch-ao) = 9c8458bc4f3d168333369255e0e8fc57fcfebe06 19SHA1 (patch-ao) = 9c8458bc4f3d168333369255e0e8fc57fcfebe06
20SHA1 (patch-ap) = c5cfb464e5fc196ada34a4367705bcab314ce79f 20SHA1 (patch-ap) = c5cfb464e5fc196ada34a4367705bcab314ce79f
21SHA1 (patch-aq) = c46339a81f3f0dea9754f733d567c3c93f7dc19e 21SHA1 (patch-aq) = c46339a81f3f0dea9754f733d567c3c93f7dc19e
22SHA1 (patch-common_packet.cc) = 74835d281febc195c5d1118bc5ceb40107597876 22SHA1 (patch-common_packet.cc) = 74835d281febc195c5d1118bc5ceb40107597876
23SHA1 (patch-common_packet.h) = 2b8289ee47206f7201ea225d23318202c7b370c5 23SHA1 (patch-common_packet.h) = 2b8289ee47206f7201ea225d23318202c7b370c5
24SHA1 (patch-common_ptypes2tcl.cc) = 2354e030fef92d28c2c4049be30dcb365302068a 24SHA1 (patch-common_ptypes2tcl.cc) = 2354e030fef92d28c2c4049be30dcb365302068a
25SHA1 (patch-common_scheduler.cc) = 9fc226aa15a50880b09b97c99b9778e7c230d4da 25SHA1 (patch-common_scheduler.cc) = 9fc226aa15a50880b09b97c99b9778e7c230d4da
26SHA1 (patch-common_tclAppInit.cc) = a96791d7a4cdf9834fa2e3bf994903944f41b011 26SHA1 (patch-common_tclAppInit.cc) = a96791d7a4cdf9834fa2e3bf994903944f41b011
27SHA1 (patch-common_tkAppInit.cc) = c4f5bfa97a1585773443044640dac343219a4155 27SHA1 (patch-common_tkAppInit.cc) = c4f5bfa97a1585773443044640dac343219a4155
 28SHA1 (patch-lib_bsd-list.h) = 21675c566b66f7c3af8e0d0bc6a9936d2641b682
28SHA1 (patch-linkstate_ls.h) = 5f0fb99db398cf39e9853e7d8e8cd6536d29e44b 29SHA1 (patch-linkstate_ls.h) = 5f0fb99db398cf39e9853e7d8e8cd6536d29e44b
29SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84 30SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84
30SHA1 (patch-mdart_mdart__adp.cc) = 5cee0a60a5102197363f53f2ebb90ca972bc139c 31SHA1 (patch-mdart_mdart__adp.cc) = 5cee0a60a5102197363f53f2ebb90ca972bc139c
31SHA1 (patch-mdart_mdart__queue.h) = 1bf4cfec755c80cb5332a234c82c72584e62863c 32SHA1 (patch-mdart_mdart__queue.h) = 1bf4cfec755c80cb5332a234c82c72584e62863c
32SHA1 (patch-nix_nixnode.cc) = d0a1826836f5ce9d40869946e9df29d6b53d4b7f 33SHA1 (patch-nix_nixnode.cc) = d0a1826836f5ce9d40869946e9df29d6b53d4b7f
33SHA1 (patch-pushback_ident-tree.h) = eb7139b078ce3ea7f9627ffe7ae93efd1d27ba45 34SHA1 (patch-pushback_ident-tree.h) = eb7139b078ce3ea7f9627ffe7ae93efd1d27ba45
34SHA1 (patch-webcache_pagepool.cc) = b2f738d9025540731c3a61fd2d6f8ac5a51bdfcf 35SHA1 (patch-webcache_pagepool.cc) = b2f738d9025540731c3a61fd2d6f8ac5a51bdfcf
File Added: pkgsrc/net/ns/patches/patch-lib_bsd-list.h
$NetBSD: patch-lib_bsd-list.h,v 1.1 2017/08/28 10:29:41 he Exp $

Actually, lib/bsd-list.h isn't a substitute for <sys/queue.h>
because TAILQ_* macros are not defined here, and on NetBSD, <net/if.h>
requires those macros be defined.

--- lib/bsd-list.h.orig	2008-03-25 04:28:30.000000000 +0000
+++ lib/bsd-list.h
@@ -40,7 +40,11 @@
 #define	_NS_BSD_LIST_H_
 
 // define _SYS_QUEUE_H_ so /usr/include/sys/queue.h does not redefine
-#define _SYS_QUEUE_H_
+#ifndef __NetBSD__
+# define _SYS_QUEUE_H_
+#endif
+// This doesn't define the 5 queue forms, and NetBSD's <net/if.h>
+// requires TAILQ_* which isn't defined here.
 
 /*
  * This file defines five types of data structures: singly-linked lists,