From nobody Tue Nov 5 10:30:32 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjPk06jKbz5bvdL; Tue, 05 Nov 2024 10:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjPk06CyZz4jtG; Tue, 5 Nov 2024 10:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730802632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ejTtJ91EQsG840Bu80EhaOpNV1CCrVJ//PtChOsE4E=; b=Izhzwe9HKXdXB4yQCUiazPxfAiWIfWqcxdrdbzjgvkhCv1xKs/9jCJjVdtVY3E5q2oMtk4 qtWdgg2lpzLyBY2rafOieeX9UabOAsKS7cro3KdGXfw1CT4Zt/XICM7LfRo6YIk8CH/0X6 0gGEPx/MsOZz7yNiAqvxvX3YGVhbDrz50CF3cTOrwtZ7L7NUw9LmqXMEAFcyPpumlzIOy8 Uv3sf6B/ZbWTfV+ZLvCfoBBX70Mww4GvAC90EOj0RP2NX0LX6XyFpPWhmqONGYVh9ZauzK TGszGWF0tWm+JOJ7Ra40TzU6wUbCXu+mFJvRZbrV1f7uYkTqSWHpv9bEMO5QcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730802632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ejTtJ91EQsG840Bu80EhaOpNV1CCrVJ//PtChOsE4E=; b=b4AwDMsJB1ZEiaHr/NyraE9CmY+31MG1gsWPUVyBczeOmamYhopOi3Jxi3PrISY1bxPxag HhqSSZWe8Vz7qfrjskEF+shQzdtx6UY75H8zz9AVn7YwtCEQE/j1T9DbljuA/BHjfc1HiF Kvw19XoMMlxm0R2r47G7DBrjwbijZZCj3pMgWYt0eV7Ml7PtBwidacVLNN0Z52e9lURX1t liJBV6nynhDphlp859INIKUGgrFZ3KnURTzfunZBg5Kidy245m49Cm1/5U/EwyiZcc3uVD kZkiOjJh6WlKbtCZvSqjlH32SMfKozroAOMmMnXXA3AoqZIGV2SCDH1RrGF0zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730802632; a=rsa-sha256; cv=none; b=U6Xsi/2GDtpXMPxB4byV+xAHuyMf04Q2vJa7oYwQcGGG3cSCdkTgYBuSaQH7cPtRsnJzOD 8wEIAm947LF8ICXbDDUKlhF3kE9fH1iYZEw/atCqi1vlJZe6P8hmOkTcoiF1dcu+sUSfP9 XdbCafod5Mcv8nYgjwZMOC5T3ND3WdJUY7KBV5iOzj1hypbZkPPKEhuhDH3tzm6SyqmETi x8qtI7Mw/im1ex7+/FWBTV1QpxvBEOTuiXG8iVECRMcrx3HuzA+ZaVTL5Q3xc0o8rmjtco kncUW8QvHBnTEA2iRsqGc1CthbiuLFJH2ltrhIkqrFGzo6OWkIZYMLQxeAcicg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjPk05qNFz1CfC; Tue, 5 Nov 2024 10:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5AUWsH046041; Tue, 5 Nov 2024 10:30:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5AUWx6046038; Tue, 5 Nov 2024 10:30:32 GMT (envelope-from git) Date: Tue, 5 Nov 2024 10:30:32 GMT Message-Id: <202411051030.4A5AUWx6046038@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 7945736569ee - main - devel/libqb: Improve the port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7945736569ee6db4563ff713a70a5876d9c5d836 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7945736569ee6db4563ff713a70a5876d9c5d836 commit 7945736569ee6db4563ff713a70a5876d9c5d836 Author: Älven AuthorDate: 2024-11-05 10:26:37 +0000 Commit: Vladimir Druzenko CommitDate: 2024-11-05 10:27:32 +0000 devel/libqb: Improve the port * Add EXAMPLES option * Add support for activation of tests (still failing) * Fix conditional BUILD_DEPENDS on libxml2 for doxygen2man * Fix a typo PR: 282536 MFH: 2024Q4 --- devel/libqb/Makefile | 20 +++++++++++++++----- .../libqb/files/extra-DOXYGEN_OFF-patch-configure.ac | 11 +++++++++++ devel/libqb/pkg-plist | 8 ++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/devel/libqb/Makefile b/devel/libqb/Makefile index 886818ad2d40..e2c063a14175 100644 --- a/devel/libqb/Makefile +++ b/devel/libqb/Makefile @@ -1,20 +1,22 @@ PORTNAME= libqb DISTVERSION= 2.0.8 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/ClusterLabs/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= alster@vinterdalen.se -COMMENT= High performance logging, tracing, ipc, and polling library +COMMENT= High performance logging, tracing, IPC, and polling library WWW= https://github.com/ClusterLabs/libqb/wiki LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING +# HACK, see https://github.com/freebsd/poudriere/issues/1131#issuecomment-2073099527 +BUILD_DEPENDS= ${TEST_DEPENDS} TEST_DEPENDS= checkmk:devel/check -USES= cpe gmake gnome libtool pkgconfig python tar:xz +USES= cpe gmake libtool pkgconfig python tar:xz CPE_VENDOR= clusterlabs -USE_GNOME= libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -31,14 +33,22 @@ GROUPS= haclient PLIST_SUB+= QB_SOCKET_DIR=${QB_SOCKET_DIR} -OPTIONS_DEFINE= DOCS DOXYGEN +OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES OPTIONS_SUB= yes DOXYGEN_IMPLIES= DOCS -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ + libxml2>0:textproc/libxml2 +DOXYGEN_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-DOXYGEN_OFF-patch-configure.ac QB_SOCKET_DIR?= /var/run/qb +TESTING_UNSAFE= yes + +post-extract-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + post-configure: ${REINPLACE_CMD} -e 's/install: install-am/install:/g' ${WRKSRC}/doxygen2man/Makefile diff --git a/devel/libqb/files/extra-DOXYGEN_OFF-patch-configure.ac b/devel/libqb/files/extra-DOXYGEN_OFF-patch-configure.ac new file mode 100644 index 000000000000..0712f9e161b1 --- /dev/null +++ b/devel/libqb/files/extra-DOXYGEN_OFF-patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2023-06-07 06:48:54 UTC ++++ configure.ac +@@ -168,7 +168,7 @@ fi + fi + + # For building doxygen2man and man pages +-PKG_CHECK_MODULES([libxml], [libxml-2.0]) ++# PKG_CHECK_MODULES([libxml], [libxml-2.0]) + + # if we are not cross-compiling, we can use the locally built + # version of doxygen2man, otherwise we can look for diff --git a/devel/libqb/pkg-plist b/devel/libqb/pkg-plist index d3d72c2f33ba..59c148191842 100644 --- a/devel/libqb/pkg-plist +++ b/devel/libqb/pkg-plist @@ -21,6 +21,14 @@ sbin/qb-blackbox %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README.markdown +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ipcclient.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ipcserver.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mapnotify.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplelog.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpclient.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpserver.c %%DOXYGEN%%share/man/man3/qb_array_create.3.gz %%DOXYGEN%%share/man/man3/qb_array_create_2.3.gz %%DOXYGEN%%share/man/man3/qb_array_elems_per_bin_get.3.gz