git: 70c3eea14b3e - main - www/kdsoap: Update to 2.2.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Tue, 19 Nov 2024 12:52:53 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=70c3eea14b3eb4360a46f114b11025f93fb3165c

commit 70c3eea14b3eb4360a46f114b11025f93fb3165c
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-11-19 12:29:36 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-11-19 12:52:47 +0000

    www/kdsoap: Update to 2.2.0
    
    Stop being awkward about GitHub projects having pre-rolled releases.
    
    Project has since been relicensed to MIT.
    
    Have some fun with the :? modifier to emilimitate a slew of custom
    variables.
    
    Stop building the examples that don't get intalled anyways.
    
    https://github.com/KDAB/KDSoap/releases/tag/kdsoap-2.2.0
---
 www/kdsoap/Makefile  |  49 +++++------------
 www/kdsoap/distinfo  |   6 +-
 www/kdsoap/pkg-plist | 151 ++++++++++++++++++++++++++-------------------------
 3 files changed, 94 insertions(+), 112 deletions(-)

diff --git a/www/kdsoap/Makefile b/www/kdsoap/Makefile
index e3ecf2a34846..d1e27d4c6fd0 100644
--- a/www/kdsoap/Makefile
+++ b/www/kdsoap/Makefile
@@ -1,53 +1,34 @@
 PORTNAME=	kdsoap
-DISTVERSION=	2.1.1
-PORTREVISION=	1
+DISTVERSION=	2.2.0
 CATEGORIES=	www
-# It's on GitHub, but KDAB uploads tidy release tarballs,
-# so do NOT USE_GITHUB, but do write out the variables.
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTNAME}-${DISTVERSION}/
+MASTER_SITES=	https://github.com/KDAB/KDSoap/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	C++/Qt SOAP framework
 WWW=		https://github.com/KDAB/KDSoap
 
-# The software is partly under (LGPL21 | GPL2 | GPL3 ), and partly
-# under AGPLv3. We choose LGPL21 and AGPLv3, since that's easiest
-# to express in a ports Makefile.
-LICENSE=	LGPL21 AGPLv3
-LICENSE_COMB=	multi
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 FLAVORS=	qt5 qt6
 FLAVOR?=	qt5
 
