Changeset 98907


Ignore:
Timestamp:
Oct 20, 2012, 5:38:32 PM (12 years ago)
Author:
devans@…
Message:

libproxy: update to version 0.4.10, fix broken +kde variant.

Location:
trunk/dports/net/libproxy
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/dports/net/libproxy/Portfile

    r84114 r98907  
    33
    44PortSystem          1.0
    5 PortGroup           archcheck 1.0
    65PortGroup           cmake 1.0
    76
    87name                libproxy
    9 version             0.4.7
     8version             0.4.10
    109epoch               1
    1110license             LGPL-2.1
    … …  
    2423                    the details, enabling you to get back to programming.
    2524
    26 checksums           sha1    b01ebbdf837babf63f38ee34e261d76f23dad319 \
    27                     rmd160  a09c8320cbabed23c84ceddf3c9b572cf89c9c0e
     25checksums           rmd160  4444521adbe165f734041c6d23ddc4a1b666a98a \
     26                    sha256  023e3c1023c522333ac4c414e9cb6db05bc564d3e5d30570e2db07aac100c635
    2827
    29 patchfiles          patch-libproxy-cmake.diff
     28pre-patch {
     29    copy ${worksrcpath}/libproxy/cmake ${worksrcpath}/libproxy/cmake.orig
     30    copy ${worksrcpath}/libproxy/test/CMakeLists.txt ${worksrcpath}/libproxy/test/CMakeLists.txt.orig
     31}
     32
     33patchfiles          patch-libproxy-cmake.diff \
     34                    patch-libproxy-test-CMakeLists.txt.diff
    3035
    3136depends_build-append \
    … …  
    4449    set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
    4550    depends_lib-append port:python27
    46     configure.python ${prefix}/bin/python2.7
    4751    configure.args-append \
     52                    -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
    4853                    -DPYTHON_SITEPKG_DIR=${python_prefix}/lib/python2.7/site-packages
    4954}
    … …  
    5560    configure.python ${prefix}/bin/python2.6
    5661    configure.args-append \
     62                    -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 \
    5763                    -DPYTHON_SITEPKG_DIR=${python_prefix}/lib/python2.6/site-packages
    5864}
    … …  
    7076#
    7177
     78use_parallel_build no
     79
    7280configure.args-append \
     81                    -DMP_MACOSX=NO \
    7382                    -DWITH_GNOME2=YES \
    7483                    -DWITH_GNOME3=NO \
    7584                    -DWITH_KDE4=NO \
    7685                    -DWITH_WEBKIT=NO \
     86                    -DWITH_WEBKIT3=NO \
    7787                    -DWITH_VALA=NO \
    7888                    -DWITH_PERL=YES \
    7989                    -DWITH_PYTHON=YES
    8090
    81 variant no_gnome description {Disable GNOME plugin} {
     91variant no_gnome description {Disable GNOME2 plugin} {
    8292        configure.args-delete -DWITH_GNOME2=YES
    8393        configure.args-append -DWITH_GNOME2=NO
    … …  
    8797variant kde description {Enable KDE4 plugin} {
    8898        configure.args-delete -DWITH_KDE4=NO
    89         configure.args-append -DWITH_KDE4=YES
     99        configure.args-append -DWITH_KDE4=YES \
     100                              -DQT_QT_INCLUDE_DIR=${prefix}/include/QtCore
    90101        depends_lib-append port:kdelibs4
    91102}

  • trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff

    r84114 r98907  
    1 diff -ur libproxy/cmake.orig/devfiles.cmk libproxy/cmake/devfiles.cmk
    2 --- libproxy/cmake.orig/devfiles.cmk    2011-06-06 14:44:37.000000000 -0700
    3 +++ libproxy/cmake/devfiles.cmk 2011-09-16 16:12:57.000000000 -0700
    4 @@ -1,4 +1,4 @@
    5 -if(NOT WIN32 AND NOT APPLE)
    6 +if(NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
    7    # PkgConfig file
    8    set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
    9    
     1diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk
     2--- libproxy/cmake.orig/libproxy.cmk    2012-10-02 07:20:40.000000000 -0700
     3+++ libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -0700
     4@@ -18,7 +18,7 @@
     5 set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
     6              PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
     7 # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings.
     8-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
     9+set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1)
     10 set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
     11 install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
     12 install(FILES   proxy.h  DESTINATION ${INCLUDE_INSTALL_DIR})
    1013diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk
    11 --- libproxy/cmake.orig/modules/config_envvar.cmk       2011-06-06 14:44:37.000000000 -0700
    12 +++ libproxy/cmake/modules/config_envvar.cmk    2011-09-16 16:12:57.000000000 -0700
     14--- libproxy/cmake.orig/modules/config_envvar.cmk       2010-06-14 10:40:47.000000000 -0700
     15+++ libproxy/cmake/modules/config_envvar.cmk    2012-10-19 13:45:42.000000000 -0700
    1316@@ -1,3 +1,3 @@
    1417-if (NOT WIN32 AND NOT APPLE)
    15 +if (NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
     18+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
    1619   set(ENVVAR_FOUND 1)
    1720-endif()
    … …  
    1922+endif()
    2023diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk
    21 --- libproxy/cmake.orig/modules/config_gnome.cmk        2011-06-06 14:44:37.000000000 -0700
    22 +++ libproxy/cmake/modules/config_gnome.cmk     2011-09-16 16:15:31.000000000 -0700
     24--- libproxy/cmake.orig/modules/config_gnome.cmk        2012-10-02 07:20:40.000000000 -0700
     25+++ libproxy/cmake/modules/config_gnome.cmk     2012-10-19 13:45:42.000000000 -0700
    2326@@ -1,4 +1,4 @@
    2427-if (NOT WIN32 AND NOT APPLE)
    25 +if (NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
     28+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
     29   option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF)
    2630   option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON)
    2731   if(WITH_GNOME3)
    28      px_check_modules(GNOME3 gio-2.0>=2.26 gobject-2.0)
    2932diff -ur libproxy/cmake.orig/modules/config_kde4.cmk libproxy/cmake/modules/config_kde4.cmk
    30 --- libproxy/cmake.orig/modules/config_kde4.cmk 2011-06-06 14:44:37.000000000 -0700
    31 +++ libproxy/cmake/modules/config_kde4.cmk      2011-09-16 16:12:57.000000000 -0700
     33--- libproxy/cmake.orig/modules/config_kde4.cmk 2010-06-14 10:40:47.000000000 -0700
     34+++ libproxy/cmake/modules/config_kde4.cmk      2012-10-19 13:45:42.000000000 -0700
    3235@@ -1,4 +1,4 @@
    3336-if (NOT WIN32 AND NOT APPLE)
    34 +if (NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
     37+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
    3538   option(WITH_KDE4 "Search for KDE4 package" ON)
    3639   if (WITH_KDE4)
    … …  
    4447+endif()
    4548diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk
    46 --- libproxy/cmake.orig/modules/config_macosx.cmk       2011-06-06 14:44:37.000000000 -0700
    47 +++ libproxy/cmake/modules/config_macosx.cmk    2011-09-16 16:12:57.000000000 -0700
     49--- libproxy/cmake.orig/modules/config_macosx.cmk       2010-06-14 10:40:47.000000000 -0700
     50+++ libproxy/cmake/modules/config_macosx.cmk    2012-10-19 13:45:42.000000000 -0700
    4851@@ -1,4 +1,4 @@
    4952-if(APPLE)
    50 +if(APPLE AND MP_QUARTZ)
     53+if(APPLE AND MP_MACOSX)
    5154   find_library(SC_LIBRARIES SystemConfiguration)
    5255   find_library(CF_LIBRARIES CoreFoundation)
    … …  
    6063+endif()
    6164diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk
    62 --- libproxy/cmake.orig/modules/pacrunner_webkit.cmk    2011-06-06 14:44:37.000000000 -0700
    63 +++ libproxy/cmake/modules/pacrunner_webkit.cmk 2011-09-16 16:19:47.000000000 -0700
     65--- libproxy/cmake.orig/modules/pacrunner_webkit.cmk    2012-10-02 07:20:40.000000000 -0700
     66+++ libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.000000000 -0700
    6467@@ -6,7 +6,7 @@
    6568     link_directories(WEBKIT_LIBRARIES)
    … …  
    6770   endif()
    6871-elseif(APPLE)
    69 +elseif(APPLE AND MP_QUARTZ)
     72+elseif(APPLE AND MP_MACOSX)
    7073   find_library(WEBKIT_LIBRARIES JavaScriptCore)
    7174   if(WEBKIT_LIBRARIES)
    7275     set(WEBKIT_FOUND 1)
    7376diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk
    74 --- libproxy/cmake.orig/pkgconfig.cmk   2011-06-06 14:44:37.000000000 -0700
    75 +++ libproxy/cmake/pkgconfig.cmk        2011-09-16 16:12:57.000000000 -0700
     77--- libproxy/cmake.orig/pkgconfig.cmk   2012-10-02 07:20:40.000000000 -0700
     78+++ libproxy/cmake/pkgconfig.cmk        2012-10-19 13:45:42.000000000 -0700
    7679@@ -1,4 +1,4 @@
    7780-if(NOT WIN32 AND NOT APPLE)
    78 +if(NOT WIN32 AND NOT (APPLE AND MP_QUARTZ))
     81+if(NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
    7982   find_package(PkgConfig)
    8083 
Note: See TracChangeset for help on using the changeset viewer.