On Mon Aug 11, 2025 at 09:20:34PM +0200, Rafael Sadowski wrote:
> Feedback?
More context after feedback ^^
Simple diff to remove net/kdsoap (qt5) and replace it by
qt6 (new default without any suffix).
The idea is the same as with qcoro last week. An update replaces
kdsoap-2.2.0 and kdsoap-qt6-2.2.0 with kdsoap-2.2.0p0. All
consumers bumped.
devel/quirks will be committed separately.
>
> diff --git a/net/kdsoap-ws-discovery-client/Makefile
> b/net/kdsoap-ws-discovery-client/Makefile
> index 1052d0d7961..e6747ef1daf 100644
> --- a/net/kdsoap-ws-discovery-client/Makefile
> +++ b/net/kdsoap-ws-discovery-client/Makefile
> @@ -1,6 +1,7 @@
> COMMENT = KDSoap WS-Discovery client
>
> DISTNAME = kdsoap-ws-discovery-client-0.4.0
> +REVISION = 0
>
> CATEGORIES = net devel
>
> @@ -23,7 +24,7 @@ BUILD_DEPENDS = devel/boost
>
> BUILD_DEPENDS += devel/kf6/extra-cmake-modules
>
> -LIB_DEPENDS = net/kdsoap,qt6
> +LIB_DEPENDS = net/kdsoap
>
> CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
> -DCMAKE_INSTALL_PREFIX=${LOCALBASE} \
> diff --git a/net/kdsoap/Makefile b/net/kdsoap/Makefile
> index 3bdb71f1702..71c89ae40ea 100644
> --- a/net/kdsoap/Makefile
> +++ b/net/kdsoap/Makefile
> @@ -1,7 +1,7 @@
> COMMENT = Qt-based client-side and server-side SOAP component
>
> -V = 2.2.0
> -DISTNAME = kdsoap-${V}
> +DISTNAME = kdsoap-2.2.0
> +REVISION = 0
>
> SHARED_LIBS += kdsoap 1.0
> SHARED_LIBS += kdsoap-server 1.0
> @@ -16,26 +16,16 @@ HOMEPAGE =
> https://www.kdab.com/development-resources/qt-tools/kd-soap/
> # AGPL3 modified
> PERMIT_PACKAGE = Yes
>
> -FLAVORS= qt6
> -FLAVOR ?=
> +WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Xml c m
>
> SITES =
> https://github.com/KDAB/KDSoap/releases/download/${DISTNAME}/
>
> -MODULES = devel/cmake
> +MODULES = devel/cmake \
> + x11/qt6
>
> BUILD_DEPENDS = devel/boost
>
> -CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${LOCALBASE}
> -
> -.if ${FLAVOR:Mqt6}
> -FULLPKGNAME= kdsoap-qt6-${V}
> -MODULES += x11/qt6
> -WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Xml c m
> -CONFIGURE_ARGS += -DKDSoap_QT6=ON
> -.else
> -MODULES += x11/qt5
> -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml c m
> -CONFIGURE_ARGS += -DKDSoap_QT6=OFF
> -.endif
> +CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX=${LOCALBASE} \
> + -DKDSoap_QT6=ON
>
> .include <bsd.port.mk>
> diff --git a/net/kdsoap/pkg/PFRAG.no-qt6 b/net/kdsoap/pkg/PFRAG.no-qt6
> deleted file mode 100644
> index d72cda7dcfd..00000000000
> --- a/net/kdsoap/pkg/PFRAG.no-qt6
> +++ /dev/null
> @@ -1,85 +0,0 @@
> -@bin bin/kdwsdl2cpp
> -include/KDSoapClient/
> -include/KDSoapClient/KDDateTime
> -include/KDSoapClient/KDDateTime.h
> -include/KDSoapClient/KDQName
> -include/KDSoapClient/KDQName.h
> -include/KDSoapClient/KDSoap
> -include/KDSoapClient/KDSoap.h
> -include/KDSoapClient/KDSoapAuthentication
> -include/KDSoapClient/KDSoapAuthentication.h
> -include/KDSoapClient/KDSoapClient
> -include/KDSoapClient/KDSoapClientInterface
> -include/KDSoapClient/KDSoapClientInterface.h
> -include/KDSoapClient/KDSoapEndpointReference
> -include/KDSoapClient/KDSoapEndpointReference.h
> -include/KDSoapClient/KDSoapFaultException
> -include/KDSoapClient/KDSoapFaultException.h
> -include/KDSoapClient/KDSoapGlobal
> -include/KDSoapClient/KDSoapGlobal.h
> -include/KDSoapClient/KDSoapHeaders
> -include/KDSoapClient/KDSoapJob
> -include/KDSoapClient/KDSoapJob.h
> -include/KDSoapClient/KDSoapMessage
> -include/KDSoapClient/KDSoapMessage.h
> -include/KDSoapClient/KDSoapMessageAddressingProperties
> -include/KDSoapClient/KDSoapMessageAddressingProperties.h
> -include/KDSoapClient/KDSoapNamespaceManager
> -include/KDSoapClient/KDSoapNamespaceManager.h
> -include/KDSoapClient/KDSoapPendingCall
> -include/KDSoapClient/KDSoapPendingCall.h
> -include/KDSoapClient/KDSoapPendingCallWatcher
> -include/KDSoapClient/KDSoapPendingCallWatcher.h
> -include/KDSoapClient/KDSoapSslHandler
> -include/KDSoapClient/KDSoapSslHandler.h
> -include/KDSoapClient/KDSoapUdpClient
> -include/KDSoapClient/KDSoapUdpClient.h
> -include/KDSoapClient/KDSoapValue
> -include/KDSoapClient/KDSoapValue.h
> -include/KDSoapClient/KDSoapValueList
> -include/KDSoapClient/kdsoap_version.h
> -include/KDSoapServer/
> -include/KDSoapServer/KDSoapDelayedResponseHandle
> -include/KDSoapServer/KDSoapDelayedResponseHandle.h
> -include/KDSoapServer/KDSoapServer
> -include/KDSoapServer/KDSoapServer.h
> -include/KDSoapServer/KDSoapServerAuthInterface
> -include/KDSoapServer/KDSoapServerAuthInterface.h
> -include/KDSoapServer/KDSoapServerCustomVerbRequestInterface
> -include/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
> -include/KDSoapServer/KDSoapServerGlobal
> -include/KDSoapServer/KDSoapServerGlobal.h
> -include/KDSoapServer/KDSoapServerObjectInterface
> -include/KDSoapServer/KDSoapServerObjectInterface.h
> -include/KDSoapServer/KDSoapServerRawXMLInterface
> -include/KDSoapServer/KDSoapServerRawXMLInterface.h
> -include/KDSoapServer/KDSoapThreadPool
> -include/KDSoapServer/KDSoapThreadPool.h
> -lib/cmake/KDSoap/
> -lib/cmake/KDSoap/KDSoapConfig.cmake
> -lib/cmake/KDSoap/KDSoapConfigVersion.cmake
> -lib/cmake/KDSoap/KDSoapMacros.cmake
> -lib/cmake/KDSoap/KDSoapTargets${MODCMAKE_BUILD_SUFFIX}
> -lib/cmake/KDSoap/KDSoapTargets.cmake
> -@lib lib/libkdsoap-server.so.${LIBkdsoap-server_VERSION}
> -@lib lib/libkdsoap.so.${LIBkdsoap_VERSION}
> -mkspecs/
> -mkspecs/modules/
> -mkspecs/modules/qt_KDSoapClient.pri
> -mkspecs/modules/qt_KDSoapServer.pri
> -share/doc/KDSoap/
> -share/doc/KDSoap/LICENSES/
> -share/doc/KDSoap/LICENSES/BSD-3-Clause.txt
> -share/doc/KDSoap/LICENSES/GPL-2.0-only.txt
> -share/doc/KDSoap/LICENSES/LicenseRef-Microsoft.txt
> -share/doc/KDSoap/LICENSES/LicenseRef-Novell.txt
> -share/doc/KDSoap/LICENSES/LicenseRef-OASIS.txt
> -share/doc/KDSoap/LICENSES/LicenseRef-SportingExchange.txt
> -share/doc/KDSoap/LICENSES/MIT.txt
> -share/doc/KDSoap/LICENSES/W3C.txt
> -share/doc/KDSoap/README.md
> -share/doc/KDSoap/kdsoap.pri
> -share/doc/KDSoap/kdwsdl2cpp.pri
> -share/mkspecs/
> -share/mkspecs/features/
> -share/mkspecs/features/kdsoap.prf
> diff --git a/net/kdsoap/pkg/PFRAG.qt6 b/net/kdsoap/pkg/PFRAG.qt6
> deleted file mode 100644
> index 5fe8dd9bce5..00000000000
> --- a/net/kdsoap/pkg/PFRAG.qt6
> +++ /dev/null
> @@ -1,80 +0,0 @@
> -@bin bin/kdwsdl2cpp-qt6
> -include/KDSoapClient-Qt6/
> -include/KDSoapClient-Qt6/KDSoapClient/
> -include/KDSoapClient-Qt6/KDSoapClient/KDDateTime
> -include/KDSoapClient-Qt6/KDSoapClient/KDDateTime.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDQName
> -include/KDSoapClient-Qt6/KDSoapClient/KDQName.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoap
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoap.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapAuthentication
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapAuthentication.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapClient
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapClientInterface
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapClientInterface.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapEndpointReference
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapEndpointReference.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapFaultException
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapFaultException.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapGlobal
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapGlobal.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapHeaders
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapJob
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapJob.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessage
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessage.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessageAddressingProperties
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessageAddressingProperties.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapNamespaceManager
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapNamespaceManager.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCall
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCall.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCallWatcher
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCallWatcher.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapSslHandler
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapSslHandler.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapUdpClient
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapUdpClient.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapValue
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapValue.h
> -include/KDSoapClient-Qt6/KDSoapClient/KDSoapValueList
> -include/KDSoapClient-Qt6/KDSoapClient/kdsoap_version.h
> -include/KDSoapServer-Qt6/
> -include/KDSoapServer-Qt6/KDSoapServer/
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapDelayedResponseHandle
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapDelayedResponseHandle.h
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServer
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServer.h
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerAuthInterface
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerAuthInterface.h
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerCustomVerbRequestInterface
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerGlobal
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerGlobal.h
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerObjectInterface
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerObjectInterface.h
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerRawXMLInterface
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerRawXMLInterface.h
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapThreadPool
> -include/KDSoapServer-Qt6/KDSoapServer/KDSoapThreadPool.h
> -lib/cmake/KDSoap-qt6/
> -lib/cmake/KDSoap-qt6/KDSoap-qt6Config.cmake
> -lib/cmake/KDSoap-qt6/KDSoap-qt6ConfigVersion.cmake
> -lib/cmake/KDSoap-qt6/KDSoapMacros.cmake
> -lib/cmake/KDSoap-qt6/KDSoapTargets${MODCMAKE_BUILD_SUFFIX}
> -lib/cmake/KDSoap-qt6/KDSoapTargets.cmake
> -@lib lib/libkdsoap-qt6.so.${LIBkdsoap-qt6_VERSION}
> -@lib lib/libkdsoap-server-qt6.so.${LIBkdsoap-server-qt6_VERSION}
> -lib/qt6/mkspecs/modules/qt_KDSoapClient.pri
> -lib/qt6/mkspecs/modules/qt_KDSoapServer.pri
> -share/doc/KDSoap-qt6/
> -share/doc/KDSoap-qt6/LICENSES/
> -share/doc/KDSoap-qt6/LICENSES/BSD-3-Clause.txt
> -share/doc/KDSoap-qt6/LICENSES/GPL-2.0-only.txt
> -share/doc/KDSoap-qt6/LICENSES/LicenseRef-Microsoft.txt
> -share/doc/KDSoap-qt6/LICENSES/LicenseRef-Novell.txt
> -share/doc/KDSoap-qt6/LICENSES/LicenseRef-OASIS.txt
> -share/doc/KDSoap-qt6/LICENSES/LicenseRef-SportingExchange.txt
> -share/doc/KDSoap-qt6/LICENSES/MIT.txt
> -share/doc/KDSoap-qt6/LICENSES/W3C.txt
> -share/doc/KDSoap-qt6/README.md
> diff --git a/net/kdsoap/pkg/PLIST b/net/kdsoap/pkg/PLIST
> index 48224473412..cac18af6f5d 100644
> --- a/net/kdsoap/pkg/PLIST
> +++ b/net/kdsoap/pkg/PLIST
> @@ -1,2 +1,82 @@
> -%%qt6%%
> -!%%qt6%%
> +@conflict kdsoap-qt6-<=2.2.0
> +@pkgpath net/kdsoap,qt6
> +@bin bin/kdwsdl2cpp-qt6
> +include/KDSoapClient-Qt6/
> +include/KDSoapClient-Qt6/KDSoapClient/
> +include/KDSoapClient-Qt6/KDSoapClient/KDDateTime
> +include/KDSoapClient-Qt6/KDSoapClient/KDDateTime.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDQName
> +include/KDSoapClient-Qt6/KDSoapClient/KDQName.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoap
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoap.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapAuthentication
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapAuthentication.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapClient
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapClientInterface
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapClientInterface.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapEndpointReference
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapEndpointReference.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapFaultException
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapFaultException.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapGlobal
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapGlobal.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapHeaders
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapJob
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapJob.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessage
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessage.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessageAddressingProperties
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessageAddressingProperties.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapNamespaceManager
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapNamespaceManager.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCall
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCall.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCallWatcher
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCallWatcher.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapSslHandler
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapSslHandler.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapUdpClient
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapUdpClient.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapValue
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapValue.h
> +include/KDSoapClient-Qt6/KDSoapClient/KDSoapValueList
> +include/KDSoapClient-Qt6/KDSoapClient/kdsoap_version.h
> +include/KDSoapServer-Qt6/
> +include/KDSoapServer-Qt6/KDSoapServer/
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapDelayedResponseHandle
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapDelayedResponseHandle.h
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServer
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServer.h
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerAuthInterface
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerAuthInterface.h
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerCustomVerbRequestInterface
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerGlobal
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerGlobal.h
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerObjectInterface
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerObjectInterface.h
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerRawXMLInterface
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerRawXMLInterface.h
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapThreadPool
> +include/KDSoapServer-Qt6/KDSoapServer/KDSoapThreadPool.h
> +lib/cmake/KDSoap-qt6/
> +lib/cmake/KDSoap-qt6/KDSoap-qt6Config.cmake
> +lib/cmake/KDSoap-qt6/KDSoap-qt6ConfigVersion.cmake
> +lib/cmake/KDSoap-qt6/KDSoapMacros.cmake
> +lib/cmake/KDSoap-qt6/KDSoapTargets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/KDSoap-qt6/KDSoapTargets.cmake
> +@lib lib/libkdsoap-qt6.so.${LIBkdsoap-qt6_VERSION}
> +@lib lib/libkdsoap-server-qt6.so.${LIBkdsoap-server-qt6_VERSION}
> +lib/qt6/mkspecs/modules/qt_KDSoapClient.pri
> +lib/qt6/mkspecs/modules/qt_KDSoapServer.pri
> +share/doc/KDSoap-qt6/
> +share/doc/KDSoap-qt6/LICENSES/
> +share/doc/KDSoap-qt6/LICENSES/BSD-3-Clause.txt
> +share/doc/KDSoap-qt6/LICENSES/GPL-2.0-only.txt
> +share/doc/KDSoap-qt6/LICENSES/LicenseRef-Microsoft.txt
> +share/doc/KDSoap-qt6/LICENSES/LicenseRef-Novell.txt
> +share/doc/KDSoap-qt6/LICENSES/LicenseRef-OASIS.txt
> +share/doc/KDSoap-qt6/LICENSES/LicenseRef-SportingExchange.txt
> +share/doc/KDSoap-qt6/LICENSES/MIT.txt
> +share/doc/KDSoap-qt6/LICENSES/W3C.txt
> +share/doc/KDSoap-qt6/README.md
> diff --git a/x11/kde-applications/kf6-kio-extras/Makefile
> b/x11/kde-applications/kf6-kio-extras/Makefile
> index fba2358a3b8..7f61a154915 100644
> --- a/x11/kde-applications/kf6-kio-extras/Makefile
> +++ b/x11/kde-applications/kf6-kio-extras/Makefile
> @@ -1,7 +1,7 @@
> COMMENT = extra functionality for kioslaves
> DISTNAME = kio-extras-${VERSION}
> PKGNAME = kf6-kio-extras-${VERSION}
> -REVISION = 1
> +REVISION = 2
>
> CATEGORIES = productivity net
>
> @@ -60,7 +60,7 @@ LIB_DEPENDS = audio/taglib \
> graphics/openexr \
> math/imath \
> multimedia/phonon,qt6 \
> - net/kdsoap,qt6 \
> + net/kdsoap \
> net/kdsoap-ws-discovery-client \
> net/samba \
> security/libssh \
>
