Revision: 70873 http://trac.macports.org/changeset/70873 Author: devans@macports.org Date: 2010-08-24 09:34:40 -0700 (Tue, 24 Aug 2010) Log Message: ----------- libproxy: revert to previous version, increment epoch, until pkg-config problem in later versions can be resolved.(#26219). Modified Paths: -------------- trunk/dports/net/libproxy/Portfile Added Paths: ----------- trunk/dports/net/libproxy/files/ trunk/dports/net/libproxy/files/patch-fnonblock.diff trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff Removed Paths: ------------- trunk/dports/net/libproxy/files/patch-fnonblock.diff trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff Modified: trunk/dports/net/libproxy/Portfile =================================================================== --- trunk/dports/net/libproxy/Portfile 2010-08-24 16:31:06 UTC (rev 70872) +++ trunk/dports/net/libproxy/Portfile 2010-08-24 16:34:40 UTC (rev 70873) @@ -6,7 +6,9 @@ PortGroup cmake 1.0 name libproxy -version 0.4.5 +version 0.4.0 +epoch 1 +revision 4 categories net maintainers devans openmaintainer platforms darwin @@ -20,9 +22,9 @@ network resource, how do I reach it? It handles all \ the details, enabling you to get back to programming. -checksums md5 3b1ef3886d6b8ca5425b9e4eca9856e3 \ - sha1 ce4c601037d108c1008b61cdb4839832b0deb6e8 \ - rmd160 6c7ed8d87adc5725aae8f804dc19cd5fbb3c01b5 +checksums md5 b22c95df70a40949e99add5171fc3084 \ + sha1 4d9dc92dd40255a51e541099b39d9852563dbc6a \ + rmd160 9375f6926cf7c301e4f96a018ca5278c7c8c5c45 post-patch { if {![variant_isset kde]} { @@ -40,6 +42,15 @@ port:gconf \ port:python26 +# patch to libproxy/modules/config_gnome.cpp corresponds to upstream commit r628 +# 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 \ -D__pkg_config_checked_KDE4=YES Deleted: trunk/dports/net/libproxy/files/patch-fnonblock.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-fnonblock.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-fnonblock.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,11 +0,0 @@ ---- libproxy/modules/config_gnome.cpp (revision 627) -+++ libproxy/modules/config_gnome.cpp (revision 628) -@@ -118,7 +118,7 @@ - this->read_data(count); - - // Set the read pipe to non-blocking -- if (fcntl(fileno(this->read), F_SETFL, FNONBLOCK) == -1) { -+ if (fcntl(fileno(this->read), F_SETFL, O_NONBLOCK) == -1) { - fclose(this->read); - fclose(this->write); - kill(this->pid, SIGTERM); Copied: trunk/dports/net/libproxy/files/patch-fnonblock.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-fnonblock.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-fnonblock.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-fnonblock.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,11 @@ +--- libproxy/modules/config_gnome.cpp (revision 627) ++++ libproxy/modules/config_gnome.cpp (revision 628) +@@ -118,7 +118,7 @@ + this->read_data(count); + + // Set the read pipe to non-blocking +- if (fcntl(fileno(this->read), F_SETFL, FNONBLOCK) == -1) { ++ if (fcntl(fileno(this->read), F_SETFL, O_NONBLOCK) == -1) { + fclose(this->read); + fclose(this->write); + kill(this->pid, SIGTERM); Deleted: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,37 +0,0 @@ ---- libproxy/CMakeLists.txt.orig 2010-04-29 19:25:32.000000000 +0200 -+++ libproxy/CMakeLists.txt 2010-04-29 19:16:58.000000000 +0200 -@@ -96,20 +96,20 @@ - endif() - endif() - --if(APPLE) -- find_library(WEBKIT_LIBRARIES JavaScriptCore) -- find_library(SC_LIBRARIES SystemConfiguration) -- find_library(CF_LIBRARIES CoreFoundation) -- if(WEBKIT_LIBRARIES) -- set(WEBKIT_FOUND 1) -- endif() -- if(SC_LIBRARIES) -- set(SC_FOUND 1) -- endif() -- if(CF_LIBRARIES) -- set(CF_FOUND 1) -- endif() --endif() -+# if(APPLE) -+# find_library(WEBKIT_LIBRARIES JavaScriptCore) -+# find_library(SC_LIBRARIES SystemConfiguration) -+# find_library(CF_LIBRARIES CoreFoundation) -+# if(WEBKIT_LIBRARIES) -+# set(WEBKIT_FOUND 1) -+# endif() -+# if(SC_LIBRARIES) -+# set(SC_FOUND 1) -+# endif() -+# if(CF_LIBRARIES) -+# set(CF_FOUND 1) -+# endif() -+# endif() - - # Build the pacrunner into libproxy unless we are building for multiple engines - set(BIPR 1) Copied: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,37 @@ +--- libproxy/CMakeLists.txt.orig 2010-04-29 19:25:32.000000000 +0200 ++++ libproxy/CMakeLists.txt 2010-04-29 19:16:58.000000000 +0200 +@@ -96,20 +96,20 @@ + endif() + endif() + +-if(APPLE) +- find_library(WEBKIT_LIBRARIES JavaScriptCore) +- find_library(SC_LIBRARIES SystemConfiguration) +- find_library(CF_LIBRARIES CoreFoundation) +- if(WEBKIT_LIBRARIES) +- set(WEBKIT_FOUND 1) +- endif() +- if(SC_LIBRARIES) +- set(SC_FOUND 1) +- endif() +- if(CF_LIBRARIES) +- set(CF_FOUND 1) +- endif() +-endif() ++# if(APPLE) ++# find_library(WEBKIT_LIBRARIES JavaScriptCore) ++# find_library(SC_LIBRARIES SystemConfiguration) ++# find_library(CF_LIBRARIES CoreFoundation) ++# if(WEBKIT_LIBRARIES) ++# set(WEBKIT_FOUND 1) ++# endif() ++# if(SC_LIBRARIES) ++# set(SC_FOUND 1) ++# endif() ++# if(CF_LIBRARIES) ++# set(CF_FOUND 1) ++# endif() ++# endif() + + # Build the pacrunner into libproxy unless we are building for multiple engines + set(BIPR 1) Deleted: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,11 +0,0 @@ ---- libproxy/CMakeLists.txt.orig 2010-03-21 12:22:28.000000000 -0500 -+++ libproxy/CMakeLists.txt 2010-03-21 12:22:54.000000000 -0500 -@@ -137,7 +137,7 @@ - - ### Misc files - # PkgConfig file --if(NOT ${WIN32}) -+if(NOT WIN32) - configure_file(libproxy-1.0.pc.in libproxy-1.0.pc @ONLY) - install(FILES libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig) - endif() Copied: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,11 @@ +--- libproxy/CMakeLists.txt.orig 2010-03-21 12:22:28.000000000 -0500 ++++ libproxy/CMakeLists.txt 2010-03-21 12:22:54.000000000 -0500 +@@ -137,7 +137,7 @@ + + ### Misc files + # PkgConfig file +-if(NOT ${WIN32}) ++if(NOT WIN32) + configure_file(libproxy-1.0.pc.in libproxy-1.0.pc @ONLY) + install(FILES libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig) + endif() Deleted: trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,13 +0,0 @@ ---- libproxy/libproxy-1.0.pc.in.orig 2010-03-21 12:38:02.000000000 -0500 -+++ libproxy/libproxy-1.0.pc.in 2010-03-21 12:39:16.000000000 -0500 -@@ -2,8 +2,8 @@ - libdir=@libdir@ - includedir=@includedir@ - --Name: libproxy -+Name: libproxy-1.0 - Description: Proxy Configuration Library --Version: @VERSION@ -+Version: @CMAKE_PROJECT_VERSION@ - Libs: -L${libdir} -lproxy - Cflags: -I${includedir} Copied: trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,13 @@ +--- libproxy/libproxy-1.0.pc.in.orig 2010-03-21 12:38:02.000000000 -0500 ++++ libproxy/libproxy-1.0.pc.in 2010-03-21 12:39:16.000000000 -0500 +@@ -2,8 +2,8 @@ + libdir=@libdir@ + includedir=@includedir@ + +-Name: libproxy ++Name: libproxy-1.0 + Description: Proxy Configuration Library +-Version: @VERSION@ ++Version: @CMAKE_PROJECT_VERSION@ + Libs: -L${libdir} -lproxy + Cflags: -I${includedir} Deleted: trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,16 +0,0 @@ ---- 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 Copied: trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff (from rev 70838, 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-08-24 16:34:40 UTC (rev 70873) @@ -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