From nobody Tue Nov 05 20:17:28 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 4XjflF2Svrz5bY40; Tue, 05 Nov 2024 20:17:29 +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 4XjflF0dnVz4VHd; Tue, 5 Nov 2024 20:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730837849; 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=8a/TV6NPbihKNbVeQR/QaHH35xKel5HhJfIRR3eQsKE=; b=f+h4i6FtLqnJSedck60kZtMy7cd2noluJIOiD3lcp64Ybc6mjRdpSmYP7BTm3U4DvuZLZv y8ADWKsOC7uvKsz5jy7n8JCR+yhxNZDqhZCPWquU5q69QPrXqRRcqbx2V/4NlmR+c+VBli e/UJflcl1oTqAWLAzN/mU/lfCKEqxBrMUyqbqhPEUU53LCHNdKcoK1TnTh2awlB2DpmVAV oGMdVvoVb7lASLh/YcrO0VvISp737rFc/70nin5AtxIn0MVQYInxXPnGhwnm5a9JH8by2C NpcT10HZ1LvKhIyNJk8Xqo4x5yHnHOM6a2PtiNFfR2kq0+uluEYu3lZzdCl1yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730837849; 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=8a/TV6NPbihKNbVeQR/QaHH35xKel5HhJfIRR3eQsKE=; b=xjh8iJPtR8QNTxzljBnBdmYHb7BgD8GPo595HW9dSOkp2r0GRYfyTdjuLRwovbXPkOMor+ ziJ9OuUPqnLrZPBlRbXnByT0tiZfevWvs8gjPAkPGYnr/VMWTLFTr6GJecZl1zjQUIgRu7 MPvIuM5yJ9UNoMsNQB1fuVMbKfx2JTwZv6UEPt+jU00iCH/xklypVFKEQU2LiNu9jlNLa4 gGVJ0RCv+eeoPH5BfaYUmjJouKNG+Wg+mSMOw73IgiOh9CVRHBric4kRzMRK9foI8jqJJa UtPaV8ZAcbAIXGaQ7MPQVNacT+JpbH4jIGDKDtX/5ANCsYO4athdF1bFe9MJew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730837849; a=rsa-sha256; cv=none; b=xpKRd8ehcajvsqzxiK2vELlyFx6H2UXCVTQ/z1/u/hk4aTtjkznwxg9AHFUoN8SM5xLjgR orSrzrRQI+wGzv6InU3aH/omSq1DzsaHCUX+1r2TgFPWEDGo3z1ykMYzi6WsMenCYwsgOb hd0GzL6Eww4bk/l1rh4NNQW8zxnp7pBUFAP+gV69LNrkr5/N9lWHlq5StrXO1km9qASUYg /z/ft6e4CnaUzGfDMynXtmBHuUm0u62NS8Bz0r2rqnfs3ufggQQLR5aRoXm+ug7OYveRWw xlOo/396k2f/kZ5FJ50dO6eTmV82+Gsc80QfQODaT9rj9wp1RCX5JMI9hebnig== 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 4XjflD6bVRzX96; Tue, 5 Nov 2024 20:17:28 +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 4A5KHSag028807; Tue, 5 Nov 2024 20:17:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5KHSjw028804; Tue, 5 Nov 2024 20:17:28 GMT (envelope-from git) Date: Tue, 5 Nov 2024 20:17:28 GMT Message-Id: <202411052017.4A5KHSjw028804@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: ca513743832b - main - devel/libqb: Fix build and improve 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca513743832b301e1bd80e83d27d845020bfba8e Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca513743832b301e1bd80e83d27d845020bfba8e commit ca513743832b301e1bd80e83d27d845020bfba8e Author: Daniel Engberg AuthorDate: 2024-11-05 19:57:09 +0000 Commit: Daniel Engberg CommitDate: 2024-11-05 20:17:24 +0000 devel/libqb: Fix build and improve port * Remove BUILD_DEPENDS hack, these will be a pain to fix if sprinkled all over the tree * Remove Python dependency * Add USES= pathfix * Remove LDFLAGS variable (builds fine without) * Fix build with DOXYGEN disabled * Use gnome helper for libxml2 * Rearrage port for better readability PR: 282570 Reviewed by: Älven (maintainer) --- devel/libqb/Makefile | 36 +++++++++++++++++------------------- devel/libqb/files/patch-configure.ac | 13 +++++++++++++ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/devel/libqb/Makefile b/devel/libqb/Makefile index e2c063a14175..b5ee7a1ac967 100644 --- a/devel/libqb/Makefile +++ b/devel/libqb/Makefile @@ -1,6 +1,6 @@ PORTNAME= libqb DISTVERSION= 2.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://github.com/ClusterLabs/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -11,39 +11,37 @@ 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 libtool pkgconfig python tar:xz +USES= cpe gmake libtool pathfix pkgconfig tar:xz CPE_VENDOR= clusterlabs USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-socket-dir=${QB_SOCKET_DIR} \ - PACKAGE_STRING="${PORTNAME} ${DISTVERSION}" \ - PACKAGE_VERSION=${DISTVERSION} - -INSTALL_TARGET= install-strip -TEST_TARGET= check - -LDFLAGS+= -B${LOCALBASE}/bin GROUPS= haclient +QB_SOCKET_DIR?= /var/run/qb PLIST_SUB+= QB_SOCKET_DIR=${QB_SOCKET_DIR} +TEST_TARGET= check +TESTING_UNSAFE= yes + +INSTALL_TARGET= install-strip + +CONFIGURE_ARGS= --with-socket-dir=${QB_SOCKET_DIR} \ + PACKAGE_STRING="${PORTNAME} ${DISTVERSION}" \ + PACKAGE_VERSION=${DISTVERSION} + OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES OPTIONS_SUB= yes -DOXYGEN_IMPLIES= DOCS -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - libxml2>0:textproc/libxml2 +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen +DOXYGEN_USES= gnome +DOXYGEN_USES_OFF= autoreconf +DOXYGEN_USE= gnome=libxml2:build DOXYGEN_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-DOXYGEN_OFF-patch-configure.ac - -QB_SOCKET_DIR?= /var/run/qb - -TESTING_UNSAFE= yes +DOXYGEN_IMPLIES= DOCS post-extract-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/devel/libqb/files/patch-configure.ac b/devel/libqb/files/patch-configure.ac new file mode 100644 index 000000000000..a5dde5d92f0c --- /dev/null +++ b/devel/libqb/files/patch-configure.ac @@ -0,0 +1,13 @@ +--- configure.ac.orig 2024-11-05 18:51:54 UTC ++++ configure.ac +@@ -94,8 +94,8 @@ AC_CHECK_TOOLS([READELF], [eu-readelf readelf], [:]) + AM_CONDITIONAL(HAVE_DOXYGEN, test -n "${DOXYGEN}") + AC_CHECK_TOOLS([NM], [eu-nm nm], [:]) + AC_CHECK_TOOLS([READELF], [eu-readelf readelf], [:]) +-AM_PATH_PYTHON([2.6],, [:]) +-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) ++#AM_PATH_PYTHON([2.6],, [:]) ++#AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) + + ## local helper functions +