diff --git a/devel/libqb/Makefile b/devel/libqb/Makefile
index 886818ad2d40..e2c063a14175 100644
--- a/devel/libqb/Makefile
+++ b/devel/libqb/Makefile
@@ -1,51 +1,61 @@
 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
 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
 
 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
 
 post-configure-DOXYGEN-off:
 	${REINPLACE_CMD} -e 's/doxygen2man docs//g' ${WRKSRC}/Makefile
 
 post-install:
 	${MKDIR} ${STAGEDIR}${QB_SOCKET_DIR}
 
 .include <bsd.port.mk>
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
@@ -1,224 +1,232 @@
 include/qb/qbarray.h
 include/qb/qbatomic.h
 include/qb/qbconfig.h
 include/qb/qbdefs.h
 include/qb/qbhdb.h
 include/qb/qbipc_common.h
 include/qb/qbipcc.h
 include/qb/qbipcs.h
 include/qb/qblist.h
 include/qb/qblog.h
 include/qb/qbloop.h
 include/qb/qbmap.h
 include/qb/qbrb.h
 include/qb/qbutil.h
 lib/libqb.a
 lib/libqb.so
 lib/libqb.so.100
 lib/libqb.so.100.3.2
 libdata/pkgconfig/libqb.pc
 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
 %%DOXYGEN%%share/man/man3/qb_array_free.3.gz
 %%DOXYGEN%%share/man/man3/qb_array_grow.3.gz
 %%DOXYGEN%%share/man/man3/qb_array_index.3.gz
 %%DOXYGEN%%share/man/man3/qb_array_new_bin_cb_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_array_num_bins_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_init.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_int_add.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_int_compare_and_exchange.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_int_exchange_and_add.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_int_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_int_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_pointer_compare_and_exchange.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_pointer_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_atomic_pointer_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_hashtable_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_base_convert.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_destroy.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_handle_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_handle_destroy.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_handle_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_handle_get_always.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_handle_put.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_handle_refcount_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_iterator_next.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_iterator_reset.3.gz
 %%DOXYGEN%%share/man/man3/qb_hdb_nocheck_convert.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_connect.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_context_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_context_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_disconnect.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_event_recv.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_fc_enable_max_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_fd_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_get_buffer_size.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_is_connected.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_recv.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_send.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_sendv.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_sendv_recv.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcc_verify_dgram_max_msg_size.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_auth_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_first_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_get_buffer_size.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_next_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_ref.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_service_context_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_stats_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_stats_get_2.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_connection_unref.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_context_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_context_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_destroy.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_disconnect.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_enforce_buffer_size.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_event_send.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_event_sendv.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_poll_handlers_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_ref.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_request_rate_limit.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_response_send.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_response_sendv.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_run.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_service_context_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_service_context_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_service_id_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_stats_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_ipcs_unref.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_add.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_add_tail.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_del.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_empty.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_init.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_is_last.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_length.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_replace.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_splice.3.gz
 %%DOXYGEN%%share/man/man3/qb_list_splice_tail.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_blackbox_print_from_file.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_blackbox_write_to_file.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_callsite_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_callsites_dump.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_callsites_register.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_ctl.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_ctl2.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_custom_close.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_custom_open.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_facility2int.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_facility2str.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_file_close.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_file_open.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_file_reopen.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_filter_ctl.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_filter_ctl2.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_filter_fn_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_fini.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_format_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_from_external_source.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_from_external_source_va.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_init.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_real_.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_real_va_.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_tags_stringify_fn_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_target_format.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_target_user_data_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_target_user_data_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_thread_priority_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_log_thread_start.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_destroy.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_job_add.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_job_del.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_poll_add.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_poll_del.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_poll_low_fds_event_set.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_poll_mod.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_run.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_signal_add.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_signal_del.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_signal_mod.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_stop.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_timer_add.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_timer_del.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_timer_expire_time_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_timer_expire_time_remaining.3.gz
 %%DOXYGEN%%share/man/man3/qb_loop_timer_is_running.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_count_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_destroy.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_foreach.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_iter_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_iter_free.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_iter_next.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_notify_add.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_notify_del.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_notify_del_2.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_pref_iter_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_put.3.gz
 %%DOXYGEN%%share/man/man3/qb_map_rm.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chmod.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chown.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chunk_alloc.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chunk_commit.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chunk_peek.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chunk_read.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chunk_reclaim.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chunk_write.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_chunks_used.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_close.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_create_from_file.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_name_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_open.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_refcount_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_shared_user_data_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_space_free.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_space_used.3.gz
 %%DOXYGEN%%share/man/man3/qb_rb_write_to_file.3.gz
 %%DOXYGEN%%share/man/man3/qb_skiplist_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_strerror_r.3.gz
 %%DOXYGEN%%share/man/man3/qb_thread_lock.3.gz
 %%DOXYGEN%%share/man/man3/qb_thread_lock_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_thread_lock_destroy.3.gz
 %%DOXYGEN%%share/man/man3/qb_thread_trylock.3.gz
 %%DOXYGEN%%share/man/man3/qb_thread_unlock.3.gz
 %%DOXYGEN%%share/man/man3/qb_timespec_add_ms.3.gz
 %%DOXYGEN%%share/man/man3/qb_trie_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_trie_dump.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_nano_current_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_nano_from_epoch_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_nano_monotonic_hz.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_set_log_function.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_create.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_free.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_sec_elapsed_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_split.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_split_ctl.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_split_last.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_start.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_stop.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_time_split_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_stopwatch_us_elapsed_get.3.gz
 %%DOXYGEN%%share/man/man3/qb_util_timespec_from_epoch_get.3.gz
 %%DOXYGEN%%share/man/man3/qbarray.h.3.gz
 %%DOXYGEN%%share/man/man3/qbatomic.h.3.gz
 %%DOXYGEN%%share/man/man3/qbdefs.h.3.gz
 %%DOXYGEN%%share/man/man3/qbhdb.h.3.gz
 %%DOXYGEN%%share/man/man3/qbipc_common.h.3.gz
 %%DOXYGEN%%share/man/man3/qbipcc.h.3.gz
 %%DOXYGEN%%share/man/man3/qbipcs.h.3.gz
 %%DOXYGEN%%share/man/man3/qblist.h.3.gz
 %%DOXYGEN%%share/man/man3/qblog.h.3.gz
 %%DOXYGEN%%share/man/man3/qbloop.h.3.gz
 %%DOXYGEN%%share/man/man3/qbmap.h.3.gz
 %%DOXYGEN%%share/man/man3/qbrb.h.3.gz
 %%DOXYGEN%%share/man/man3/qbutil.h.3.gz
 %%DOXYGEN%%share/man/man8/qb-blackbox.8.gz
 @dir(,haclient,1770) %%QB_SOCKET_DIR%%