www/kdsoap: Unflavorize

The qt5 flavor is no longer needed in the ports tree.

Adjust consumers.
This commit is contained in:
Jason E. Hale 2025-02-26 17:16:32 -05:00
parent 10acdb652a
commit e8cad8b54d
5 changed files with 87 additions and 96 deletions

2
MOVED
View file

@ -4164,3 +4164,5 @@ sysutils/shim||2025-02-22|Has expired: upstream has been inactive for 10 years a
devel/py-python-gilt|devel/gilt|2025-02-23|Project switched language from python to go devel/py-python-gilt|devel/gilt|2025-02-23|Project switched language from python to go
textproc/uim-gtk|textproc/uim-gtk2|2025-02-23|Rename with versioned suffix textproc/uim-gtk|textproc/uim-gtk2|2025-02-23|Rename with versioned suffix
x11-toolkits/scenefx|x11-toolkits/scenefx02|2025-02-25|Renamed to match versioned API x11-toolkits/scenefx|x11-toolkits/scenefx02|2025-02-25|Renamed to match versioned API
www/kdsoap@qt5||2025-02-26|Qt5 flavor is no longer needed
www/kdsoap@qt6|www/kdsoap|2025-02-26|Unflavorize; only Qt6 support is needed

View file

@ -1,5 +1,6 @@
PORTNAME= kio-extras PORTNAME= kio-extras
DISTVERSION= ${KDE_APPLICATIONS_VERSION} DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde kde-applications CATEGORIES= devel kde kde-applications
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
@ -8,7 +9,7 @@ WWW= https://projects.kde.org/projects/kde/workspace/kio-extras
LIB_DEPENDS= libtag.so:audio/taglib \ LIB_DEPENDS= libtag.so:audio/taglib \
libImath.so:math/Imath \ libImath.so:math/Imath \
libkdsoap-qt6.so:www/kdsoap@qt6 \ libkdsoap-qt6.so:www/kdsoap \
libKDSoapWSDiscoveryClient.so:www/kdsoap-ws-discovery-client\ libKDSoapWSDiscoveryClient.so:www/kdsoap-ws-discovery-client\
libQCoro6Core.so:devel/qcoro@qt6 libQCoro6Core.so:devel/qcoro@qt6

View file

@ -1,5 +1,6 @@
PORTNAME= kdsoap-ws-discovery-client PORTNAME= kdsoap-ws-discovery-client
DISTVERSION= 0.3.0 DISTVERSION= 0.3.0
PORTREVISION= 1
MASTER_SITES= KDE/unstable/${PORTNAME}/ MASTER_SITES= KDE/unstable/${PORTNAME}/
CATEGORIES= www kde CATEGORIES= www kde
@ -7,7 +8,7 @@ COMMENT= Library for finding WS-Discovery devices in the network
WWW= https://invent.kde.org/libraries/kdsoap-ws-discovery-client WWW= https://invent.kde.org/libraries/kdsoap-ws-discovery-client
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
LIB_DEPENDS= libkdsoap-qt6.so:www/kdsoap@qt6 LIB_DEPENDS= libkdsoap-qt6.so:www/kdsoap
USES= cmake kde:6 qt:6 tar:xz USES= cmake kde:6 qt:6 tar:xz
USE_KDE= ecm:build USE_KDE= ecm:build

View file

