[65622] trunk/dports/net/libproxy

[ryandesign at macports.org]

Revision: 65622
          http://trac.macports.org/changeset/65622
Author:   ryandesign at macports.org
Date:     2010-03-28 21:42:33 -0700 (Sun, 28 Mar 2010)
Log Message:
-----------
libproxy: fix build on Leopard using upstream patch; see #24127

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

Added Paths:
-----------
    trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff

Modified: trunk/dports/net/libproxy/Portfile
===================================================================
--- trunk/dports/net/libproxy/Portfile	2010-03-29 01:54:33 UTC (rev 65621)
+++ trunk/dports/net/libproxy/Portfile	2010-03-29 04:42:33 UTC (rev 65622)
@@ -7,7 +7,7 @@
 
 name                libproxy
 version             0.4.0
-revision            2
+revision            3
 categories          net
 maintainers         devans openmaintainer
 platforms           darwin
@@ -42,9 +42,11 @@
     port:python26
 
 # patch to libproxy/CMakeLists.txt corresponds to upstream commit r587
+# patch to libproxy/modules/pacrunner_webkit.cpp corresponds to upstream commits r608 and r616
 # patch to libproxy/libproxy-1.0.pc.in corresponds to upstream commit r622 
 patchfiles          patch-fnonblock.diff \
                     patch-libproxy-CMakeLists.txt.diff \
+                    patch-libproxy-modules-pacrunner_webkit.cpp.diff \
                     patch-libproxy-libproxy-1.0.pc.in.diff
 
 configure.args-append \

Added: trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff
===================================================================
--- trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff	                        (rev 0)
+++ trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff	2010-03-29 04:42:33 UTC (rev 65622)
@@ -0,0 +1,16 @@
+--- libproxy/modules/pacrunner_webkit.cpp	(revision 607)
++++ libproxy/modules/pacrunner_webkit.cpp	(revision 616)
+@@ -20,7 +20,13 @@
+ #include "../extension_pacrunner.hpp"
+ using namespace libproxy;
+ 
++#ifdef __APPLE__
++// JavaScriptCore.h requires CoreFoundation
++// This is only found on Mac OS X
++#include <JavaScriptCore/JavaScriptCore.h>
++#else
+ #include <JavaScriptCore/JavaScript.h>
++#endif
+ #include "pacutils.h"
+ 
+ #ifndef INET_ADDRSTRLEN
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100328/9bb1c9a5/attachment.html>