diff options
author | dholland <dholland> | 2012-09-29 06:17:29 +0000 |
---|---|---|
committer | dholland <dholland> | 2012-09-29 06:17:29 +0000 |
commit | 316cdff10f32a181b4002a78be16506abeccdb65 (patch) | |
tree | a1bab4fdd8df9f2e8b86921e37c4847b133afd95 | |
parent | ad089abecfd606ea3a4347b53981b623b5c250cd (diff) | |
download | pkgsrc-316cdff10f32a181b4002a78be16506abeccdb65.tar.gz |
Restore patches to configure script lost in an update some time back.
Does not fix the build, but advances it; now it's having some kind
of bizarre problem with <sys/queue.h>.
While here, add three small patches to silence a large pile of const
warnings that made it impossible to see anything else that was going
on.
-rw-r--r-- | net/ns/distinfo | 7 | ||||
-rw-r--r-- | net/ns/patches/patch-af | 57 | ||||
-rw-r--r-- | net/ns/patches/patch-common_packet.cc | 15 | ||||
-rw-r--r-- | net/ns/patches/patch-common_packet.h | 24 | ||||
-rw-r--r-- | net/ns/patches/patch-common_ptypes2tcl.cc | 34 |
5 files changed, 133 insertions, 4 deletions
diff --git a/net/ns/distinfo b/net/ns/distinfo index 94d60c9fc2f..4a78c4fed6b 100644 --- a/net/ns/distinfo +++ b/net/ns/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2012/03/10 22:05:03 markd Exp $ +$NetBSD: distinfo,v 1.17 2012/09/29 06:17:29 dholland Exp $ SHA1 (ns-2.33.tar.gz) = 0efd6aed45b504fcf3f125b0be00a60b87516a03 RMD160 (ns-2.33.tar.gz) = 54326b8ff4e63c0a9712c517c7ad4d9327a41d39 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 3b25eab34d7bdad7d370cea8450eb3c09c18c640 SHA1 (patch-ab) = 7c93e4540faa1b16a9e40bd063ffce510f5bc063 SHA1 (patch-ad) = 5f35152de976c2195dcff20abbe8610321dd9969 SHA1 (patch-ae) = c971d28448ae1b495119e3ec2c8de185468b9be2 -SHA1 (patch-af) = 3fece1ae7ec5ad01429224ec83a3b4df4f3083c8 +SHA1 (patch-af) = da5772371dd4d754fa8aeb904bdcf29c41552276 SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc @@ -20,4 +20,7 @@ SHA1 (patch-ap) = f130c112d7dfe114e637e190750d9caad55e4703 SHA1 (patch-aq) = c46339a81f3f0dea9754f733d567c3c93f7dc19e SHA1 (patch-ar) = 64dafe254cfd28723422047aecb8086028d9f69e SHA1 (patch-as) = 5fdd4418db3ee4b189913f1110fb260af710f746 +SHA1 (patch-common_packet.cc) = 74835d281febc195c5d1118bc5ceb40107597876 +SHA1 (patch-common_packet.h) = 2b8289ee47206f7201ea225d23318202c7b370c5 +SHA1 (patch-common_ptypes2tcl.cc) = 2354e030fef92d28c2c4049be30dcb365302068a SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84 diff --git a/net/ns/patches/patch-af b/net/ns/patches/patch-af index 46885179c9b..162bf59d0ec 100644 --- a/net/ns/patches/patch-af +++ b/net/ns/patches/patch-af @@ -1,6 +1,9 @@ -$NetBSD: patch-af,v 1.9 2011/01/25 22:22:14 shattered Exp $ +$NetBSD: patch-af,v 1.10 2012/09/29 06:17:30 dholland Exp $ ---- configure.orig 2008-03-31 19:00:25.000000000 -0700 +- provide pkgsrc's X11 dirs +- check for more ethernet headers + +--- configure.orig 2008-04-01 02:00:25.000000000 +0000 +++ configure @@ -5836,7 +5836,7 @@ powerpc-apple-darwin*) esac @@ -29,3 +32,53 @@ $NetBSD: patch-af,v 1.9 2011/01/25 22:22:14 shattered Exp $ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then +@@ -9667,7 +9667,24 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include <stdio.h> ++#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif ++#ifdef HAVE_SYS_SOCKET_H ++#include <sys/socket.h> ++#endif ++#ifdef HAVE_NETINET_IN_H ++#include <netinet/in.h> ++#endif ++#ifdef HAVE_NET_IF_H ++#include <net/if.h> ++#endif ++#ifdef HAVE_NET_ETHERNET_H + #include <net/ethernet.h> ++#endif ++#ifdef HAVE_NETINET_IF_ETHER_H ++#include <netinet/if_ether.h> ++#endif + + int + main () +@@ -9736,7 +9753,24 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include <stdio.h> ++#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif ++#ifdef HAVE_SYS_SOCKET_H ++#include <sys/socket.h> ++#endif ++#ifdef HAVE_NETINET_IN_H ++#include <netinet/in.h> ++#endif ++#ifdef HAVE_NET_IF_H ++#include <net/if.h> ++#endif ++#ifdef HAVE_NET_ETHERNET_H + #include <net/ethernet.h> ++#endif ++#ifdef HAVE_NETINET_IF_ETHER_H ++#include <netinet/if_ether.h> ++#endif + + int + main () diff --git a/net/ns/patches/patch-common_packet.cc b/net/ns/patches/patch-common_packet.cc new file mode 100644 index 00000000000..ccfe34f619f --- /dev/null +++ b/net/ns/patches/patch-common_packet.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-common_packet.cc,v 1.1 2012/09/29 06:17:30 dholland Exp $ + +Suppress immensely noisy const warnings. + +--- common/packet.cc~ 2008-04-01 02:00:25.000000000 +0000 ++++ common/packet.cc +@@ -41,7 +41,7 @@ static const char rcsid[] = + #include "flags.h" + + p_info packet_info; +-char** p_info::name_; ++const char** p_info::name_; + unsigned int p_info::nPkt_ = 0; + PacketClassifier *p_info::pc_ = 0; + diff --git a/net/ns/patches/patch-common_packet.h b/net/ns/patches/patch-common_packet.h new file mode 100644 index 00000000000..5a3080c57e4 --- /dev/null +++ b/net/ns/patches/patch-common_packet.h @@ -0,0 +1,24 @@ +$NetBSD: patch-common_packet.h,v 1.1 2012/09/29 06:17:30 dholland Exp $ + +Suppress immensely noisy const warnings. + +--- common/packet.h.orig 2008-04-01 02:00:25.000000000 +0000 ++++ common/packet.h +@@ -272,7 +272,7 @@ public: + { + if(nPkt_ >= PT_NTYPE+1) + return; +- char **nameNew = new char*[PT_NTYPE+1]; ++ const char **nameNew = new const char*[PT_NTYPE+1]; + for(unsigned int i = (unsigned int)PT_SMAC+1; i < nPkt_; i++) + { + nameNew[i] = name_[i]; +@@ -391,7 +391,7 @@ public: + + } + private: +- static char** name_; ++ static const char** name_; + static unsigned int nPkt_; + static PacketClassifier *pc_; + }; diff --git a/net/ns/patches/patch-common_ptypes2tcl.cc b/net/ns/patches/patch-common_ptypes2tcl.cc new file mode 100644 index 00000000000..6b73123d5e6 --- /dev/null +++ b/net/ns/patches/patch-common_ptypes2tcl.cc @@ -0,0 +1,34 @@ +$NetBSD: patch-common_ptypes2tcl.cc,v 1.1 2012/09/29 06:17:30 dholland Exp $ + +Suppress const warnings. Required by the common/packet.h patch. +While here, use tolower() correctly. + +--- common/ptypes2tcl.cc.orig 2008-04-01 02:00:25.000000000 +0000 ++++ common/ptypes2tcl.cc +@@ -10,7 +10,7 @@ + #define TCL2C_INT + #endif + +-char** p_info::name_; ++const char** p_info::name_; + unsigned int p_info::nPkt_ = 0; + PacketClassifier *p_info::pc_ = 0; + int p_info::addPacket(char *name) +@@ -26,7 +26,7 @@ int p_info::addPacket(char *name) + } + + void +-printLine(char *s) { ++printLine(const char *s) { + #ifdef TCL2C_INT + for (unsigned int i = 0; i < strlen(s); i++) + if ((i > 0) && ((i % 20) == 0)) +@@ -43,7 +43,7 @@ char * + lcase(const char *s) { + static char charbuf[512]; + char* to = charbuf; +- while ((*to++ = tolower(*s++))) ++ while ((*to++ = tolower((unsigned char)*s++))) + /* NOTHING */; + *to = '\0'; + return charbuf; |