Fix header guard. Make sure that replacement operators are defined

globally as required by C++ spec.

4 files changed, 46 insertions, 1 deletions

diff --git a/www/squid3/distinfo b/www/squid3/distinfo
index c05ddb2e808..b957fc92cf9 100644
--- a/www/squid3/distinfo
+++ b/www/squid3/distinfo
@@ -1,15 +1,18 @@
-$NetBSD: distinfo,v 1.14 2013/11/04 09:04:59 adam Exp $
+$NetBSD: distinfo,v 1.15 2013/11/07 00:47:04 joerg Exp $
 
 SHA1 (squid-3.3.10.tar.xz) = 84e27544726b7cd0c37a27b3e5df957aad234185
 RMD160 (squid-3.3.10.tar.xz) = 0f4647bd925e5c1cf0f9ac5b52cfa2d9869778fa
 Size (squid-3.3.10.tar.xz) = 2186068 bytes
+SHA1 (patch-compat_os_hpux.h) = 78e575f8383a1f48dfdf1fcf7ae726e72fa64aae
 SHA1 (patch-compat_unsafe.h) = 89e6741432357a0523a43ef410d81bffcb263f81
 SHA1 (patch-configure) = 86400fd701a84eb174395755eec7b13cbfce55ec
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
 SHA1 (patch-helpers_log_daemon_DB_config.test) = 2716abf507d8d9f8f31dc6a873afc0f224d1c00b
 SHA1 (patch-include_Array.h) = 5631c937affa41f94263034474951a0cfb409fe6
+SHA1 (patch-include_SquidNew.h) = 0c46a95a3da117ec263f29c0233e35047c0db570
 SHA1 (patch-src_Makefile.in) = 130e223568a07c474b30a8fa3678c60f8b487c3e
+SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
 SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
 SHA1 (patch-src_ip_Intercept.cc) = 8a8640d5f7eef217b2536646513eb872c67a7ffc
 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
diff --git a/www/squid3/patches/patch-compat_os_hpux.h b/www/squid3/patches/patch-compat_os_hpux.h
new file mode 100644
index 00000000000..fd1130715b9
--- /dev/null
+++ b/www/squid3/patches/patch-compat_os_hpux.h
@@ -0,0 +1,11 @@
+$NetBSD: patch-compat_os_hpux.h,v 1.1 2013/11/07 00:47:05 joerg Exp $
+
+--- compat/os/hpux.h.orig	2013-11-07 00:29:30.000000000 +0000
++++ compat/os/hpux.h
+@@ -1,5 +1,5 @@
+ #ifndef SQUID_OS_HPUX_H
+-#define SQUID_OS_PHUX_H
++#define SQUID_OS_HPUX_H
+ 
+ #if _SQUID_HPUX_
+ 
diff --git a/www/squid3/patches/patch-include_SquidNew.h b/www/squid3/patches/patch-include_SquidNew.h
new file mode 100644
index 00000000000..6b0295128da
--- /dev/null
+++ b/www/squid3/patches/patch-include_SquidNew.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_SquidNew.h,v 1.1 2013/11/07 00:47:05 joerg Exp $
+
+C++ says explicitly that new/delete must be global symbols.
+
+--- include/SquidNew.h.orig	2013-11-07 00:30:31.000000000 +0000
++++ include/SquidNew.h
+@@ -31,7 +31,7 @@
+ #ifndef SQUID_NEW_H
+ #define SQUID_NEW_H
+ 
+-#ifndef __SUNPRO_CC
++#if 0
+ /* Any code using libstdc++ must have externally resolvable overloads
+  * for void * operator new - which means in the .o for the binary,
+  * or in a shared library. static libs don't propogate the symbol
diff --git a/www/squid3/patches/patch-src_SquidNew.cc b/www/squid3/patches/patch-src_SquidNew.cc
new file mode 100644
index 00000000000..bd660d53a89
--- /dev/null
+++ b/www/squid3/patches/patch-src_SquidNew.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_SquidNew.cc,v 1.1 2013/11/07 00:47:05 joerg Exp $
+
+C++ says explicitly that new/delete must be global symbols.
+This shouldn't be necessary, but who knows what this code is doing.
+
+--- src/SquidNew.cc.orig	2013-11-07 00:31:58.000000000 +0000
++++ src/SquidNew.cc
+@@ -35,7 +35,7 @@
+ 
+ #include "squid.h"
+ 
+-#ifdef __SUNPRO_CC
++#if 1
+ 
+ #include <new>
+ void *operator new(size_t size) throw (std::bad_alloc)