[99979] trunk/dports/net/squid3

[jmr at macports.org]

Revision: 99979
          https://trac.macports.org/changeset/99979
Author:   jmr at macports.org
Date:     2012-11-23 12:29:59 -0800 (Fri, 23 Nov 2012)
Log Message:
-----------
squid3: stop system header from redefining bool on 10.6 (#37102)

Modified Paths:
--------------
    trunk/dports/net/squid3/Portfile

Added Paths:
-----------
    trunk/dports/net/squid3/files/snowleopard-bool.diff

Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile	2012-11-23 20:01:23 UTC (rev 99978)
+++ trunk/dports/net/squid3/Portfile	2012-11-23 20:29:59 UTC (rev 99979)
@@ -39,6 +39,11 @@
                 patch-compat_types.h.diff \
                 patch-basic_pam_auth.cc.diff
 
+platform darwin 10 {
+    # ticket #37102, /usr/include/rpcsvc/yp_prot.h tries to redefine bool
+    patchfiles-append snowleopard-bool.diff
+}
+
 depends_lib     port:zlib
 
 conflicts       squid squid3-devel

Added: trunk/dports/net/squid3/files/snowleopard-bool.diff
===================================================================
--- trunk/dports/net/squid3/files/snowleopard-bool.diff	                        (rev 0)
+++ trunk/dports/net/squid3/files/snowleopard-bool.diff	2012-11-23 20:29:59 UTC (rev 99979)
@@ -0,0 +1,11 @@
+--- helpers/basic_auth/NIS/nis_support.cc.orig	2012-10-20 23:39:49.000000000 +1100
++++ helpers/basic_auth/NIS/nis_support.cc	2012-11-24 07:23:14.000000000 +1100
+@@ -9,7 +9,7 @@
+ #include <sys/types.h>
+ #include <rpc/rpc.h>
+ 
+-#if _SQUID_FREEBSD_  && !defined(BOOL_DEFINED)
++#ifndef BOOL_DEFINED
+ // BUG: FreeBSD rpcsvc/yp_* headers try to redefine bool unless we match their non-standard hack.
+ #define BOOL_DEFINED
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121123/01725536/attachment.html>