@ -1,8 +1,9 @@
PORTNAME= kdsoap PORTNAME= kdsoap
DISTVERSION= 2.2.0 DISTVERSION= 2.2.0
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= https://github.com/KDAB/KDSoap/releases/download/${PORTNAME}-${DISTVERSION}/ MASTER_SITES= https://github.com/KDAB/KDSoap/releases/download/${PORTNAME}-${DISTVERSION}/
PKGNAMESUFFIX= -${FLAVOR} PKGNAMESUFFIX= -qt6
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= C++/Qt SOAP framework COMMENT= C++/Qt SOAP framework
@ -11,24 +12,13 @@ WWW= https://github.com/KDAB/KDSoap
LICENSE= MIT LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_FILE= ${WRKSRC}/LICENSE.txt
FLAVORS= qt5 qt6 USES= cmake compiler:c++17-lang qt:6
FLAVOR?= qt5
USES= cmake compiler:c++${"${FLAVOR:Mqt6}" != "":?17:11}-lang \
qt:${FLAVOR:S/qt//}
USE_LDCONFIG= yes USE_LDCONFIG= yes
_USE_QT_qt5= core network xml \ USE_QT= base
buildtools:build qmake:build
_USE_QT_qt6= base
USE_QT= ${_USE_QT_${FLAVOR}}
CMAKE_ARGS= -DKDSoap_QT6:BOOL=${"${FLAVOR:Mqt6}" != "":?TRUE:FALSE} CMAKE_ON= KDSoap_QT6
CMAKE_OFF= KDSoap_EXAMPLES CMAKE_OFF= KDSoap_EXAMPLES
PLIST_SUB= SOVER=${DISTVERSION} \ PLIST_SUB= SOVERSION=${DISTVERSION}
KDSOAPCLIENT_INCDIR_SUBDIR=${"${FLAVOR:Mqt6}" != "":?KDSoapClient-Qt6/:} \
KDSOAPSERVER_INCDIR_SUBDIR=${"${FLAVOR:Mqt6}" != "":?KDSoapServer-Qt6/:} \
KDSOAP_QT5_ONLY=${"${FLAVOR:Mqt6}" != "":?"@comment ":} \
KDSOAP_QT6_SUFFIX=${"${FLAVOR:Mqt6}" != "":?-qt6:}
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -1,80 +1,77 @@
bin/kdwsdl2cpp%%KDSOAP_QT6_SUFFIX%% bin/kdwsdl2cpp-qt6
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDDateTime include/KDSoapClient-Qt6/KDSoapClient/KDDateTime
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDDateTime.h include/KDSoapClient-Qt6/KDSoapClient/KDDateTime.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDQName include/KDSoapClient-Qt6/KDSoapClient/KDQName
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDQName.h include/KDSoapClient-Qt6/KDSoapClient/KDQName.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoap include/KDSoapClient-Qt6/KDSoapClient/KDSoap
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoap.h include/KDSoapClient-Qt6/KDSoapClient/KDSoap.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapAuthentication include/KDSoapClient-Qt6/KDSoapClient/KDSoapAuthentication
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapAuthentication.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapAuthentication.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapClient include/KDSoapClient-Qt6/KDSoapClient/KDSoapClient
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapClientInterface include/KDSoapClient-Qt6/KDSoapClient/KDSoapClientInterface
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapClientInterface.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapClientInterface.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapEndpointReference include/KDSoapClient-Qt6/KDSoapClient/KDSoapEndpointReference
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapEndpointReference.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapEndpointReference.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapFaultException include/KDSoapClient-Qt6/KDSoapClient/KDSoapFaultException
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapFaultException.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapFaultException.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapGlobal include/KDSoapClient-Qt6/KDSoapClient/KDSoapGlobal
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapGlobal.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapGlobal.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapHeaders include/KDSoapClient-Qt6/KDSoapClient/KDSoapHeaders
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapJob include/KDSoapClient-Qt6/KDSoapClient/KDSoapJob
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapJob.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapJob.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapMessage include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessage
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapMessage.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessage.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapMessageAddressingProperties include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessageAddressingProperties
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapMessageAddressingProperties.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapMessageAddressingProperties.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapNamespaceManager include/KDSoapClient-Qt6/KDSoapClient/KDSoapNamespaceManager
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapNamespaceManager.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapNamespaceManager.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapPendingCall include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCall
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapPendingCall.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCall.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapPendingCallWatcher include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCallWatcher
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapPendingCallWatcher.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapPendingCallWatcher.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapSslHandler include/KDSoapClient-Qt6/KDSoapClient/KDSoapSslHandler
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapSslHandler.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapSslHandler.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapUdpClient include/KDSoapClient-Qt6/KDSoapClient/KDSoapUdpClient
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapUdpClient.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapUdpClient.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapValue include/KDSoapClient-Qt6/KDSoapClient/KDSoapValue
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapValue.h include/KDSoapClient-Qt6/KDSoapClient/KDSoapValue.h
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapValueList include/KDSoapClient-Qt6/KDSoapClient/KDSoapValueList
include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/kdsoap_version.h include/KDSoapClient-Qt6/KDSoapClient/kdsoap_version.h
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapDelayedResponseHandle include/KDSoapServer-Qt6/KDSoapServer/KDSoapDelayedResponseHandle
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapDelayedResponseHandle.h include/KDSoapServer-Qt6/KDSoapServer/KDSoapDelayedResponseHandle.h
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServer include/KDSoapServer-Qt6/KDSoapServer/KDSoapServer
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServer.h include/KDSoapServer-Qt6/KDSoapServer/KDSoapServer.h
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerAuthInterface include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerAuthInterface
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerAuthInterface.h include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerAuthInterface.h
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerCustomVerbRequestInterface include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerCustomVerbRequestInterface
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerCustomVerbRequestInterface.h include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerGlobal include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerGlobal
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerGlobal.h include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerGlobal.h
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerObjectInterface include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerObjectInterface
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerObjectInterface.h include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerObjectInterface.h
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerRawXMLInterface include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerRawXMLInterface
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerRawXMLInterface.h include/KDSoapServer-Qt6/KDSoapServer/KDSoapServerRawXMLInterface.h
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapThreadPool include/KDSoapServer-Qt6/KDSoapServer/KDSoapThreadPool
include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapThreadPool.h include/KDSoapServer-Qt6/KDSoapServer/KDSoapThreadPool.h
lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoap%%KDSOAP_QT6_SUFFIX%%Config.cmake lib/cmake/KDSoap-qt6/KDSoap-qt6Config.cmake
lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoap%%KDSOAP_QT6_SUFFIX%%ConfigVersion.cmake lib/cmake/KDSoap-qt6/KDSoap-qt6ConfigVersion.cmake
lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoapMacros.cmake lib/cmake/KDSoap-qt6/KDSoapMacros.cmake
lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoapTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/KDSoap-qt6/KDSoapTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoapTargets.cmake lib/cmake/KDSoap-qt6/KDSoapTargets.cmake
lib/libkdsoap%%KDSOAP_QT6_SUFFIX%%.so lib/libkdsoap-qt6.so
lib/libkdsoap%%KDSOAP_QT6_SUFFIX%%.so.2 lib/libkdsoap-qt6.so.2
lib/libkdsoap%%KDSOAP_QT6_SUFFIX%%.so.%%SOVER%% lib/libkdsoap-qt6.so.%%SOVERSION%%
lib/libkdsoap-server%%KDSOAP_QT6_SUFFIX%%.so lib/libkdsoap-server-qt6.so
lib/libkdsoap-server%%KDSOAP_QT6_SUFFIX%%.so.2 lib/libkdsoap-server-qt6.so.2
lib/libkdsoap-server%%KDSOAP_QT6_SUFFIX%%.so.%%SOVER%% lib/libkdsoap-server-qt6.so.%%SOVERSION%%
%%QT_MKSPECDIR%%/modules/qt_KDSoapClient.pri %%QT_MKSPECDIR%%/modules/qt_KDSoapClient.pri
%%QT_MKSPECDIR%%/modules/qt_KDSoapServer.pri %%QT_MKSPECDIR%%/modules/qt_KDSoapServer.pri
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/BSD-3-Clause.txt share/doc/KDSoap-qt6/LICENSES/BSD-3-Clause.txt
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/GPL-2.0-only.txt share/doc/KDSoap-qt6/LICENSES/GPL-2.0-only.txt
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/LicenseRef-Microsoft.txt share/doc/KDSoap-qt6/LICENSES/LicenseRef-Microsoft.txt
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/LicenseRef-Novell.txt share/doc/KDSoap-qt6/LICENSES/LicenseRef-Novell.txt
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/LicenseRef-OASIS.txt share/doc/KDSoap-qt6/LICENSES/LicenseRef-OASIS.txt
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/LicenseRef-SportingExchange.txt share/doc/KDSoap-qt6/LICENSES/LicenseRef-SportingExchange.txt
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/MIT.txt share/doc/KDSoap-qt6/LICENSES/MIT.txt
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/W3C.txt share/doc/KDSoap-qt6/LICENSES/W3C.txt
share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/README.md share/doc/KDSoap-qt6/README.md
%%KDSOAP_QT5_ONLY%%share/doc/KDSoap/kdsoap.pri
%%KDSOAP_QT5_ONLY%%share/doc/KDSoap/kdwsdl2cpp.pri
%%KDSOAP_QT5_ONLY%%share/mkspecs/features/kdsoap.prf