On Sat Apr 06, 2024 at 02:45:35PM +0000, Klemens Nanni wrote:
> 02.04.2024 20:52, Rafael Sadowski пишет:
> > Simple update and qt6 flavor to install either qt5 and qt6 or both.
> > 
> > The default does not change.
> > 
> > OK?
> 
> Looks fine, but I wonder if the PLIST handling would look simpler/better
> if you used PLIST and something in SUBST_VARS for what looks like the
> only difference being "-Qt6" in paths (SHARED_LIBS aside).

I started with that. It's not only "-Qt6" it's also "-qt6" and "qt6".
How to choose between "-qt6" and "qt6"... by hand.

In the end I like the aja approach with:

%%qt6%%
!%%qt6%%

> 
> Whatever works is fine with me, just wondering.

If the current consumer in the -current tree builds I'll commit this update.
If this is not the case, it must be due to the big-bang action like
security/gpgme.

> 
> This applies to your "devel/qcore: qt6 flavor" as well, I think.
> 
> > 
> > Rafael
> > 
> > diff --git a/net/kdsoap/Makefile b/net/kdsoap/Makefile
> > index 71d94148bba..3bdb71f1702 100644
> > --- a/net/kdsoap/Makefile
> > +++ b/net/kdsoap/Makefile
> > @@ -1,9 +1,13 @@
> >  COMMENT =	Qt-based client-side and server-side SOAP component
> >  
> > -DISTNAME =	kdsoap-1.10.0
> > +V =		2.2.0
> > +DISTNAME =	kdsoap-${V}
> >  
> > -SHARED_LIBS +=	kdsoap		0.1
> > -SHARED_LIBS +=	kdsoap-server	0.0
> > +SHARED_LIBS +=	kdsoap		1.0
> > +SHARED_LIBS +=	kdsoap-server	1.0
> > +
> > +SHARED_LIBS +=	kdsoap-qt6                0.0 # 0.0
> > +SHARED_LIBS +=	kdsoap-server-qt6         0.0 # 0.0
> >  
> >  CATEGORIES =	net devel
> >  
> > @@ -12,15 +16,26 @@ HOMEPAGE =	https://www.kdab.com/development-resources/qt-tools/kd-soap/
> >  # AGPL3 modified
> >  PERMIT_PACKAGE =	Yes
> >  
> > -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml c m
> > +FLAVORS=	qt6
> 
> Space before =.
> 
> > +FLAVOR ?=
> >  
> >  SITES =		https://github.com/KDAB/KDSoap/releases/download/${DISTNAME}/
> >  
> > -MODULES =		devel/cmake \
> > -			x11/qt5
> > +MODULES =		devel/cmake
> >  
> >  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
> > +
> >  .include <bsd.port.mk>
> > diff --git a/net/kdsoap/distinfo b/net/kdsoap/distinfo
> > index ee836e502c0..1e7a5766a83 100644
> > --- a/net/kdsoap/distinfo
> > +++ b/net/kdsoap/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (kdsoap-1.10.0.tar.gz) = DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48=
> > -SIZE (kdsoap-1.10.0.tar.gz) = 1399777
> > +SHA256 (kdsoap-2.2.0.tar.gz) = 2e8RlIRCGXyfpEvW+63IQrcoCmDfxAV3r2b97WN681Y=
> > +SIZE (kdsoap-2.2.0.tar.gz) = 11918875
> > diff --git a/net/kdsoap/pkg/PFRAG.no-qt6 b/net/kdsoap/pkg/PFRAG.no-qt6
> > new file mode 100644
> > index 00000000000..b9b2f6a921d
> > --- /dev/null
> > +++ b/net/kdsoap/pkg/PFRAG.no-qt6
> > @@ -0,0 +1,86 @@
> > +@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
> > new file mode 100644
> > index 00000000000..5fe8dd9bce5
> > --- /dev/null
> > +++ b/net/kdsoap/pkg/PFRAG.qt6
> > @@ -0,0 +1,80 @@
> > +@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 57fca83f069..48224473412 100644
> > --- a/net/kdsoap/pkg/PLIST
> > +++ b/net/kdsoap/pkg/PLIST
> > @@ -1,86 +1,2 @@
> > -@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/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/GPL-3.0-only.txt
> > -share/doc/KDSoap/LICENSES/LGPL-2.0-or-later.txt
> > -share/doc/KDSoap/LICENSES/LGPL-2.1-only.txt
> > -share/doc/KDSoap/LICENSES/LGPL-3.0-only.txt
> > -share/doc/KDSoap/LICENSES/LicenseRef-KDAB-KDSoap-AGPL3-Modified.txt
> > -share/doc/KDSoap/LICENSES/LicenseRef-KDAB-KDSoap-US.txt
> > -share/doc/KDSoap/LICENSES/LicenseRef-KDAB-KDSoap.txt
> > -share/doc/KDSoap/README-commercial.txt
> > -share/doc/KDSoap/README.txt
> > -share/doc/KDSoap/kdsoap.pri
> > -share/doc/KDSoap/kdwsdl2cpp.pri
> > -share/mkspecs/
> > -share/mkspecs/features/
> > -share/mkspecs/features/kdsoap.prf
> > +%%qt6%%
> > +!%%qt6%%
> > 
>