net-im/qxmpp: Update to 1.6.0

Update LICENSE - it's really LGPL21+

Remove wonderous use of USES=libtool alongside of USES=cmake. Still
trying to figure out how that ever came to pass.

Disable building of examples which we wern't installing anyways and make
PLIST_SUB more readable.

Add a TEST option to optionally build tests (previously on by default),
which eliminates ~274 targets for normal builds, but still lets us check
if everything is all hunky dory.
This commit is contained in:
Jason E. Hale 2024-02-10 20:44:13 -05:00
parent 886633d070
commit cca8f3b4d4
3 changed files with 35 additions and 16 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= qxmpp
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.6
DISTVERSION= 1.6.0
CATEGORIES= net-im
PKGNAMESUFFIX= -${FLAVOR}
@ -8,7 +8,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= XMPP client library based on Qt and C++
WWW= https://github.com/qxmpp-project/qxmpp/
LICENSE= LGPL21
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
LIB_DEPENDS= libomemo-c.so:security/libomemo-c
@ -16,21 +16,33 @@ LIB_DEPENDS= libomemo-c.so:security/libomemo-c
FLAVORS= qt5 qt6
FLAVOR?= qt5
USES= cmake compiler:c++17-lang libtool pathfix pkgconfig qca qt:${FLAVOR:S/qt//}
USES= cmake compiler:c++17-lang pathfix pkgconfig qca \
qt:${QT_VER}
USE_GITHUB= yes
GH_ACCOUNT= qxmpp-project
USE_QT= ${_USE_QT_${FLAVOR}}
CMAKE_ARGS= -DQT_VERSION_MAJOR=${FLAVOR:S/qt//}
CMAKE_ON= BUILD_OMEMO
_USE_QT_qt5= core gui network xml \
buildtools:build qmake:build testlib:build
_USE_QT_qt5= core network xml \
buildtools:build qmake:build
_USE_QT_qt6= base
USE_QT= ${_USE_QT_${FLAVOR}}
_PLIST_QT5_qt5=
_PLIST_QT5_qt6= "@comment "
CMAKE_ARGS= -DQT_VERSION_MAJOR=${QT_VER}
CMAKE_ON= BUILD_OMEMO
CMAKE_OFF= BUILD_EXAMPLES
_PLIST_SUB_qt5= QT5_ONLY=""
_PLIST_SUB_qt6= QT5_ONLY="@comment "
PLIST_SUB= VERSION=${PORTVERSION} \
QT_VER=${FLAVOR:S/qt//} \
QT5_ONLY=${_PLIST_QT5_${FLAVOR}}
QT_VER=${QT_VER} \
${_PLIST_SUB_${FLAVOR}}
QT_VER= ${FLAVOR:S/qt//}
OPTIONS_DEFINE= TEST
_TEST_USE_QT_qt5= testlib:build
_TEST_USE_QT_qt6= # empty
TEST_USE_QT= ${_FLAVOR_USE_QT_${FLAVOR}}
TEST_CMAKE_BOOL= BUILD_TESTS
TEST_TEST_TARGET= test
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1707144125
SHA256 (qxmpp-project-qxmpp-v1.5.6_GH0.tar.gz) = 5af37cfbe878284e12babf4cd5f07109198e7e3dd3f1f78dc3eef351b6614a48
SIZE (qxmpp-project-qxmpp-v1.5.6_GH0.tar.gz) = 607830
TIMESTAMP = 1707602726
SHA256 (qxmpp-project-qxmpp-v1.6.0_GH0.tar.gz) = af19b8644ff92f3b38d3e75b89ce4632501c102f17f32b09d7dcde0b27e1c16e
SIZE (qxmpp-project-qxmpp-v1.6.0_GH0.tar.gz) = 645985

View File

@ -13,9 +13,11 @@ include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryContentId.h
include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryData.h
include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryDataList.h
include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryIq.h
include/QXmppQt%%QT_VER%%/QXmppBlockingManager.h
include/QXmppQt%%QT_VER%%/QXmppBookmarkManager.h
include/QXmppQt%%QT_VER%%/QXmppBookmarkSet.h
include/QXmppQt%%QT_VER%%/QXmppByteStreamIq.h
include/QXmppQt%%QT_VER%%/QXmppCallInviteManager.h
include/QXmppQt%%QT_VER%%/QXmppCarbonManager.h
include/QXmppQt%%QT_VER%%/QXmppCarbonManagerV2.h
include/QXmppQt%%QT_VER%%/QXmppClient.h
@ -35,6 +37,9 @@ include/QXmppQt%%QT_VER%%/QXmppEntityTimeIq.h
include/QXmppQt%%QT_VER%%/QXmppEntityTimeManager.h
include/QXmppQt%%QT_VER%%/QXmppError.h
include/QXmppQt%%QT_VER%%/QXmppExtension.h
include/QXmppQt%%QT_VER%%/QXmppExternalService.h
include/QXmppQt%%QT_VER%%/QXmppExternalServiceDiscoveryIq.h
include/QXmppQt%%QT_VER%%/QXmppExternalServiceDiscoveryManager.h
include/QXmppQt%%QT_VER%%/QXmppFileMetadata.h
include/QXmppQt%%QT_VER%%/QXmppFileShare.h
include/QXmppQt%%QT_VER%%/QXmppFileSharingManager.h
@ -53,7 +58,9 @@ include/QXmppQt%%QT_VER%%/QXmppIncomingServer.h
include/QXmppQt%%QT_VER%%/QXmppInvokable.h
include/QXmppQt%%QT_VER%%/QXmppIq.h
include/QXmppQt%%QT_VER%%/QXmppIqHandling.h
include/QXmppQt%%QT_VER%%/QXmppJingleData.h
include/QXmppQt%%QT_VER%%/QXmppJingleIq.h
include/QXmppQt%%QT_VER%%/QXmppJingleMessageInitiationManager.h
include/QXmppQt%%QT_VER%%/QXmppLogger.h
include/QXmppQt%%QT_VER%%/QXmppMamIq.h
include/QXmppQt%%QT_VER%%/QXmppMamManager.h