Attachment #254967 for bug #282536




MASTER_SITES=		https://github.com/ClusterLabs/${PORTNAME}/releases/download/v${DISTVERSION}/

MAINTAINER=		alster@vinterdalen.se
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=			autoreconf cpe gmake libtool pkgconfig python tar:xz
CPE_VENDOR=		clusterlabs
USE_GNOME=		libxml2
USE_LDCONFIG=		yes

GNU_CONFIGURE=		yes


PLIST_SUB+=		QB_SOCKET_DIR=${QB_SOCKET_DIR}

OPTIONS_DEFINE=		DOCS DOXYGEN EXAMPLES
OPTIONS_SUB=		yes

DOXYGEN_IMPLIES=	DOCS
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




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

Lines 21-26 sbin/qb-blackbox Link Here

(-)b/devel/libqb/pkg-plist (-1 / +8 lines)
21	%%PORTDOCS%%%%DOCSDIR%%/COPYING	21	%%PORTDOCS%%%%DOCSDIR%%/COPYING
22	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	22	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
23	%%PORTDOCS%%%%DOCSDIR%%/README.markdown	23	%%PORTDOCS%%%%DOCSDIR%%/README.markdown
		24	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
		25	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in
		26	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ipcclient.c
		27	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ipcserver.c
		28	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mapnotify.c
		29	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplelog.c
		30	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpclient.c
		31	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpserver.c
24	%%DOXYGEN%%share/man/man3/qb_array_create.3.gz	32	%%DOXYGEN%%share/man/man3/qb_array_create.3.gz
25	%%DOXYGEN%%share/man/man3/qb_array_create_2.3.gz	33	%%DOXYGEN%%share/man/man3/qb_array_create_2.3.gz
26	%%DOXYGEN%%share/man/man3/qb_array_elems_per_bin_get.3.gz	34	%%DOXYGEN%%share/man/man3/qb_array_elems_per_bin_get.3.gz
27	-

Return to bug 282536

Lines 4-20 CATEGORIES= devel Link Here

(-)b/devel/libqb/Makefile (-5 / +12 lines)
4	MASTER_SITES= https://github.com/ClusterLabs/${PORTNAME}/releases/download/v${DISTVERSION}/	4	MASTER_SITES= https://github.com/ClusterLabs/${PORTNAME}/releases/download/v${DISTVERSION}/
5		5
6	MAINTAINER= alster@vinterdalen.se	6	MAINTAINER= alster@vinterdalen.se
7	COMMENT= High performance logging, tracing, ipc, and polling library	7	COMMENT= High performance logging, tracing, IPC, and polling library
8	WWW= https://github.com/ClusterLabs/libqb/wiki	8	WWW= https://github.com/ClusterLabs/libqb/wiki
9		9
10	LICENSE= LGPL21	10	LICENSE= LGPL21
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
		13	BUILD_DEPENDS+= ${TEST_DEPENDS} # HACK, see https://github.com/freebsd/poudriere/issues/1131#issuecomment-2073099527
13	TEST_DEPENDS= checkmk:devel/check	14	TEST_DEPENDS= checkmk:devel/check
14		15
15	USES= cpe gmake gnome libtool pkgconfig python tar:xz	16	USES= autoreconf cpe gmake libtool pkgconfig python tar:xz
16	CPE_VENDOR= clusterlabs	17	CPE_VENDOR= clusterlabs
17	USE_GNOME= libxml2
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19		19
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
Lines 31-43 GROUPS= haclient Link Here
31		31
32	PLIST_SUB+= QB_SOCKET_DIR=${QB_SOCKET_DIR}	32	PLIST_SUB+= QB_SOCKET_DIR=${QB_SOCKET_DIR}
33		33
34	OPTIONS_DEFINE= DOCS DOXYGEN	34	OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES
35	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
36		36
37	DOXYGEN_IMPLIES= DOCS	37	DOXYGEN_IMPLIES= DOCS
38	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen	38	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \
		39	libxml2>0:textproc/libxml2
		40	DOXYGEN_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-DOXYGEN_OFF-patch-configure.ac
39		41
40	QB_SOCKET_DIR?= /var/run/qb	42	QB_SOCKET_DIR?= /var/run/qb
		43	TESTING_UNSAFE= yes
		44
		45	post-extract-EXAMPLES-on:
		46	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		47	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
41		48
42	post-configure:	49	post-configure:
43	${REINPLACE_CMD} -e 's/install: install-am/install:/g' ${WRKSRC}/doxygen2man/Makefile	50	${REINPLACE_CMD} -e 's/install: install-am/install:/g' ${WRKSRC}/doxygen2man/Makefile

Added Link Here

(-)b/devel/libqb/files/extra-DOXYGEN_OFF-patch-configure.ac (+15 lines)
1	By Daniel Engberg <diizzy@FreeBSD.org>
2
3	Disables check for libxml when DOXYGEN=OFF
4
5	--- configure.ac.orig 2023-06-07 06:48:54 UTC
6	+++ configure.ac
7	@@ -168,7 +168,7 @@ fi
8	fi
9
10	# For building doxygen2man and man pages
11	-PKG_CHECK_MODULES([libxml], [libxml-2.0])
12	+# PKG_CHECK_MODULES([libxml], [libxml-2.0])
13
14	# if we are not cross-compiling, we can use the locally built
15	# version of doxygen2man, otherwise we can look for