Attachment 254967 Details for Bug 282536 – [PATCH] devel/libqb: Improve the port

[patch] [PATCH] devel/libqb: Improve the port

0001-devel-libqb-Improve-the-port.patch (text/plain), 3.76 KB, created by Älven on 2024-11-05 09:32:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Älven

Created: 2024-11-05 09:32:03 UTC

Size: 3.76 KB

patch

obsolete

>From 359e12092db0a9abc96b47fe8442772563669053 Mon Sep 17 00:00:00 2001
>From: Ãlven <alster@vinterdalen.se>
>Date: Tue, 5 Nov 2024 04:20:55 +0400
>Subject: [PATCH] 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
>---
> devel/libqb/Makefile                            | 17 ++++++++++++-----
> .../files/extra-DOXYGEN_OFF-patch-configure.ac  | 15 +++++++++++++++
> devel/libqb/pkg-plist                           |  8 ++++++++
> 3 files changed, 35 insertions(+), 5 deletions(-)
> create mode 100644 devel/libqb/files/extra-DOXYGEN_OFF-patch-configure.ac
>
>diff --git a/devel/libqb/Makefile b/devel/libqb/Makefile
>index 886818ad2d40..2140bc686f34 100644
>--- a/devel/libqb/Makefile
>+++ b/devel/libqb/Makefile
>@@ -4,17 +4,17 @@ 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
> 
>+BUILD_DEPENDS+=		${TEST_DEPENDS} # HACK, see https://github.com/freebsd/poudriere/issues/1131#issuecomment-2073099527
> TEST_DEPENDS=		checkmk:devel/check
> 
>-USES=			cpe gmake gnome libtool pkgconfig python tar:xz
>+USES=			autoreconf cpe gmake libtool pkgconfig python tar:xz
> CPE_VENDOR=		clusterlabs
>-USE_GNOME=		libxml2
> USE_LDCONFIG=		yes
> 
> GNU_CONFIGURE=		yes
>@@ -31,13 +31,20 @@ 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..f9a90351d35f
>--- /dev/null
>+++ b/devel/libqb/files/extra-DOXYGEN_OFF-patch-configure.ac
>@@ -0,0 +1,15 @@
>+By Daniel Engberg <diizzy@FreeBSD.org>
>+
>+Disables check for libxml when DOXYGEN=OFF
>+
>+--- 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
>-- 
>2.47.0
>

Flags:

alster: maintainer-approval+

Actions: View | Diff

Attachments on bug 282536: 254927 | 254958 | 254959 | 254960 | 254961 | 254967