[71365] trunk/dports/net/libproxy
devans at macports.org
devans at macports.org
Fri Sep 10 10:10:10 PDT 2010
Revision: 71365
http://trac.macports.org/changeset/71365
Author: devans at macports.org
Date: 2010-09-10 10:10:10 -0700 (Fri, 10 Sep 2010)
Log Message:
-----------
libproxy: update to version 0.4.6
* patch cmake files to allow installation of modules and pkgconfig files on APPLE platforms
* update dependencies, variants and configuration
* disable pacrunner modules for now due to issues
* correctly configure python bindings for python26
* addresses tickets #24127, #26219, #26261
Modified Paths:
--------------
trunk/dports/net/libproxy/Portfile
Added Paths:
-----------
trunk/dports/net/libproxy/files/patch-libproxy-cmake.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-09-10 17:09:30 UTC (rev 71364)
+++ trunk/dports/net/libproxy/Portfile 2010-09-10 17:10:10 UTC (rev 71365)
@@ -6,9 +6,8 @@
PortGroup cmake 1.0
name libproxy
-version 0.4.0
+version 0.4.6
epoch 1
-revision 4
categories net
maintainers devans openmaintainer
platforms darwin
@@ -22,67 +21,55 @@
network resource, how do I reach it? It handles all \
the details, enabling you to get back to programming.
-checksums md5 b22c95df70a40949e99add5171fc3084 \
- sha1 4d9dc92dd40255a51e541099b39d9852563dbc6a \
- rmd160 9375f6926cf7c301e4f96a018ca5278c7c8c5c45
+checksums md5 199c6b120baf1f7258a55f38d5ec74f5 \
+ sha1 6e9745c87b774f34bf53f07a54284c0d72020e94 \
+ rmd160 f5f03c84ad2d87fe728869fadc669628737c639e
-post-patch {
- if {![variant_isset kde]} {
- reinplace /px_check_modules(KDE4/d \
- ${worksrcpath}/libproxy/CMakeLists.txt
- }
-}
+patchfiles patch-libproxy-cmake.diff
depends_build-append \
- port:pkgconfig
+ port:pkgconfig
-depends_lib \
- port:xorg-libX11 \
- port:xorg-libXmu \
- port:gconf \
- port:python26
+depends_lib port:gconf \
+ port:python26 \
+ port:perl5
-# 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
-
+set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
configure.python ${prefix}/bin/python2.6
-variant no_gnome description "Disable GNOME support" {
- post-patch {
- reinplace /px_check_modules(GNOME/d \
- ${worksrcpath}/libproxy/CMakeLists.txt
- }
+#
+# webkit and mozjs pacrunners disabled by default due to the
+# following issues
+#
+# webkit pacrunner circular dependency problem
+# webkit-gtk -> libsoup -> libproxy -> webkit-gtk (#26261)
+#
+# pac files support not available on Tiger (#24127)
+#
+# TODO: add variants that safely enable these features
+#
- depends_lib-delete port:gconf
-}
+configure.args-append \
+ -DWITH_GNOME=YES \
+ -DWITH_KDE4=NO \
+ -DWITH_WEBKIT=NO \
+ -DWITH_MOZJS=NO \
+ -DWITH_NM=NO \
+ -DWITH_VALA=NO \
+ -DWITH_PERL=YES \
+ -DWITH_PYTHON=YES \
+ -DPYTHON_SITEPKG_DIR=${python_prefix}/lib/python2.6/site-packages
-variant no_x11 requires no_gnome conflicts kde {
- post-patch {
- reinplace /px_check_modules(X11/d \
- ${worksrcpath}/libproxy/CMakeLists.txt
- }
-
- depends_lib-delete port:xorg-libX11 port:xorg-libXmu
+variant no_gnome description {Disable GNOME plugin} {
+ configure.args-delete -DWITH_GNOME=YES
+ configure.args-append -DWITH_GNOME=NO
+ depends_lib-delete port:gconf
}
-variant kde conflicts no_x11 description {Enable kde plugin (requires X11)} {
- depends_lib-append port:kde4libs
- configure.args-delete -D__pkg_config_checked_KDE4=YES
+variant kde description {Enable KDE4 plugin} {
+ configure.args-delete -DWITH_KDE4=NO
+ configure.args-append -DWITH_KDE4=YES
+ depends_lib-append port:kdelibs4
}
-platform darwin 8 {
- patchfiles-append patch-libproxy-CMakeLists.txt.2.diff
- notes "PAC files support is not available in Tiger.
-see https://trac.macports.org/ticket/24127"
-}
-
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
Deleted: trunk/dports/net/libproxy/files/patch-fnonblock.diff
===================================================================
--- trunk/dports/net/libproxy/files/patch-fnonblock.diff 2010-09-10 17:09:30 UTC (rev 71364)
+++ trunk/dports/net/libproxy/files/patch-fnonblock.diff 2010-09-10 17:10:10 UTC (rev 71365)
@@ -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);
Deleted: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff
===================================================================
--- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff 2010-09-10 17:09:30 UTC (rev 71364)
+++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff 2010-09-10 17:10:10 UTC (rev 71365)
@@ -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)
Deleted: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff
===================================================================
--- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff 2010-09-10 17:09:30 UTC (rev 71364)
+++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff 2010-09-10 17:10:10 UTC (rev 71365)
@@ -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()
Added: trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff
===================================================================
--- trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff (rev 0)
+++ trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff 2010-09-10 17:10:10 UTC (rev 71365)
@@ -0,0 +1,88 @@
+diff -ur libproxy/cmake.orig/devfiles.cmk libproxy/cmake/devfiles.cmk
+--- libproxy/cmake.orig/devfiles.cmk 2010-09-01 13:23:34.000000000 -0700
++++ libproxy/cmake/devfiles.cmk 2010-09-10 07:52:14.000000000 -0700
+@@ -1,4 +1,4 @@
+-if(NOT WIN32 AND NOT APPLE)
++if(NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
+ # PkgConfig file
+ set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk
+--- libproxy/cmake.orig/modules/config_envvar.cmk 2010-09-01 13:23:34.000000000 -0700
++++ libproxy/cmake/modules/config_envvar.cmk 2010-09-10 07:52:14.000000000 -0700
+@@ -1,3 +1,3 @@
+-if (NOT WIN32 AND NOT APPLE)
++if (NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
+ set(ENVVAR_FOUND 1)
+-endif()
+\ No newline at end of file
++endif()
+diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk
+--- libproxy/cmake.orig/modules/config_gnome.cmk 2010-09-01 13:23:34.000000000 -0700
++++ libproxy/cmake/modules/config_gnome.cmk 2010-09-10 07:52:14.000000000 -0700
+@@ -1,4 +1,4 @@
+-if (NOT WIN32 AND NOT APPLE)
++if (NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
+ px_check_modules(GNOME gconf-2.0 gobject-2.0)
+
+ # GNOME (gconf) helper
+diff -ur libproxy/cmake.orig/modules/config_kde4.cmk libproxy/cmake/modules/config_kde4.cmk
+--- libproxy/cmake.orig/modules/config_kde4.cmk 2010-09-01 13:23:34.000000000 -0700
++++ libproxy/cmake/modules/config_kde4.cmk 2010-09-10 07:52:14.000000000 -0700
+@@ -1,4 +1,4 @@
+-if (NOT WIN32 AND NOT APPLE)
++if (NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
+ option(WITH_KDE4 "Search for KDE4 package" ON)
+ if (WITH_KDE4)
+ find_package(KDE4)
+@@ -16,4 +16,4 @@
+ else()
+ set(KDE4_FOUND 0)
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk
+--- libproxy/cmake.orig/modules/config_macosx.cmk 2010-09-01 13:23:34.000000000 -0700
++++ libproxy/cmake/modules/config_macosx.cmk 2010-09-10 07:52:14.000000000 -0700
+@@ -1,4 +1,4 @@
+-if(APPLE)
++if(APPLE AND MP_QUARTZ)
+ find_library(SC_LIBRARIES SystemConfiguration)
+ find_library(CF_LIBRARIES CoreFoundation)
+ if(SC_LIBRARIES)
+@@ -7,4 +7,4 @@
+ if(CF_LIBRARIES)
+ set(CF_FOUND 1)
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk
+--- libproxy/cmake.orig/modules/pacrunner_webkit.cmk 2010-09-01 13:23:34.000000000 -0700
++++ libproxy/cmake/modules/pacrunner_webkit.cmk 2010-09-10 07:52:14.000000000 -0700
+@@ -6,11 +6,11 @@
+ link_directories(WEBKIT_LIBRARIES)
+ include_directories("${WEBKIT_INCLUDE_DIR}")
+ endif()
+-elseif(APPLE)
++elseif(APPLE AND MP_QUARTZ)
+ find_library(WEBKIT_LIBRARIES JavaScriptCore)
+ if(WEBKIT_LIBRARIES)
+ set(WEBKIT_FOUND 1)
+ endif()
+-else()
++elseif(WITH_WEBKIT)
+ px_check_modules(WEBKIT webkit-1.0)
+-endif()
+\ No newline at end of file
++endif()
+diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk
+--- libproxy/cmake.orig/pkgconfig.cmk 2010-09-01 13:23:34.000000000 -0700
++++ libproxy/cmake/pkgconfig.cmk 2010-09-10 07:52:14.000000000 -0700
+@@ -1,4 +1,4 @@
+-if(NOT WIN32 AND NOT APPLE)
++if(NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
+ find_package(PkgConfig)
+
+ # Define our magical px_check_modules function
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-09-10 17:09:30 UTC (rev 71364)
+++ trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff 2010-09-10 17:10:10 UTC (rev 71365)
@@ -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}
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-09-10 17:09:30 UTC (rev 71364)
+++ trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff 2010-09-10 17:10:10 UTC (rev 71365)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100910/a5c177e6/attachment.html>
More information about the macports-changes
mailing list