Index: head/MOVED =================================================================== --- head/MOVED +++ head/MOVED @@ -10288,3 +10288,4 @@ multimedia/qt5-phonon4-designerplugin|multimedia/phonon-designerplugin@qt5|2018-06-21|Moved to a flavored version multimedia/qt5-phonon4-gstreamer|multimedia/phonon-gstreamer@qt5|2018-06-21|Moved to a flavored version multimedia/qt5-phonon4-vlc|multimedia/phonon-vlc@qt5|2018-06-21|Moved to a flavored version +net/libproxy-gnome|net/libproxy-gnome2|2018-07-22|Renamed to make slave names consistent Index: head/irc/hexchat/Makefile =================================================================== --- head/irc/hexchat/Makefile +++ head/irc/hexchat/Makefile @@ -4,6 +4,7 @@ PORTNAME= hexchat PORTVERSION= 2.14.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= irc gnome ipv6 MAINTAINER= pkubaj@anongoth.pl Index: head/multimedia/libquvi09/Makefile =================================================================== --- head/multimedia/libquvi09/Makefile +++ head/multimedia/libquvi09/Makefile @@ -3,7 +3,7 @@ PORTNAME= libquvi PORTVERSION= 0.9.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia devel MASTER_SITES= SF/quvi/${PORTVERSION:R}/${PORTNAME}/ \ LOCAL/sunpoet Index: head/net/Makefile =================================================================== --- head/net/Makefile +++ head/net/Makefile @@ -410,13 +410,14 @@ SUBDIR += libpcap SUBDIR += libpcapnav SUBDIR += libproxy - SUBDIR += libproxy-gnome + SUBDIR += libproxy-gnome2 SUBDIR += libproxy-gnome3 SUBDIR += libproxy-kde SUBDIR += libproxy-mozjs SUBDIR += libproxy-perl SUBDIR += libproxy-python SUBDIR += libproxy-webkit + SUBDIR += libproxy-webkit3 SUBDIR += librdkafka SUBDIR += librouteros SUBDIR += librsync2 Index: head/net/glib-networking/Makefile =================================================================== --- head/net/glib-networking/Makefile +++ head/net/glib-networking/Makefile @@ -3,6 +3,7 @@ PORTNAME= glib-networking PORTVERSION= 2.50.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Index: head/net/libproxy-gnome/Makefile =================================================================== --- head/net/libproxy-gnome/Makefile +++ head/net/libproxy-gnome/Makefile @@ -1,31 +0,0 @@ -# Created by: Joe Marcus Clarke -# $FreeBSD$ -# $MCom: ports/net/libproxy-gnome/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $ - -PORTREVISION= 0 -CATEGORIES= net devel -PKGNAMESUFFIX= -gnome - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GConf-based plug-in for libproxy - -LIB_DEPENDS= libproxy.so:net/libproxy - -MASTERDIR= ${.CURDIR}/../libproxy -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -ALL_TARGET= config_gnome pxgconf -USE_GNOME= gconf2 glib20 -USES= pkgconfig - -LIBPROXY_SLAVE= gnome - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/ - ${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/config_gnome.so \ - ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/ - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libproxy/pxgconf \ - ${STAGEDIR}${PREFIX}/libexec/ - -.include "${MASTERDIR}/Makefile" Index: head/net/libproxy-gnome/pkg-descr =================================================================== --- head/net/libproxy-gnome/pkg-descr +++ head/net/libproxy-gnome/pkg-descr @@ -1,8 +0,0 @@ -Libproxy exists to answer the question: Given a network resource, how do I -reach it? It handles all the details, enabling you to get back to -programming. - -This plug-in allows libproxy to obtain proxy settings from a GNOME2 desktop -by using GConf. - -WWW: https://libproxy.github.io/libproxy/ Index: head/net/libproxy-gnome/pkg-plist =================================================================== --- head/net/libproxy-gnome/pkg-plist +++ head/net/libproxy-gnome/pkg-plist @@ -1,2 +0,0 @@ -lib/libproxy/%%VERSION%%/modules/config_gnome.so -libexec/pxgconf Index: head/net/libproxy-gnome2/Makefile =================================================================== --- head/net/libproxy-gnome2/Makefile +++ head/net/libproxy-gnome2/Makefile @@ -0,0 +1,15 @@ +# Created by: Joe Marcus Clarke +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= net devel +PKGNAMESUFFIX= -${LIBPROXY_SLAVE} + +COMMENT= GConf-based plug-in for libproxy + +USE_GNOME= gconf2 glib20 + +LIBPROXY_SLAVE= gnome2 +MASTERDIR= ${.CURDIR}/../libproxy + +.include "${MASTERDIR}/Makefile" Index: head/net/libproxy-gnome2/pkg-descr =================================================================== --- head/net/libproxy-gnome2/pkg-descr +++ head/net/libproxy-gnome2/pkg-descr @@ -0,0 +1,8 @@ +Libproxy exists to answer the question: Given a network resource, how do I +reach it? It handles all the details, enabling you to get back to +programming. + +This plug-in allows libproxy to obtain proxy settings from a GNOME2 desktop +by using GConf. + +WWW: https://libproxy.github.io/libproxy/ Index: head/net/libproxy-gnome2/pkg-plist =================================================================== --- head/net/libproxy-gnome2/pkg-plist +++ head/net/libproxy-gnome2/pkg-plist @@ -0,0 +1,2 @@ +lib/libproxy/%%VERSION%%/modules/config_gnome.so +libexec/pxgconf Index: head/net/libproxy-gnome3/Makefile =================================================================== --- head/net/libproxy-gnome3/Makefile +++ head/net/libproxy-gnome3/Makefile @@ -2,28 +2,13 @@ PORTREVISION= 0 CATEGORIES= net devel -PKGNAMESUFFIX= -gnome3 +PKGNAMESUFFIX= -${LIBPROXY_SLAVE} -MAINTAINER= gnome@FreeBSD.org COMMENT= GSettings-based configuration plug-in for libproxy -LIB_DEPENDS= libproxy.so:net/libproxy - -MASTERDIR= ${.CURDIR}/../libproxy -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -ALL_TARGET= config_gnome3 pxgsettings USE_GNOME= glib20 -USES= pkgconfig LIBPROXY_SLAVE= gnome3 - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/ - ${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/config_gnome3.so \ - ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/ - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libproxy/pxgsettings \ - ${STAGEDIR}${PREFIX}/libexec/ +MASTERDIR= ${.CURDIR}/../libproxy .include "${MASTERDIR}/Makefile" Index: head/net/libproxy-kde/Makefile =================================================================== --- head/net/libproxy-kde/Makefile +++ head/net/libproxy-kde/Makefile @@ -1,29 +1,16 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/net/libproxy-kde/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $ -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= net devel -PKGNAMESUFFIX= -kde +PKGNAMESUFFIX= -${LIBPROXY_SLAVE} -MAINTAINER= gnome@FreeBSD.org COMMENT= KDE plug-in for libproxy -LIB_DEPENDS= libproxy.so:net/libproxy - -MASTERDIR= ${.CURDIR}/../libproxy -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -ALL_TARGET= config_kde +USES= kde:4 USE_KDE= runtime -USES+= kde:4 LIBPROXY_SLAVE= kde - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/ - ${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/config_kde.so \ - ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/ +MASTERDIR= ${.CURDIR}/../libproxy .include "${MASTERDIR}/Makefile" Index: head/net/libproxy-mozjs/Makefile =================================================================== --- head/net/libproxy-mozjs/Makefile +++ head/net/libproxy-mozjs/Makefile @@ -1,29 +1,18 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/net/libproxy-mozjs/Makefile,v 1.5 2011/01/12 13:10:53 kwm Exp $ PORTREVISION= 0 CATEGORIES= net www -PKGNAMESUFFIX= -mozjs +PKGNAMESUFFIX= -${LIBPROXY_SLAVE} -MAINTAINER= gnome@FreeBSD.org + COMMENT= Mozilla JavaScript plug-in for libproxy -LIB_DEPENDS= libmozjs185.so:lang/spidermonkey185 \ - libproxy.so:net/libproxy +USES= compiler:c++11-lib +USE_CXXSTD= gnu++11 +LIB_DEPENDS= libmozjs-38.so:lang/spidermonkey38 -MASTERDIR= ${.CURDIR}/../libproxy -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -ALL_TARGET= pacrunner_mozjs -USES= pkgconfig - LIBPROXY_SLAVE= mozjs - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/ - ${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/pacrunner_mozjs.so \ - ${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/ +MASTERDIR= ${.CURDIR}/../libproxy .include "${MASTERDIR}/Makefile" Index: head/net/libproxy-perl/Makefile =================================================================== --- head/net/libproxy-perl/Makefile +++ head/net/libproxy-perl/Makefile @@ -1,24 +1,17 @@ # Created by: Koop Mast # $FreeBSD$ -# $MCom: ports/net/libproxy-perl/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $ PORTREVISION= 0 CATEGORIES= net lang -PKGNAMESUFFIX= -perl +PKGNAMESUFFIX= -${LIBPROXY_SLAVE} -MAINTAINER= gnome@FreeBSD.org COMMENT= Perl binding for libproxy -LIB_DEPENDS= libproxy.so:net/libproxy - -MASTERDIR= ${.CURDIR}/../libproxy -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/bindings/perl -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/bindings/perl USES= perl5 +CMAKE_ON= PERL_VENDORINSTALL PERL_LINK_LIBPERL +CMAKE_ARGS= -DPX_PERL_ARCH=${SITE_ARCH} LIBPROXY_SLAVE= perl +MASTERDIR= ${.CURDIR}/../libproxy .include "${MASTERDIR}/Makefile" Index: head/net/libproxy-python/Makefile =================================================================== --- head/net/libproxy-python/Makefile +++ head/net/libproxy-python/Makefile @@ -1,26 +1,18 @@ # Created by: Koop Mast # $FreeBSD$ -# $MCom: ports/net/libproxy-python/Makefile,v 1.1 2011/01/12 13:10:54 kwm Exp $ PORTREVISION= 0 CATEGORIES= net lang -PKGNAMESUFFIX= -python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= -${LIBPROXY_SLAVE} -MAINTAINER= gnome@FreeBSD.org -COMMENT= python binding for libproxy +COMMENT= Python binding for libproxy -RUN_DEPENDS= libproxy>=${PORTVERSION}:net/libproxy +USES= python +USE_PYTHON= flavors py3kplist -MASTERDIR= ${.CURDIR}/../libproxy -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/bindings/python -NO_ARCH= yes -NO_BUILD= yes -USES= python:2.7 - LIBPROXY_SLAVE= python +MASTERDIR= ${.CURDIR}/../libproxy post-install: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ Index: head/net/libproxy-webkit/Makefile =================================================================== --- head/net/libproxy-webkit/Makefile +++ head/net/libproxy-webkit/Makefile @@ -1,29 +1,16 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/net/libproxy-webkit/Makefile,v 1.13 2011/03/06 23:12:41 kwm Exp $ PORTREVISION= 0 CATEGORIES= net www -PKGNAMESUFFIX= -webkit +PKGNAMESUFFIX= -${LIBPROXY_SLAVE} -MAINTAINER= gnome@FreeBSD.org + COMMENT= WebKit JavaScript plug-in for libproxy -LIB_DEPENDS= libjavascriptcoregtk-3.0.so:www/webkit-gtk3 \ - libproxy.so:net/libproxy +LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 -MASTERDIR= ${.CURDIR}/../libproxy -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -ALL_TARGET= pacrunner_webkit -USES= pkgconfig - LIBPROXY_SLAVE= webkit - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/ - ${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/pacrunner_webkit.so \ - ${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/ +MASTERDIR= ${.CURDIR}/../libproxy .include "${MASTERDIR}/Makefile" Index: head/net/libproxy-webkit3/Makefile =================================================================== --- head/net/libproxy-webkit3/Makefile +++ head/net/libproxy-webkit3/Makefile @@ -0,0 +1,18 @@ +# Created by: Joe Marcus Clarke +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= net www +PKGNAMESUFFIX= -${LIBPROXY_SLAVE} + +COMMENT= WebKit JavaScript plug-in for libproxy + +LIB_DEPENDS= libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 + +USES= gettext-runtime +USE_GNOME= glib20 + +LIBPROXY_SLAVE= webkit3 +MASTERDIR= ${.CURDIR}/../libproxy + +.include "${MASTERDIR}/Makefile" Index: head/net/libproxy-webkit3/pkg-descr =================================================================== --- head/net/libproxy-webkit3/pkg-descr +++ head/net/libproxy-webkit3/pkg-descr @@ -0,0 +1,7 @@ +Libproxy exists to answer the question: Given a network resource, how do I +reach it? It handles all the details, enabling you to get back to +programming. + +This plug-in allows the WebKit web browser to make use of libproxy. + +WWW: https://libproxy.github.io/libproxy/ Index: head/net/libproxy-webkit3/pkg-plist =================================================================== --- head/net/libproxy-webkit3/pkg-plist +++ head/net/libproxy-webkit3/pkg-plist @@ -0,0 +1 @@ +lib/libproxy/%%VERSION%%/modules/pacrunner_webkit.so Index: head/net/libproxy/Makefile =================================================================== --- head/net/libproxy/Makefile +++ head/net/libproxy/Makefile @@ -1,9 +1,8 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/net/libproxy/Makefile,v 1.1 2011/01/12 13:10:52 kwm Exp $ PORTNAME= libproxy -PORTVERSION= 0.4.12 +PORTVERSION= 0.4.15 PORTREVISION?= 0 CATEGORIES?= net devel @@ -13,71 +12,54 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING -CPE_VENDOR= libproxy_project +USES+= cmake:outsource cpe pathfix pkgconfig +CPE_VENDOR= libproxy_project PATHFIX_CMAKELISTSTXT= devfiles.cmk -USE_GITHUB= yes -USES+= cmake:outsource cpe pathfix +USE_GITHUB= yes -PLIST_SUB+= VERSION=${PORTVERSION} +CMAKE_ON+= WITH_VALA +CMAKE_OFF+= BIPR WITH_DOTNET WITH_NATUS WITH_NM WITH_NMold -CMAKE_ARGS= -DBIPR:BOOL=OFF -DWITH_DOTNET:BOOL=OFF \ - -DWITH_NATUS:BOOL=OFF -DWITH_NM:BOOL=OFF \ - -DWITH_VALA:BOOL=ON +# Slave ports. +LIBPROXY_SLAVES= library gnome2 gnome3 kde mozjs python perl webkit webkit3 -.if !defined(LIBPROXY_SLAVE) -USE_LDCONFIG= yes -CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF -DWITH_PERL:BOOL=OFF \ - -DWITH_GNOME2:BOOL=OFF -DWITH_GNOME3:BOOL=OFF \ - -DWITH_KDE:BOOL=OFF -DWITH_MOZJS:BOOL=OFF \ - -DWITH_WEBKIT:BOOL=OFF -DWITH_WEBKIT3:BOOL=OFF -.else -PORTSCOUT= ignore:1 +# If nothing is set, we're building the library, i.e. this port. +LIBPROXY_SLAVE?= library -# Libproxy is build for the slave ports, since I haven't been able to find -# out how to only build optional code with cmake. -# Patches for this problem are welcome. +PLIST_SUB+= VERSION=${PORTVERSION} -. if ${LIBPROXY_SLAVE}=="python" -CMAKE_ARGS+= -DWITH_PYTHON:BOOL=ON -. else -CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF -. endif +# Activate the wanted module, and deactivate the others +CMAKE_ON+= WITH_${LIBPROXY_SLAVE:tu} +CMAKE_OFF+= ${LIBPROXY_SLAVES:N${LIBPROXY_SLAVE}:tu:S/^/WITH_/} -. if ${LIBPROXY_SLAVE}=="perl" -CMAKE_ARGS+= -DWITH_PERL:BOOL=ON -. else -CMAKE_ARGS+= -DWITH_PERL:BOOL=OFF -. endif +# Setup slave ports. +.if ${LIBPROXY_SLAVE:Nlibrary} +USES+= localbase +LIB_DEPENDS+= libproxy.so:net/libproxy +DESCR= ${.CURDIR:H}/${PORTNAME}-${LIBPROXY_SLAVE}/pkg-descr +PLIST= ${.CURDIR:H}/${PORTNAME}-${LIBPROXY_SLAVE}/pkg-plist +.endif -. if ${LIBPROXY_SLAVE}=="gnome" -CMAKE_ARGS+= -DWITH_GNOME2:BOOL=ON -. else -CMAKE_ARGS+= -DWITH_GNOME2:BOOL=OFF -. endif +.if ${LIBPROXY_SLAVE:Mwebkit3} +# Additionally to WITH_WEBKIT3 also WITH_WEBKIT is required. +CMAKE_ON+= WITH_WEBKIT +CMAKE_OFF:= ${CMAKE_OFF:C/WITH_WEBKIT//} +.endif -. if ${LIBPROXY_SLAVE}=="gnome3" -CMAKE_ARGS+= -DWITH_GNOME3:BOOL=ON -. else -CMAKE_ARGS+= -DWITH_GNOME3:BOOL=OFF -. endif +.include -. if ${LIBPROXY_SLAVE}=="kde" -CMAKE_ARGS+= -DWITH_KDE:BOOL=ON -. else -CMAKE_ARGS+= -DWITH_KDE:BOOL=OFF -. endif - -. if ${LIBPROXY_SLAVE}=="webkit" -CMAKE_ARGS+= -DWITH_WEBKIT3:BOOL=ON -. else -CMAKE_ARGS+= -DWITH_WEBKIT3:BOOL=OFF -DWITH_WEBKIT:BOOL=OFF -. endif - -. if ${LIBPROXY_SLAVE}=="mozjs" -CMAKE_ARGS+= -DWITH_MOZJS:BOOL=ON -. else -CMAKE_ARGS+= -DWITH_MOZJS:BOOL=OFF -. endif +# Hackery for the to python backends. +.if ${LIBPROXY_SLAVE:Mpython} +. if ${PYTHON_MAJOR_VER} == 2 +CMAKE_ON+= WITH_PYTHON2 +CMAKE_OFF+= WITH_PYTHON3 +CMAKE_ARGS+= -DPYTHON2_EXECUTABLE:FILEPATH=${PYTHON_CMD} +. else +CMAKE_ON+= WITH_PYTHON3 +CMAKE_OFF+= WITH_PYTHON2 +. endif +.else +CMAKE_OFF+= WITH_PYTHON2 WITH_PYTHON3 .endif -.include +.include Index: head/net/libproxy/distinfo =================================================================== --- head/net/libproxy/distinfo +++ head/net/libproxy/distinfo @@ -1,2 +1,3 @@ -SHA256 (libproxy-libproxy-0.4.12_GH0.tar.gz) = add9c5e30767c17b00f842f6280d818ece1eb23ab92e1fc68661204c95d7e22b -SIZE (libproxy-libproxy-0.4.12_GH0.tar.gz) = 87765 +TIMESTAMP = 1499371033 +SHA256 (libproxy-libproxy-0.4.15_GH0.tar.gz) = 18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0 +SIZE (libproxy-libproxy-0.4.15_GH0.tar.gz) = 93084 Index: head/net/libproxy/files/patch-CMakeLists.txt =================================================================== --- head/net/libproxy/files/patch-CMakeLists.txt +++ head/net/libproxy/files/patch-CMakeLists.txt @@ -0,0 +1,31 @@ +As the library is only built in the master port, and therfore missing in the +build directory for the slave ports, find it via pkg-config and link against it, +when building a slave. + +--- CMakeLists.txt.orig 2017-05-11 09:33:33 UTC ++++ CMakeLists.txt +@@ -23,6 +23,15 @@ else() + set(CMAKE_INSTALL_CONFIG_NAME ${CMAKE_BUILD_TYPE}) + endif() + ++# Make building the library optional. ++option(WITH_LIBRARY "Build libproxy.so" ON) ++ ++if (NOT WITH_LIBRARY) ++ # For the other ports provide an easy way to link against libproxy.so via PkgConfig::LIBPROXY. ++ find_package(PkgConfig) ++ pkg_check_modules(LIBPROXY libproxy-1.0 REQUIRED IMPORTED_TARGET) ++endif () ++ + include(cmake/cpack.cmk) + include(cmake/ctest.cmk) + include(cmake/paths.cmk) +@@ -56,5 +65,7 @@ endif() + + # Always build these + add_subdirectory(libproxy) +-add_subdirectory(utils) ++if (WITH_LIBRARY) ++ add_subdirectory(utils) ++endif() + Index: head/net/libproxy/files/patch-bindings_CMakeLists.txt =================================================================== --- head/net/libproxy/files/patch-bindings_CMakeLists.txt +++ head/net/libproxy/files/patch-bindings_CMakeLists.txt @@ -0,0 +1,18 @@ +Only build the library in the master port. + +--- bindings/CMakeLists.txt.orig 2017-05-11 09:33:33 UTC ++++ bindings/CMakeLists.txt +@@ -20,6 +20,7 @@ if (WITH_PERL) + endif() + + # Install Vala bindings / Install only when -DWITH_VALA is passed to cmake. ++if (WITH_LIBRARY) + option(WITH_VALA "Enables Vala bindings" OFF) + if(WITH_VALA) + if (NOT VAPI_DIR) +@@ -27,4 +28,5 @@ if(WITH_VALA) + endif() + install(FILES vala/libproxy-1.0.vapi DESTINATION ${VAPI_DIR}) + set(VAPI_DIR ${VAPI_DIR} CACHE PATH "Vala API directory") ++endif() + endif() Index: head/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt =================================================================== --- head/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt +++ head/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt @@ -1,21 +1,24 @@ -* Explicitly against libperl.so.x.y. - This is being discussed in https://github.com/libproxy/libproxy/pull/7. - We need this for `make stage-qa' to pass, as the Libproxy.so binding uses - libperl symbols and thus should link against it. +As the library is only built in the master port, and therfore missing in the +build directory for the slave ports, find it via pkg-config and link against it, +when building a slave. -* Set RPATH in Libproxy.so. - We do not install libperl.so into ${LOCALBASE}/lib, so the Libproxy.so ELF - binary must be told the non-default location where it should look for - libperl.so.x.y. ---- bindings/perl/src/CMakeLists.txt.orig 2016-01-12 16:41:07 UTC +--- bindings/perl/src/CMakeLists.txt.orig 2018-06-03 17:39:41 UTC +++ bindings/perl/src/CMakeLists.txt -@@ -12,7 +12,8 @@ set(Libproxy_LIB_SRCS Libproxy.c) +@@ -4,7 +4,7 @@ include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOUR + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c + COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/doxsubpp.pl + ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c +- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs libproxy ++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + + set(Libproxy_LIB_SRCS Libproxy.c) +@@ -12,7 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net) add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS}) --target_link_libraries(PLlibproxy libproxy pthread) -+target_link_libraries(PLlibproxy ${PERL_LIBRARY} libproxy pthread) -+set_target_properties(PLlibproxy PROPERTIES INSTALL_RPATH "${PERL_INCLUDE_DIR}") - set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy") - set_target_properties(PLlibproxy PROPERTIES PREFIX "") - +-set(PLlibproxy_LIB_DEPENDENCIES libproxy pthread) ++set(PLlibproxy_LIB_DEPENDENCIES PkgConfig::LIBPROXY pthread) + if(PERL_LINK_LIBPERL) + set(PLlibproxy_LIB_DEPENDENCIES ${PERL_LIBRARY} ${PLlibproxy_LIB_DEPENDENCIES}) + endif() Index: head/net/libproxy/files/patch-bindings_perl_t_CMakeLists.txt =================================================================== --- head/net/libproxy/files/patch-bindings_perl_t_CMakeLists.txt +++ head/net/libproxy/files/patch-bindings_perl_t_CMakeLists.txt @@ -0,0 +1,5 @@ +--- bindings/perl/t/CMakeLists.txt.orig 2017-05-11 09:33:33 UTC ++++ bindings/perl/t/CMakeLists.txt +@@ -1 +1 @@ +-add_custom_target(test prove -b ${CMAKE_CURRENT_SOURCE_DIR}) ++add_custom_target(test_perl prove -b ${CMAKE_CURRENT_SOURCE_DIR}) Index: head/net/libproxy/files/patch-libproxy_CMakeLists.txt =================================================================== --- head/net/libproxy/files/patch-libproxy_CMakeLists.txt +++ head/net/libproxy/files/patch-libproxy_CMakeLists.txt @@ -16,9 +16,9 @@ /usr/include/c++/v1/__locale:569:19: error: use of undeclared identifier 'isascii' if (!(isascii(*__low) && (__tab_[static_cast(*__low)] & __m))) ^ ---- libproxy/CMakeLists.txt.orig 2016-01-12 16:41:07 UTC +--- libproxy/CMakeLists.txt.orig 2017-05-11 09:33:33 UTC +++ libproxy/CMakeLists.txt -@@ -6,7 +6,6 @@ set_project_version(0 4 12) +@@ -6,18 +6,19 @@ set_project_version(0 4 15) if (WIN32) add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) else(WIN32) @@ -26,3 +26,20 @@ set(CMAKE_CXX_FLAGS "-fvisibility=hidden ${CMAKE_CXX_FLAGS}") endif(WIN32) + ### Modules + include(cmake/modules.cmk) + +-### Dev files +-include(cmake/devfiles.cmk) ++if(WITH_LIBRARY) ++ ### Dev files ++ include(cmake/devfiles.cmk) + +-### Main library +-include(cmake/libproxy.cmk) ++ ### Main library ++ include(cmake/libproxy.cmk) ++endif() + + ### Tests + add_testdirectory(test) Index: head/net/libproxy/files/patch-libproxy_cmake_modules.cmk =================================================================== --- head/net/libproxy/files/patch-libproxy_cmake_modules.cmk +++ head/net/libproxy/files/patch-libproxy_cmake_modules.cmk @@ -1,15 +0,0 @@ -Use only the value of WITH_KDE to determine whether to build config_kde. - -See the changes in patch-libproxy_cmake_modules_config__kde.cmk for more -information. ---- libproxy/cmake/modules.cmk.orig 2016-01-18 19:41:03 UTC -+++ libproxy/cmake/modules.cmk -@@ -32,7 +32,7 @@ px_module(config_envvar "${EN - px_module(config_sysconfig "${SYSCONFIG_FOUND}" 1) - px_module(config_gnome "${GNOME2_FOUND}" 0) - px_module(config_gnome3 "${GNOME3_FOUND}" 0) --px_module(config_kde "${KDE_FOUND}" 0) -+px_module(config_kde "${WITH_KDE}" 0) - px_module(config_macosx "${SC_FOUND}" 1 ${SC_LIBRARIES} ${CF_LIBRARIES}) - px_module(config_w32reg "${WIN32}" 1) - px_module(ignore_domain 1 1) Index: head/net/libproxy/files/patch-libproxy_cmake_modules_config__kde.cmk =================================================================== --- head/net/libproxy/files/patch-libproxy_cmake_modules_config__kde.cmk +++ head/net/libproxy/files/patch-libproxy_cmake_modules_config__kde.cmk @@ -1,32 +0,0 @@ -commit f30191930114cc334e02bb471f2c547198cad91c -Author: Raphael Kubo da Costa -Date: Mon Jan 18 20:19:09 2016 +0100 - - config_kde: Decide whether to build the module based only on WITH_KDE. - - kreadconfig/kreadconfig5 are runtime dependencies only. As such, there - should not be a build-time dependency on those in CMake at all. In other - words, building without those binaries works perfectly fine, and they - are only required when running libproxy. - -commit 8ca0db36983e9154c808288fea4cbdfc9a7ea4c5 -Author: Raphael Kubo da Costa -Date: Mon Jan 18 16:59:28 2016 +0100 - - Make the KDE config module optional again. - - This is a follow-up to bd9bf72 ("Add generic KDE config module"): make - it possible for distributions to not build the KDE config module at all, - even if it does not have any dependencies on Qt/KDE/KF5. ---- libproxy/cmake/modules/config_kde.cmk.orig 2016-01-12 16:41:07 UTC -+++ libproxy/cmake/modules/config_kde.cmk -@@ -1,6 +1,4 @@ --find_program(KDE4_CONF kreadconfig) --find_program(KF5_CONF kreadconfig5) -+option(WITH_KDE "Build module to read proxy settings from KDE4/KF5" ON) - --if (KDE4_CONF OR KF5_CONF) -- set(KDE_FOUND 1) --endif() -+# There are no additional detections; kreadconfig (from KDE4) and kreadconfig5 -+# (from KF5) are only needed at runtime. Index: head/net/libproxy/files/patch-libproxy_cmake_pxmodule.cmk =================================================================== --- head/net/libproxy/files/patch-libproxy_cmake_pxmodule.cmk +++ head/net/libproxy/files/patch-libproxy_cmake_pxmodule.cmk @@ -0,0 +1,20 @@ +As the library is only built in the master port, and therfore missing in the +build directory for the slave ports, find it via pkg-config and link against it, +when building a slave. + +--- libproxy/cmake/pxmodule.cmk.orig 2017-05-11 09:33:33 UTC ++++ libproxy/cmake/pxmodule.cmk +@@ -18,7 +18,12 @@ function(px_module name build builtin) + set(built "m") + set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${LIBEXECDIR}") + add_library(${name} MODULE modules/${name}.cpp) +- target_link_libraries(${name} libproxy) ++ link_directories(${CMAKE_INSTALL_PREFIX}/lib) ++ if (WITH_LIBRARY) ++ target_link_libraries(${name} proxy) ++ else () ++ target_link_libraries(${name} PkgConfig::LIBPROXY) ++ endif () + set_target_properties(${name} PROPERTIES PREFIX "") + install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR}) + if(${ARGC} GREATER 3) Index: head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp =================================================================== --- head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp +++ head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp @@ -1,12 +1,15 @@ +First hunk: libc++ doesn't like "using namespace std" in C++11 libproxy/test/get-pac-test.cpp:48:10: error: assigning to 'int' from incompatible type '__bind' ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Second hunk: +Fix typo. ---- libproxy/test/get-pac-test.cpp.orig 2016-01-12 16:41:07 UTC -+++ libproxy/test/get-pac-test.cpp -@@ -45,7 +45,7 @@ class TestServer { +--- libproxy/test/get-pac-test.cpp.orig 2017-05-11 11:33:33.000000000 +0200 ++++ libproxy/test/get-pac-test.cpp 2018-06-02 14:32:22.796000000 +0200 +@@ -52,7 +52,7 @@ setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); @@ -15,3 +18,12 @@ assert(!ret); ret = listen(m_sock, 1); +@@ -130,7 +130,7 @@ + + #ifdef SO_NOSIGPIPE + int i = 1; +- setsockopt(c_sock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i)); ++ setsockopt(csock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i)); + #endif + + // Read request Index: head/net/libproxy/files/patch-utils_CMakeLists.txt =================================================================== --- head/net/libproxy/files/patch-utils_CMakeLists.txt +++ head/net/libproxy/files/patch-utils_CMakeLists.txt @@ -0,0 +1,17 @@ +As the library is only built in the master port, and therfore missing in the +build directory for the slave ports, find it via pkg-config and link against it, +when building a slave. + +--- utils/CMakeLists.txt.orig 2017-05-11 09:33:33 UTC ++++ utils/CMakeLists.txt +@@ -1,5 +1,9 @@ + include_directories("../libproxy") + + add_executable(proxy proxy.c) +-target_link_libraries(proxy libproxy) ++if (WITH_LIBRARY) ++ target_link_libraries(proxy libproxy) ++else () ++ target_link_libraries(proxy PkgConfig::LIBPROXY) ++endif () + install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR}) Index: head/sysutils/signon-ui/Makefile =================================================================== --- head/sysutils/signon-ui/Makefile +++ head/sysutils/signon-ui/Makefile @@ -2,6 +2,7 @@ PORTNAME= signon-ui PORTVERSION= 0.17 +PORTREVISION= 1 CATEGORIES= sysutils kde DIST_SUBDIR= KDE/${GL_ACCOUNT}