D48469.diff
No OneTemporary
Actions

Size

25 KB

Referenced Files

None

Subscribers

None

D48469.diff
View Options

	diff --git a/MOVED b/MOVED
	--- a/MOVED
	+++ b/MOVED
	@@ -4018,3 +4018,10 @@
	audio/gqradio\|\|2025-01-13\|Has expired: BKTR devices are not supported anymore
	x11-themes/kf5-breeze-icons\|x11-themes/kf6-breeze-icons\|2025-01-15\|Replaced by the KF6 version
	x11-themes/kf5-oxygen-icons5\|x11-themes/oxygen-icons\|2025-01-15\|Rename in accordance with the upstream
	+net/libproxy-duktape\|\|2025-01-15\|Completely rewritten, plugins now built directly into the library
	+net/libproxy-gnome3\|\|2025-01-15\|Completely rewritten, plugins now built directly into the library
	+net/libproxy-kde\|\|2025-01-15\|Completely rewritten, plugins now built directly into the library
	+net/libproxy-pacrunner\|\|2025-01-15\|Completely rewritten, plugins now built directly into the library
	+net/libproxy-perl\|\|2025-01-15\|Completely rewritten, plugins now built directly into the library
	+net/libproxy-python\|\|2025-01-15\|Completely rewritten, plugins now built directly into the library
	+net/libproxy-webkit3\|\|2025-01-15\|Completely rewritten, plugins now built directly into the library
	diff --git a/net/Makefile b/net/Makefile
	--- a/net/Makefile
	+++ b/net/Makefile
	@@ -417,13 +417,6 @@
	SUBDIR += libpcapnav
	SUBDIR += libpfctl
	SUBDIR += libproxy
	- SUBDIR += libproxy-duktape
	- SUBDIR += libproxy-gnome3
	- SUBDIR += libproxy-kde
	- SUBDIR += libproxy-pacrunner
	- SUBDIR += libproxy-perl
	- SUBDIR += libproxy-python
	- SUBDIR += libproxy-webkit3
	SUBDIR += librdkafka
	SUBDIR += librespeed-cli
	SUBDIR += librespeed-go
	diff --git a/net/libproxy-duktape/Makefile b/net/libproxy-duktape/Makefile
	deleted file mode 100644
	--- a/net/libproxy-duktape/Makefile
	+++ /dev/null
	@@ -1,12 +0,0 @@
	-PORTREVISION= 0
	-CATEGORIES= net devel
	-PKGNAMESUFFIX= -${LIBPROXY_SLAVE}
	-
	-COMMENT= Duktape JavaScript plug-in for libproxy
	-
	-LIB_DEPENDS+= libduktape.so:lang/duktape-lib
	-
	-LIBPROXY_SLAVE= duktape
	-MASTERDIR= ${.CURDIR}/../libproxy
	-
	-.include "${MASTERDIR}/Makefile"
	diff --git a/net/libproxy-duktape/pkg-descr b/net/libproxy-duktape/pkg-descr
	deleted file mode 100644
	--- a/net/libproxy-duktape/pkg-descr
	+++ /dev/null
	@@ -1,5 +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 the Duktape JS engine to make use of libproxy.
	diff --git a/net/libproxy-duktape/pkg-plist b/net/libproxy-duktape/pkg-plist
	deleted file mode 100644
	--- a/net/libproxy-duktape/pkg-plist
	+++ /dev/null
	@@ -1 +0,0 @@
	-lib/libproxy/%%VERSION%%/modules/pacrunner_duktape.so
	diff --git a/net/libproxy-gnome3/Makefile b/net/libproxy-gnome3/Makefile
	deleted file mode 100644
	--- a/net/libproxy-gnome3/Makefile
	+++ /dev/null
	@@ -1,13 +0,0 @@
	-PORTREVISION= 0
	-CATEGORIES= net devel
	-PKGNAMESUFFIX= -${LIBPROXY_SLAVE}
	-
	-COMMENT= GSettings-based configuration plug-in for libproxy
	-
	-USES= gnome
	-USE_GNOME= glib20
	-
	-LIBPROXY_SLAVE= gnome3
	-MASTERDIR= ${.CURDIR}/../libproxy
	-
	-.include "${MASTERDIR}/Makefile"
	diff --git a/net/libproxy-gnome3/pkg-descr b/net/libproxy-gnome3/pkg-descr
	deleted file mode 100644
	--- a/net/libproxy-gnome3/pkg-descr
	+++ /dev/null
	@@ -1,6 +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 GNOME3 desktop
	-by using GSettings.
	diff --git a/net/libproxy-gnome3/pkg-plist b/net/libproxy-gnome3/pkg-plist
	deleted file mode 100644
	--- a/net/libproxy-gnome3/pkg-plist
	+++ /dev/null
	@@ -1,2 +0,0 @@
	-lib/libproxy/%%VERSION%%/modules/config_gnome3.so
	-libexec/pxgsettings
	diff --git a/net/libproxy-kde/Makefile b/net/libproxy-kde/Makefile
	deleted file mode 100644
	--- a/net/libproxy-kde/Makefile
	+++ /dev/null
	@@ -1,13 +0,0 @@
	-PORTREVISION= 0
	-CATEGORIES= net devel
	-PKGNAMESUFFIX= -${LIBPROXY_SLAVE}
	-
	-COMMENT= KDE plug-in for libproxy
	-
	-USES= kde:5
	-USE_KDE= config
	-
	-LIBPROXY_SLAVE= kde
	-MASTERDIR= ${.CURDIR}/../libproxy
	-
	-.include "${MASTERDIR}/Makefile"
	diff --git a/net/libproxy-kde/pkg-descr b/net/libproxy-kde/pkg-descr
	deleted file mode 100644
	--- a/net/libproxy-kde/pkg-descr
	+++ /dev/null
	@@ -1,5 +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 the KDE Desktop to make use of libproxy.
	diff --git a/net/libproxy-kde/pkg-plist b/net/libproxy-kde/pkg-plist
	deleted file mode 100644
	--- a/net/libproxy-kde/pkg-plist
	+++ /dev/null
	@@ -1 +0,0 @@
	-lib/libproxy/%%VERSION%%/modules/config_kde.so
	diff --git a/net/libproxy-pacrunner/Makefile b/net/libproxy-pacrunner/Makefile
	deleted file mode 100644
	--- a/net/libproxy-pacrunner/Makefile
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-PORTREVISION= 0
	-CATEGORIES= net devel
	-PKGNAMESUFFIX= -${LIBPROXY_SLAVE}
	-
	-COMMENT= pacrunner plug-in for libproxy
	-
	-LIBPROXY_SLAVE= pacrunner
	-MASTERDIR= ${.CURDIR}/../libproxy
	-
	-.include "${MASTERDIR}/Makefile"
	diff --git a/net/libproxy-pacrunner/pkg-descr b/net/libproxy-pacrunner/pkg-descr
	deleted file mode 100644
	--- a/net/libproxy-pacrunner/pkg-descr
	+++ /dev/null
	@@ -1,5 +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 contains the pacrunner of libproxy.
	diff --git a/net/libproxy-pacrunner/pkg-plist b/net/libproxy-pacrunner/pkg-plist
	deleted file mode 100644
	--- a/net/libproxy-pacrunner/pkg-plist
	+++ /dev/null
	@@ -1 +0,0 @@
	-lib/libproxy/%%VERSION%%/modules/config_pacrunner.so
	diff --git a/net/libproxy-perl/Makefile b/net/libproxy-perl/Makefile
	deleted file mode 100644
	--- a/net/libproxy-perl/Makefile
	+++ /dev/null
	@@ -1,14 +0,0 @@
	-PORTREVISION= 0
	-CATEGORIES= net lang
	-PKGNAMESUFFIX= -${LIBPROXY_SLAVE}
	-
	-COMMENT= Perl binding for libproxy
	-
	-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"
	diff --git a/net/libproxy-perl/pkg-descr b/net/libproxy-perl/pkg-descr
	deleted file mode 100644
	--- a/net/libproxy-perl/pkg-descr
	+++ /dev/null
	@@ -1,5 +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 perl applications to make use of libproxy.
	diff --git a/net/libproxy-perl/pkg-plist b/net/libproxy-perl/pkg-plist
	deleted file mode 100644
	--- a/net/libproxy-perl/pkg-plist
	+++ /dev/null
	@@ -1,2 +0,0 @@
	-%%SITE_ARCH%%/Net/Libproxy.pm
	-%%SITE_ARCH%%/auto/Net/Libproxy/Libproxy.so
	diff --git a/net/libproxy-python/Makefile b/net/libproxy-python/Makefile
	deleted file mode 100644
	--- a/net/libproxy-python/Makefile
	+++ /dev/null
	@@ -1,22 +0,0 @@
	-PORTREVISION= 0
	-CATEGORIES= net lang
	-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	-PKGNAMESUFFIX= -${LIBPROXY_SLAVE}
	-
	-COMMENT= Python binding for libproxy
	-
	-USES= python
	-USE_PYTHON= flavors py3kplist
	-
	-LIBPROXY_SLAVE= python
	-MASTERDIR= ${.CURDIR}/../libproxy
	-
	-post-install:
	- ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
	- -f -d ${PYTHONPREFIX_SITELIBDIR} \
	- ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
	- ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
	- -f -d ${PYTHONPREFIX_SITELIBDIR} \
	- ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
	-
	-.include "${MASTERDIR}/Makefile"
	diff --git a/net/libproxy-python/pkg-descr b/net/libproxy-python/pkg-descr
	deleted file mode 100644
	--- a/net/libproxy-python/pkg-descr
	+++ /dev/null
	@@ -1,5 +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 python applications to make use of libproxy.
	diff --git a/net/libproxy-python/pkg-plist b/net/libproxy-python/pkg-plist
	deleted file mode 100644
	--- a/net/libproxy-python/pkg-plist
	+++ /dev/null
	@@ -1,3 +0,0 @@
	-%%PYTHON_SITELIBDIR%%/libproxy.py
	-%%PYTHON_SITELIBDIR%%/libproxy.pyc
	-%%PYTHON_SITELIBDIR%%/libproxy.pyo
	diff --git a/net/libproxy-webkit3/Makefile b/net/libproxy-webkit3/Makefile
	deleted file mode 100644
	--- a/net/libproxy-webkit3/Makefile
	+++ /dev/null
	@@ -1,15 +0,0 @@
	-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 gnome
	-USE_GNOME= glib20
	-
	-LIBPROXY_SLAVE= webkit3
	-MASTERDIR= ${.CURDIR}/../libproxy
	-
	-.include "${MASTERDIR}/Makefile"
	diff --git a/net/libproxy-webkit3/pkg-descr b/net/libproxy-webkit3/pkg-descr
	deleted file mode 100644
	--- a/net/libproxy-webkit3/pkg-descr
	+++ /dev/null
	@@ -1,5 +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 the WebKit web browser to make use of libproxy.
	diff --git a/net/libproxy-webkit3/pkg-plist b/net/libproxy-webkit3/pkg-plist
	deleted file mode 100644
	--- a/net/libproxy-webkit3/pkg-plist
	+++ /dev/null
	@@ -1 +0,0 @@
	-lib/libproxy/%%VERSION%%/modules/pacrunner_webkit.so
	diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
	--- a/net/libproxy/Makefile
	+++ b/net/libproxy/Makefile
	@@ -1,73 +1,62 @@
	PORTNAME= libproxy
	-DISTVERSION= 0.4.18
	-PORTREVISION?= 0
	-CATEGORIES?= net devel
	-MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
	+DISTVERSION= 0.5.9
	+CATEGORIES= net devel

	MAINTAINER= desktop@FreeBSD.org
	-COMMENT?= Library that provides automatic proxy configuration management
	+COMMENT= Library that provides automatic proxy configuration management
	WWW= https://libproxy.github.io/libproxy/

	LICENSE= LGPL21+
	LICENSE_FILE= ${WRKSRC}/COPYING

	-USES+= cmake cpe pathfix pkgconfig tar:xz
	+USES= cpe gnome meson pkgconfig
	+
	CPE_VENDOR= libproxy_project
	-PATHFIX_CMAKELISTSTXT= devfiles.cmk
	-
	-CMAKE_ON+= WITH_VALA
	-CMAKE_OFF+= BIPR WITH_DOTNET WITH_NATUS WITH_NM WITH_NMold
	-
	-# Slave ports.
	-LIBPROXY_SLAVES= library duktape gnome3 kde mozjs python perl webkit3
	-
	-# If nothing is set, we're building the library, i.e. this port.
	-LIBPROXY_SLAVE?= library
	-
	-PLIST_SUB+= VERSION=${PORTVERSION}
	-
	-# Activate the wanted module, and deactivate the others
	-CMAKE_ON+= WITH_${LIBPROXY_SLAVE:tu}
	-CMAKE_OFF+= ${LIBPROXY_SLAVES:N${LIBPROXY_SLAVE}:tu:S/^/WITH_/}
	-
	-# 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: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:Mpacrunner}
	-LIB_DEPENDS+= libdbus-1.so:devel/dbus
	-CMAKE_ON= BUILD_CONFIG_PACRUNNER
	-.endif
	-
	-.if ${LIBPROXY_SLAVE:Mkde} \|\| ${LIBPROXY_SLAVE:Mduktape} \|\| ${LIBPROXY_SLAVE:Mmozjs} \|\| ${LIBPROXY_SLAVE:Mwebkit3}
	-RUN_DEPENDS+= libproxy-pacrunner>=${DISTVERSION}:net/libproxy-pacrunner
	-.endif
	-
	-.include <bsd.port.pre.mk>
	-
	-.if ${OPSYS} == FreeBSD
	-.if ${LIBPROXY_SLAVE:Mperl}
	-CFLAGS+= -Wno-error=int-conversion
	-.endif
	-.endif
	-
	-# Hackery for the to python backends.
	-.if ${LIBPROXY_SLAVE:Mpython}
	-CMAKE_ON+= WITH_PYTHON3
	-CMAKE_OFF+= WITH_PYTHON2
	-CMAKE_ARGS+= -DPYTHON3_EXECUTABLE:FILEPATH=${PYTHON_CMD}
	-.else
	-CMAKE_OFF+= WITH_PYTHON2 WITH_PYTHON3
	-.endif
	-
	-.include <bsd.port.post.mk>
	+USE_GITHUB= yes
	+
	+USE_GNOME= glib20 introspection
	+
	+MESON_ARGS= -Dtests=true \
	+ -Dconfig-windows=false \
	+ -Dconfig-osx=false \
	+ -Dintrospection=true \
	+ -Drelease=true
	+USE_LDCONFIG= yes
	+
	+OPTIONS_DEFINE= CURL DOCS VAPI
	+OPTIONS_GROUP= CONFIG PACRUNNER
	+OPTIONS_GROUP_CONFIG= ENV GNOME KDE SYSCONFIG XDP
	+OPTIONS_GROUP_PACRUNNER= DUKTAPE
	+OPTIONS_DEFAULT= CURL ENV GNOME KDE SYSCONFIG VAPI XDP
	+OPTIONS_SUB= yes
	+
	+ENV_DESC= Environment configuration support
	+DUKTAPE_DESC= PAC Runner Duktape support
	+SYSCONFIG_DESC= sysconfig configuration support
	+XDP_DESC= XDG Desktop Portal (Flatpak) support
	+
	+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
	+CURL_MESON_TRUE= curl
	+
	+DOCS_BUILD_DEPENDS= gi-docgen:textproc/py-gi-docgen
	+DOCS_MESON_TRUE= docs
	+
	+DUKTAPE_LIB_DEPENDS= libduktape.so:lang/duktape-lib
	+DUKTAPE_MESON_TRUE= pacrunner-duktape
	+
	+ENV_MESON_TRUE= config-env
	+
	+GNOME_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:devel/gsettings-desktop-schemas
	+GNOME_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:devel/gsettings-desktop-schemas
	+GNOME_MESON_TRUE= config-gnome
	+
	+KDE_MESON_TRUE= config-kde
	+
	+SYSCONFIG_MESON_TRUE= config-sysconfig
	+
	+VAPI_USES= vala:build
	+VAPI_MESON_TRUE= vapi
	+
	+XDP_MESON_TRUE= config-xdp
	+
	+.include <bsd.port.mk>
	diff --git a/net/libproxy/distinfo b/net/libproxy/distinfo
	--- a/net/libproxy/distinfo
	+++ b/net/libproxy/distinfo
	@@ -1,3 +1,3 @@
	-TIMESTAMP = 1690222352
	-SHA256 (libproxy-0.4.18.tar.xz) = 69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1
	-SIZE (libproxy-0.4.18.tar.xz) = 82020
	+TIMESTAMP = 1736959190
	+SHA256 (libproxy-libproxy-0.5.9_GH0.tar.gz) = a1976c3ac4affedc17e6d40cf78c9d8eca6751520ea3cbbec1a8850f7ded1565
	+SIZE (libproxy-libproxy-0.5.9_GH0.tar.gz) = 58165
	diff --git a/net/libproxy/files/patch-CMakeLists.txt b/net/libproxy/files/patch-CMakeLists.txt
	deleted file mode 100644
	--- a/net/libproxy/files/patch-CMakeLists.txt
	+++ /dev/null
	@@ -1,31 +0,0 @@
	-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 2020-12-29 11:30:46 UTC
	-+++ CMakeLists.txt
	-@@ -26,6 +26,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)
	-@@ -44,5 +53,7 @@ endif()
	-
	- # Always build these
	- add_subdirectory(libproxy)
	--add_subdirectory(utils)
	-+if (WITH_LIBRARY)
	-+ add_subdirectory(utils)
	-+endif()
	-
	diff --git a/net/libproxy/files/patch-bindings_CMakeLists.txt b/net/libproxy/files/patch-bindings_CMakeLists.txt
	deleted file mode 100644
	--- a/net/libproxy/files/patch-bindings_CMakeLists.txt
	+++ /dev/null
	@@ -1,18 +0,0 @@
	-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()
	diff --git a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt b/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt
	deleted file mode 100644
	--- a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt
	+++ /dev/null
	@@ -1,24 +0,0 @@
	-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.
	-
	---- bindings/perl/src/CMakeLists.txt.orig 2022-06-20 14:06:50 UTC
	-+++ bindings/perl/src/CMakeLists.txt
	-@@ -4,7 +4,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/
	- 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 @@ add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
	- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/auto/Net/Libproxy)
	- add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
	-
	--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()
	diff --git a/net/libproxy/files/patch-libproxy_CMakeLists.txt b/net/libproxy/files/patch-libproxy_CMakeLists.txt
	deleted file mode 100644
	--- a/net/libproxy/files/patch-libproxy_CMakeLists.txt
	+++ /dev/null
	@@ -1,45 +0,0 @@
	-Setting _POSIX_C_SOURCE unsets __BSD_VISIBLE by default, and several symbols
	-end up being hidden, leading to failures such as:
	-
	-In file included from /wrkdir/libproxy-0.4.12/libproxy/test/url-encode.cpp:2:
	-In file included from /usr/include/c++/v1/iostream:38:
	-In file included from /usr/include/c++/v1/ios:216:
	-/usr/include/c++/v1/__locale:545:16: error: use of undeclared identifier 'isascii'
	- return isascii(__c) ? (__tab_[static_cast<int>(__c)] & __m) !=0 : false;
	- ^
	-/usr/include/c++/v1/__locale:552:22: error: use of undeclared identifier 'isascii'
	- __vec = isascii(__low) ? __tab_[static_cast<int>(*__low)] : 0;
	- ^
	-/usr/include/c++/v1/__locale:560:17: error: use of undeclared identifier 'isascii'
	- if (isascii(__low) && (__tab_[static_cast<int>(__low)] & __m))
	- ^
	-/usr/include/c++/v1/__locale:569:19: error: use of undeclared identifier 'isascii'
	- if (!(isascii(__low) && (__tab_[static_cast<int>(__low)] & __m)))
	- ^
	---- libproxy/CMakeLists.txt.orig 2017-05-11 09:33:33 UTC
	-+++ libproxy/CMakeLists.txt
	-@@ -6,18 +6,19 @@ set_project_version(0 4 15)
	- if (WIN32)
	- add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
	- else(WIN32)
	-- add_definitions(-D_POSIX_C_SOURCE=200112L)
	- 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)
	diff --git a/net/libproxy/files/patch-libproxy_cmake_modules.cmk b/net/libproxy/files/patch-libproxy_cmake_modules.cmk
	deleted file mode 100644
	--- a/net/libproxy/files/patch-libproxy_cmake_modules.cmk
	+++ /dev/null
	@@ -1,12 +0,0 @@
	---- libproxy/cmake/modules.cmk.orig 2022-06-20 13:54:49 UTC
	-+++ libproxy/cmake/modules.cmk
	-@@ -32,7 +32,9 @@ message("MODULES TO BUILD:")
	- ## Module definition
	- #
	- message("MODULES TO BUILD:")
	-+if(BUILD_CONFIG_PACRUNNER)
	- px_module(config_pacrunner "${DBUS_FOUND}" 0 ${DBUS_LIBRARIES})
	-+endif()
	- px_module(config_envvar "${ENVVAR_FOUND}" 1)
	- px_module(config_sysconfig "${SYSCONFIG_FOUND}" 1)
	- px_module(config_gnome "${GNOME2_FOUND}" 0)
	diff --git a/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk
	deleted file mode 100644
	--- a/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk
	+++ /dev/null
	@@ -1,10 +0,0 @@
	---- libproxy/cmake/modules/pacrunner_duktape.cmk.orig 2022-06-20 13:54:49 UTC
	-+++ libproxy/cmake/modules/pacrunner_duktape.cmk
	-@@ -17,5 +17,7 @@ else()
	- link_directories(${DUKTAPE_LIBRARIES})
	- link_libraries(duktape)
	- endif()
	-+ else()
	-+ set(DUKTAPE_FOUND 0)
	- endif()
	- endif()
	diff --git a/net/libproxy/files/patch-libproxy_cmake_pxmodule.cmk b/net/libproxy/files/patch-libproxy_cmake_pxmodule.cmk
	deleted file mode 100644
	--- a/net/libproxy/files/patch-libproxy_cmake_pxmodule.cmk
	+++ /dev/null
	@@ -1,20 +0,0 @@
	-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)
	diff --git a/net/libproxy/files/patch-utils_CMakeLists.txt b/net/libproxy/files/patch-utils_CMakeLists.txt
	deleted file mode 100644
	--- a/net/libproxy/files/patch-utils_CMakeLists.txt
	+++ /dev/null
	@@ -1,17 +0,0 @@
	-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})
	diff --git a/net/libproxy/pkg-plist b/net/libproxy/pkg-plist
	--- a/net/libproxy/pkg-plist
	+++ b/net/libproxy/pkg-plist
	@@ -1,8 +1,70 @@
	bin/proxy
	-include/proxy.h
	+include/libproxy/proxy.h
	+lib/girepository-1.0/Libproxy-1.0.typelib
	lib/libproxy.so
	+lib/libproxy.so.0.5.9
	lib/libproxy.so.1
	-lib/libproxy.so.1.0.0
	+lib/libproxy/libpxbackend-1.0.so
	libdata/pkgconfig/libproxy-1.0.pc
	-share/cmake/Modules/Findlibproxy.cmake
	-share/vala/vapi/libproxy-1.0.vapi
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Black.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Black.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-BlackItalic.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-BlackItalic.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Bold.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Bold.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-BoldItalic.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-BoldItalic.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Italic.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Italic.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Medium.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Medium.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-MediumItalic.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-MediumItalic.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Regular.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatDisplay-Regular.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-Bold.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-Bold.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-BoldItalic.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-BoldItalic.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-Italic.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-Italic.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-Medium.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-Medium.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-MediumItalic.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-MediumItalic.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-Regular.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/RedHatText-Regular.woff2
	+%%DOCS%%%%DOCSDIR%%-1.0/SourceCodePro-It.ttf.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/SourceCodePro-Regular.ttf.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/SourceCodePro-Semibold.ttf.woff
	+%%DOCS%%%%DOCSDIR%%-1.0/applications.html
	+%%DOCS%%%%DOCSDIR%%-1.0/architecture.html
	+%%DOCS%%%%DOCSDIR%%-1.0/build-steps.html
	+%%DOCS%%%%DOCSDIR%%-1.0/classes_hierarchy.html
	+%%DOCS%%%%DOCSDIR%%-1.0/configuration-logic.html
	+%%DOCS%%%%DOCSDIR%%-1.0/ctor.ProxyFactory.new.html
	+%%DOCS%%%%DOCSDIR%%-1.0/fonts.css
	+%%DOCS%%%%DOCSDIR%%-1.0/fzy.js
	+%%DOCS%%%%DOCSDIR%%-1.0/go-up-symbolic.png
	+%%DOCS%%%%DOCSDIR%%-1.0/index.html
	+%%DOCS%%%%DOCSDIR%%-1.0/index.json
	+%%DOCS%%%%DOCSDIR%%-1.0/libproxy-1.0.devhelp2
	+%%DOCS%%%%DOCSDIR%%-1.0/libproxy.svg
	+%%DOCS%%%%DOCSDIR%%-1.0/main.js
	+%%DOCS%%%%DOCSDIR%%-1.0/method.ProxyFactory.free.html
	+%%DOCS%%%%DOCSDIR%%-1.0/method.ProxyFactory.get_proxies.html
	+%%DOCS%%%%DOCSDIR%%-1.0/perl.html
	+%%DOCS%%%%DOCSDIR%%-1.0/proxy-authentication.html
	+%%DOCS%%%%DOCSDIR%%-1.0/python.html
	+%%DOCS%%%%DOCSDIR%%-1.0/ruby.html
	+%%DOCS%%%%DOCSDIR%%-1.0/search.js
	+%%DOCS%%%%DOCSDIR%%-1.0/solarized-dark.css
	+%%DOCS%%%%DOCSDIR%%-1.0/solarized-light.css
	+%%DOCS%%%%DOCSDIR%%-1.0/struct.ProxyFactory.html
	+%%DOCS%%%%DOCSDIR%%-1.0/style.css
	+%%DOCS%%%%DOCSDIR%%-1.0/type_func.ProxyFactory.free_proxies.html
	+%%DOCS%%%%DOCSDIR%%-1.0/vala.html
	+share/gir-1.0/Libproxy-1.0.gir
	+share/man/man8/proxy.8.gz
	+%%VAPI%%share/vala/vapi/libproxy-1.0.deps
	+%%VAPI%%share/vala/vapi/libproxy-1.0.vapi

File Metadata

Mime Type: text/plain
Expires: Sat, Jan 18, 9:17 AM (9 h, 41 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 15852927
Default Alt Text: D48469.diff (25 KB)

D48469.diffNo OneTemporaryActions

D48469.diffView Options

File Metadata

Event Timeline

D48469.diff
No OneTemporary
Actions

D48469.diff
View Options