-USES=		cmake compiler:c++11-lang localbase pkgconfig qt:${FLAVOR:S/qt//}
-# No USE_GITHUB, but pretty close
-GH_ACCOUNT=	KDAB
-GH_PROJECT=	KDSoap
+USES=		cmake compiler:c++${"${FLAVOR:Mqt6}" != "":?17:11}-lang \
+		qt:${FLAVOR:S/qt//}
 USE_LDCONFIG=	yes
+_USE_QT_qt5=	core network xml \
+		buildtools:build qmake:build
+_USE_QT_qt6=	base
 USE_QT=		${_USE_QT_${FLAVOR}}
-# KDSoap upstream does not support co-installability properly. To mitigate this,
-# install the headers to a prefixed location.
-CMAKE_ARGS=	${_CMAKE_ARGS_${FLAVOR}} \
-		-DINSTALL_INCLUDE_DIR:PATH=${PREFIX}/${_KDSOAP_INCDIR}
 
+CMAKE_ARGS=	-DKDSoap_QT6:BOOL=${"${FLAVOR:Mqt6}" != "":?TRUE:FALSE}
+CMAKE_OFF=	KDSoap_EXAMPLES
 
 PLIST_SUB=	SOVER=${DISTVERSION} \
-		KDSOAP_INCDIR=${_KDSOAP_INCDIR} \
-		KDSOAP_SUFFIX=${_KDSOAP_SUFFIX} \
-		KDSOAP_QT5_ONLY=${_KDSOAP_QT5_ONLY}
-
-# Flavor handling
-_CMAKE_ARGS_qt5=	-DKDSoap_QT6:BOOL=FALSE
-_CMAKE_ARGS_qt6=	-DKDSoap_QT6:BOOL=TRUE
-_USE_QT_qt5=	core network widgets xml \
-		buildtools:build linguisttools:build qmake:build
-_USE_QT_qt6=	base
-_KDSOAP_INCDIR=	include/KDSoap${FLAVOR:S/qt//}
-_KDSOAP_SUFFIX=	${_KDSOAP_SUFFIX_${FLAVOR}}
-_KDSOAP_SUFFIX_qt6=	-qt6
-_KDSOAP_QT5_ONLY_qt6=	"@comment "
-_KDSOAP_QT5_ONLY=	${_KDSOAP_QT5_ONLY_${FLAVOR}}
-
+		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>
diff --git a/www/kdsoap/distinfo b/www/kdsoap/distinfo
index 92e45a5ad5c8..204ada3d860b 100644
--- a/www/kdsoap/distinfo
+++ b/www/kdsoap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679333874
-SHA256 (kdsoap-2.1.1.tar.gz) = aed57f6b200ddf762f5d2898f7e9228dd0700881c4491aefe4006f7fa5f5c627
-SIZE (kdsoap-2.1.1.tar.gz) = 948277
+TIMESTAMP = 1731999021
+SHA256 (kdsoap-2.2.0.tar.gz) = d9ef11948442197c9fa44bd6fbadc842b7280a60dfc40577af66fded637af356
+SIZE (kdsoap-2.2.0.tar.gz) = 11918875
diff --git a/www/kdsoap/pkg-plist b/www/kdsoap/pkg-plist
index a423b0b0fcdd..bb4e435a71a9 100644
--- a/www/kdsoap/pkg-plist
+++ b/www/kdsoap/pkg-plist
@@ -1,80 +1,81 @@
-bin/kdwsdl2cpp%%KDSOAP_SUFFIX%%
-%%KDSOAP_INCDIR%%/KDSoapClient/KDDateTime
-%%KDSOAP_INCDIR%%/KDSoapClient/KDDateTime.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDQName
-%%KDSOAP_INCDIR%%/KDSoapClient/KDQName.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoap
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoap.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapAuthentication
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapAuthentication.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapClient
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapClientInterface
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapClientInterface.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapEndpointReference
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapEndpointReference.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapFaultException
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapFaultException.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapGlobal
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapGlobal.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapHeaders
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapJob
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapJob.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapMessage
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapMessage.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapMessageAddressingProperties
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapMessageAddressingProperties.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapNamespaceManager
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapNamespaceManager.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapPendingCall
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapPendingCall.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapPendingCallWatcher
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapPendingCallWatcher.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapSslHandler
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapSslHandler.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapUdpClient
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapUdpClient.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapValue
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapValue.h
-%%KDSOAP_INCDIR%%/KDSoapClient/KDSoapValueList
-%%KDSOAP_INCDIR%%/KDSoapClient/kdsoap_version.h
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapDelayedResponseHandle
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapDelayedResponseHandle.h
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServer
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServer.h
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerAuthInterface
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerAuthInterface.h
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerCustomVerbRequestInterface
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerGlobal
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerGlobal.h
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerObjectInterface
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerObjectInterface.h
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerRawXMLInterface
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapServerRawXMLInterface.h
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapThreadPool
-%%KDSOAP_INCDIR%%/KDSoapServer/KDSoapThreadPool.h
-lib/cmake/KDSoap%%KDSOAP_SUFFIX%%/KDSoap%%KDSOAP_SUFFIX%%Config.cmake
-lib/cmake/KDSoap%%KDSOAP_SUFFIX%%/KDSoap%%KDSOAP_SUFFIX%%ConfigVersion.cmake
-lib/cmake/KDSoap%%KDSOAP_SUFFIX%%/KDSoapMacros.cmake
-lib/cmake/KDSoap%%KDSOAP_SUFFIX%%/KDSoapTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/KDSoap%%KDSOAP_SUFFIX%%/KDSoapTargets.cmake
-lib/libkdsoap%%KDSOAP_SUFFIX%%.so
-lib/libkdsoap%%KDSOAP_SUFFIX%%.so.2
-lib/libkdsoap%%KDSOAP_SUFFIX%%.so.%%SOVER%%
-lib/libkdsoap-server%%KDSOAP_SUFFIX%%.so
-lib/libkdsoap-server%%KDSOAP_SUFFIX%%.so.2
-lib/libkdsoap-server%%KDSOAP_SUFFIX%%.so.%%SOVER%%
+bin/kdwsdl2cpp%%KDSOAP_QT6_SUFFIX%%
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDDateTime
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDDateTime.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDQName
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDQName.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoap
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoap.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapAuthentication
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapAuthentication.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapClient
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapClientInterface
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapClientInterface.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapEndpointReference
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapEndpointReference.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapFaultException
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapFaultException.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapGlobal
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapGlobal.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapHeaders
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapJob
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapJob.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapMessage
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapMessage.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapMessageAddressingProperties
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapMessageAddressingProperties.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapNamespaceManager
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapNamespaceManager.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapPendingCall
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapPendingCall.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapPendingCallWatcher
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapPendingCallWatcher.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapSslHandler
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapSslHandler.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapUdpClient
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapUdpClient.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapValue
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapValue.h
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/KDSoapValueList
+include/%%KDSOAPCLIENT_INCDIR_SUBDIR%%KDSoapClient/kdsoap_version.h
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapDelayedResponseHandle
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapDelayedResponseHandle.h
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServer
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServer.h
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerAuthInterface
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerAuthInterface.h
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerCustomVerbRequestInterface
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerGlobal
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerGlobal.h
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerObjectInterface
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerObjectInterface.h
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerRawXMLInterface
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapServerRawXMLInterface.h
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapThreadPool
+include/%%KDSOAPSERVER_INCDIR_SUBDIR%%KDSoapServer/KDSoapThreadPool.h
+lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoap%%KDSOAP_QT6_SUFFIX%%Config.cmake
+lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoap%%KDSOAP_QT6_SUFFIX%%ConfigVersion.cmake
+lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoapMacros.cmake
+lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoapTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KDSoap%%KDSOAP_QT6_SUFFIX%%/KDSoapTargets.cmake
+lib/libkdsoap%%KDSOAP_QT6_SUFFIX%%.so
+lib/libkdsoap%%KDSOAP_QT6_SUFFIX%%.so.2
+lib/libkdsoap%%KDSOAP_QT6_SUFFIX%%.so.%%SOVER%%
+lib/libkdsoap-server%%KDSOAP_QT6_SUFFIX%%.so
+lib/libkdsoap-server%%KDSOAP_QT6_SUFFIX%%.so.2
+lib/libkdsoap-server%%KDSOAP_QT6_SUFFIX%%.so.%%SOVER%%
 %%QT_MKSPECDIR%%/modules/qt_KDSoapClient.pri
 %%QT_MKSPECDIR%%/modules/qt_KDSoapServer.pri
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/LICENSES/BSD-3-Clause.txt
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/LICENSES/GPL-2.0-only.txt
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/LICENSES/LicenseRef-Microsoft.txt
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/LICENSES/LicenseRef-Novell.txt
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/LICENSES/LicenseRef-OASIS.txt
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/LICENSES/LicenseRef-SportingExchange.txt
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/LICENSES/MIT.txt
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/LICENSES/W3C.txt
-share/doc/KDSoap%%KDSOAP_SUFFIX%%/README.md
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/BSD-3-Clause.txt
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/GPL-2.0-only.txt
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/LicenseRef-Microsoft.txt
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/LicenseRef-Novell.txt
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/LicenseRef-OASIS.txt
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/LicenseRef-SportingExchange.txt
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/MIT.txt
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/LICENSES/W3C.txt
+share/doc/KDSoap%%KDSOAP_QT6_SUFFIX%%/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
+