CVS commit: pkgsrc/net/ns

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Aug 28 10:29:41 UTC 2017

Modified Files:
        pkgsrc/net/ns: distinfo
Added Files:
        pkgsrc/net/ns/patches: patch-lib_bsd-list.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/ns/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ns/patches/patch-lib_bsd-list.h

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

Modified files:

Index: pkgsrc/net/ns/distinfo
diff -u pkgsrc/net/ns/distinfo:1.22 pkgsrc/net/ns/distinfo:1.23
--- pkgsrc/net/ns/distinfo:1.22 Wed Nov  4 00:35:16 2015
+++ pkgsrc/net/ns/distinfo      Mon Aug 28 10:29:41 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 00:35:16 agc Exp $
+$NetBSD: distinfo,v 1.23 2017/08/28 10:29:41 he Exp $
 
 SHA1 (ns-src-2.35.tar.gz) = 785d4045711d92c0042a6f8f5620d5eb74732980
 RMD160 (ns-src-2.35.tar.gz) = 197e6874b97c56819ce9a722ffab9fe80a5cfe21
@@ -25,6 +25,7 @@ SHA1 (patch-common_ptypes2tcl.cc) = 2354
 SHA1 (patch-common_scheduler.cc) = 9fc226aa15a50880b09b97c99b9778e7c230d4da
 SHA1 (patch-common_tclAppInit.cc) = a96791d7a4cdf9834fa2e3bf994903944f41b011
 SHA1 (patch-common_tkAppInit.cc) = c4f5bfa97a1585773443044640dac343219a4155
+SHA1 (patch-lib_bsd-list.h) = 21675c566b66f7c3af8e0d0bc6a9936d2641b682
 SHA1 (patch-linkstate_ls.h) = 5f0fb99db398cf39e9853e7d8e8cd6536d29e44b
 SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84
 SHA1 (patch-mdart_mdart__adp.cc) = 5cee0a60a5102197363f53f2ebb90ca972bc139c

Added files:

Index: pkgsrc/net/ns/patches/patch-lib_bsd-list.h
diff -u /dev/null pkgsrc/net/ns/patches/patch-lib_bsd-list.h:1.1
--- /dev/null   Mon Aug 28 10:29:41 2017
+++ pkgsrc/net/ns/patches/patch-lib_bsd-list.h  Mon Aug 28 10:29:41 2017
@@ -0,0 +1,21 @@
+$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,