Revision: 145210 https://trac.macports.org/changeset/145210 Author: devans@macports.org Date: 2016-01-28 08:32:55 -0800 (Thu, 28 Jan 2016) Log Message: ----------- libproxy: update to version 0.4.12 using new github repo. Modified Paths: -------------- trunk/dports/net/libproxy/Portfile trunk/dports/net/libproxy/files/patch-bindings-perl-src-CMakeLists.txt.diff trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff Modified: trunk/dports/net/libproxy/Portfile =================================================================== --- trunk/dports/net/libproxy/Portfile 2016-01-28 15:55:21 UTC (rev 145209) +++ trunk/dports/net/libproxy/Portfile 2016-01-28 16:32:55 UTC (rev 145210) @@ -2,20 +2,19 @@ # $Id$ PortSystem 1.0 +PortGroup github 1.0 PortGroup cmake 1.0 cmake.out_of_source yes +github.setup libproxy libproxy 0.4.12 name libproxy -version 0.4.11 epoch 1 -revision 5 categories net maintainers devans openmaintainer platforms darwin license LGPL-2.1+ -homepage http://code.google.com/p/${name}/ -master_sites googlecode +homepage http://libproxy.github.io/libproxy description A library that provides automatic proxy configuration management. @@ -24,8 +23,8 @@ network resource, how do I reach it? It handles all \ the details, enabling you to get back to programming. -checksums rmd160 382110e088faf7a170ac838864d675204d886237 \ - sha256 dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b +checksums rmd160 bd1c6bb487d883175d7f7471398b9e9c6e0d2f5f \ + sha256 6eae0cedb03bfcd7f6bd27f04bf5249de4e37340a38de7a4d53edba29d3470ad patchfiles patch-libproxy-cmake.diff \ patch-libproxy-test-CMakeLists.txt.diff \ @@ -56,7 +55,6 @@ configure.args-append \ -DMP_MACOSX=NO \ - -DWITH_KDE4=NO \ -DWITH_WEBKIT=NO \ -DWITH_WEBKIT3=NO \ -DWITH_VALA=YES \ @@ -64,9 +62,7 @@ -DWITH_PYTHON=NO variant kde description {Enable KDE4 plugin} { - configure.args-delete -DWITH_KDE4=NO - configure.args-append -DWITH_KDE4=YES \ - -DQT_QT_INCLUDE_DIR=${prefix}/include/QtCore + configure.args-append -DQT_QT_INCLUDE_DIR=${prefix}/include/QtCore depends_lib-append port:kdelibs4 } @@ -91,5 +87,3 @@ reinplace "s:-D_POSIX_C_SOURCE=200112L:-D_POSIX_C_SOURCE=200112L -D_DARWIN_C_SOURCE=1:" ${worksrcpath}/libproxy/CMakeLists.txt } } - -livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" Modified: trunk/dports/net/libproxy/files/patch-bindings-perl-src-CMakeLists.txt.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-bindings-perl-src-CMakeLists.txt.diff 2016-01-28 15:55:21 UTC (rev 145209) +++ trunk/dports/net/libproxy/files/patch-bindings-perl-src-CMakeLists.txt.diff 2016-01-28 16:32:55 UTC (rev 145210) @@ -1,8 +1,8 @@ ---- bindings/perl/src/CMakeLists.txt.orig 2013-11-02 11:56:51.000000000 -0700 -+++ bindings/perl/src/CMakeLists.txt 2013-11-02 11:59:08.000000000 -0700 +--- bindings/perl/src/CMakeLists.txt.orig 2016-01-12 08:41:07.000000000 -0800 ++++ bindings/perl/src/CMakeLists.txt 2016-01-28 08:17:46.000000000 -0800 @@ -14,6 +14,7 @@ - target_link_libraries(PLlibproxy ${PERL_LIBRARY} libproxy) + target_link_libraries(PLlibproxy libproxy pthread) set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy") +set_target_properties(PLlibproxy PROPERTIES INSTALL_NAME_DIR ${PX_PERL_ARCH}/auto/Net/Libproxy ) set_target_properties(PLlibproxy PROPERTIES PREFIX "") Modified: trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff 2016-01-28 15:55:21 UTC (rev 145209) +++ trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff 2016-01-28 16:32:55 UTC (rev 145210) @@ -1,15 +1,14 @@ -diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk ---- libproxy/cmake.orig/libproxy.cmk 2012-10-02 07:20:40.000000000 -0700 -+++ libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -0700 +--- libproxy/cmake/libproxy.cmk.orig 2016-01-12 08:41:07.000000000 -0800 ++++ libproxy/cmake/libproxy.cmk 2016-01-28 08:05:23.000000000 -0800 @@ -18,7 +18,7 @@ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings. -set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) +set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1) + set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) - install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk --- libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.000000000 -0700 +++ libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.000000000 -0700 @@ -29,22 +28,6 @@ option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF) option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON) if(WITH_GNOME3) -diff -ur libproxy/cmake.orig/modules/config_kde4.cmk libproxy/cmake/modules/config_kde4.cmk ---- libproxy/cmake.orig/modules/config_kde4.cmk 2010-06-14 10:40:47.000000000 -0700 -+++ libproxy/cmake/modules/config_kde4.cmk 2012-10-19 13:45:42.000000000 -0700 -@@ -1,4 +1,4 @@ --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX)) - 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-06-14 10:40:47.000000000 -0700 +++ libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.000000000 -0700