Date: Thu, 10 Feb 2022 23:50:41 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 057c247e1690 - main - devel/libqb: Fix DOXYGEN option, use release archive, Makefile adjustments Message-ID: <202202102350.21ANof9P066611@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=057c247e16908785f89fb00ec5dd6ece7af0ff9a commit 057c247e16908785f89fb00ec5dd6ece7af0ff9a Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2022-02-10 23:49:11 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2022-02-10 23:49:15 +0000 devel/libqb: Fix DOXYGEN option, use release archive, Makefile adjustments Fix DOXYGEN option Use release archive as recommended by Porters Handbook Do some minor changes to Makefile to follow Porters Handbook more closely PR: 261400 Reviewed by: egypcio (maintainer) --- devel/libqb/Makefile | 26 +++-- devel/libqb/distinfo | 6 +- devel/libqb/files/patch-configure | 11 +++ devel/libqb/files/patch-configure.ac | 15 --- devel/libqb/pkg-plist | 186 +++++++++++++++++++++++++++++++++++ 5 files changed, 212 insertions(+), 32 deletions(-) diff --git a/devel/libqb/Makefile b/devel/libqb/Makefile index 454d2bd24d53..1bf90652b3b6 100644 --- a/devel/libqb/Makefile +++ b/devel/libqb/Makefile @@ -1,9 +1,9 @@ # Created by: David Shane Holden <dpejesh@yahoo.com> PORTNAME= libqb -DISTVERSIONPREFIX= v DISTVERSION= 2.0.4 CATEGORIES= devel +MASTER_SITES= https://github.com/ClusterLabs/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= egypcio@FreeBSD.org COMMENT= High performance logging, tracing, ipc, and polling library @@ -11,7 +11,6 @@ COMMENT= High performance logging, tracing, ipc, and polling library LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libxml2.so:textproc/libxml2 TEST_DEPENDS= checkmk:devel/check GROUPS= haclient @@ -19,20 +18,16 @@ GROUPS= haclient QB_SOCKET_DIR?= /var/run/qb PLIST_SUB+= QB_SOCKET_DIR=${QB_SOCKET_DIR} -USES= autoreconf cpe gmake libtool pathfix pkgconfig python +USES= cpe gmake gnome libtool pkgconfig python tar:xz CPE_VENDOR= clusterlabs -USE_BINUTILS= yes -USE_GITHUB= yes +GNU_CONFIGURE= yes +USE_GNOME= libxml2 USE_LDCONFIG= yes -GH_ACCOUNT= ClusterLabs - -GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-socket-dir=${QB_SOCKET_DIR} \ - PACKAGE_STRING="${PORTNAME} ${PORTVERSION}" \ - PACKAGE_VERSION=${PORTVERSION} -LDFLAGS+= -B${LOCALBASE}/bin -PATHFIX_MAKEFILEIN= Makefile.am + PACKAGE_STRING="${PORTNAME} ${DISTVERSION}" \ + PACKAGE_VERSION=${DISTVERSION} +LDFLAGS= -B${LOCALBASE}/bin INSTALL_TARGET= install-strip TEST_TARGET= check @@ -43,8 +38,11 @@ OPTIONS_SUB= yes DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -post-patch: - ${REINPLACE_CMD} -e 's/doxygen2man//g' ${WRKSRC}/Makefile.am +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} diff --git a/devel/libqb/distinfo b/devel/libqb/distinfo index bb1290825363..115745b4c186 100644 --- a/devel/libqb/distinfo +++ b/devel/libqb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642610045 -SHA256 (ClusterLabs-libqb-v2.0.4_GH0.tar.gz) = 34f2b3cb1feec226ce422e27556961c5ec6103a5e49f5cbbcefebf7c3d762910 -SIZE (ClusterLabs-libqb-v2.0.4_GH0.tar.gz) = 235571 +TIMESTAMP = 1642625701 +SHA256 (libqb-2.0.4.tar.xz) = 97d3c63d3e3f2a3c8f1eca71cf286cc2bcd42ba0be8d3f4be689de785945bab3 +SIZE (libqb-2.0.4.tar.xz) = 504444 diff --git a/devel/libqb/files/patch-configure b/devel/libqb/files/patch-configure new file mode 100644 index 000000000000..8816040ff33d --- /dev/null +++ b/devel/libqb/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2022-01-19 20:58:44 UTC ++++ configure +@@ -21201,7 +21201,7 @@ done + + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$LIBS $PTHREAD_LIBS" +-for ac_func in pthread_spin_lock pthread_setschedparam \ ++for ac_func in pthread_setschedparam \ + pthread_mutexattr_setpshared \ + pthread_condattr_setpshared \ + sem_timedwait semtimedop diff --git a/devel/libqb/files/patch-configure.ac b/devel/libqb/files/patch-configure.ac deleted file mode 100644 index 1472d477faf6..000000000000 --- a/devel/libqb/files/patch-configure.ac +++ /dev/null @@ -1,15 +0,0 @@ -Disable check for pthread_spin_lock() since it doesn't support -PTHREAD_PROCESS_SHARED. This causes libqb to fallback gracefully -to using pthread mutexes without having to patch anything. - ---- configure.ac.orig 2017-12-21 09:02:11 UTC -+++ configure.ac -@@ -218,7 +218,7 @@ AC_CHECK_FUNCS([alarm clock_gettime \ - AX_SAVE_FLAGS - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LIBS="$LIBS $PTHREAD_LIBS" --AC_CHECK_FUNCS([pthread_spin_lock pthread_setschedparam \ -+AC_CHECK_FUNCS([pthread_setschedparam \ - pthread_mutexattr_setpshared \ - pthread_condattr_setpshared \ - sem_timedwait semtimedop]) diff --git a/devel/libqb/pkg-plist b/devel/libqb/pkg-plist index 0847482356ad..ceb594b9ebbc 100644 --- a/devel/libqb/pkg-plist +++ b/devel/libqb/pkg-plist @@ -17,6 +17,192 @@ lib/libqb.so lib/libqb.so.100 lib/libqb.so.100.2.1 libdata/pkgconfig/libqb.pc +%%DOXYGEN%%man/man3/qb_array_create.3.gz +%%DOXYGEN%%man/man3/qb_array_create_2.3.gz +%%DOXYGEN%%man/man3/qb_array_elems_per_bin_get.3.gz +%%DOXYGEN%%man/man3/qb_array_free.3.gz +%%DOXYGEN%%man/man3/qb_array_grow.3.gz +%%DOXYGEN%%man/man3/qb_array_index.3.gz +%%DOXYGEN%%man/man3/qb_array_new_bin_cb_set.3.gz +%%DOXYGEN%%man/man3/qb_array_num_bins_get.3.gz +%%DOXYGEN%%man/man3/qb_atomic_init.3.gz +%%DOXYGEN%%man/man3/qb_atomic_int_add.3.gz +%%DOXYGEN%%man/man3/qb_atomic_int_compare_and_exchange.3.gz +%%DOXYGEN%%man/man3/qb_atomic_int_exchange_and_add.3.gz +%%DOXYGEN%%man/man3/qb_atomic_int_get.3.gz +%%DOXYGEN%%man/man3/qb_atomic_int_set.3.gz +%%DOXYGEN%%man/man3/qb_atomic_pointer_compare_and_exchange.3.gz +%%DOXYGEN%%man/man3/qb_atomic_pointer_get.3.gz +%%DOXYGEN%%man/man3/qb_atomic_pointer_set.3.gz +%%DOXYGEN%%man/man3/qb_hashtable_create.3.gz +%%DOXYGEN%%man/man3/qb_hdb_base_convert.3.gz +%%DOXYGEN%%man/man3/qb_hdb_create.3.gz +%%DOXYGEN%%man/man3/qb_hdb_destroy.3.gz +%%DOXYGEN%%man/man3/qb_hdb_handle_create.3.gz +%%DOXYGEN%%man/man3/qb_hdb_handle_destroy.3.gz +%%DOXYGEN%%man/man3/qb_hdb_handle_get.3.gz +%%DOXYGEN%%man/man3/qb_hdb_handle_get_always.3.gz +%%DOXYGEN%%man/man3/qb_hdb_handle_put.3.gz +%%DOXYGEN%%man/man3/qb_hdb_handle_refcount_get.3.gz +%%DOXYGEN%%man/man3/qb_hdb_iterator_next.3.gz +%%DOXYGEN%%man/man3/qb_hdb_iterator_reset.3.gz +%%DOXYGEN%%man/man3/qb_hdb_nocheck_convert.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_connect.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_context_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_context_set.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_disconnect.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_event_recv.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_fc_enable_max_set.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_fd_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_get_buffer_size.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_is_connected.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_recv.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_send.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_sendv.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_sendv_recv.3.gz +%%DOXYGEN%%man/man3/qb_ipcc_verify_dgram_max_msg_size.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_auth_set.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_first_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_get_buffer_size.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_next_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_ref.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_service_context_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_stats_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_stats_get_2.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_connection_unref.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_context_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_context_set.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_create.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_destroy.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_disconnect.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_enforce_buffer_size.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_event_send.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_event_sendv.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_poll_handlers_set.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_ref.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_request_rate_limit.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_response_send.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_response_sendv.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_run.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_service_context_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_service_context_set.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_service_id_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_stats_get.3.gz +%%DOXYGEN%%man/man3/qb_ipcs_unref.3.gz +%%DOXYGEN%%man/man3/qb_list_add.3.gz +%%DOXYGEN%%man/man3/qb_list_add_tail.3.gz +%%DOXYGEN%%man/man3/qb_list_del.3.gz +%%DOXYGEN%%man/man3/qb_list_empty.3.gz +%%DOXYGEN%%man/man3/qb_list_init.3.gz +%%DOXYGEN%%man/man3/qb_list_is_last.3.gz +%%DOXYGEN%%man/man3/qb_list_length.3.gz +%%DOXYGEN%%man/man3/qb_list_replace.3.gz +%%DOXYGEN%%man/man3/qb_list_splice.3.gz +%%DOXYGEN%%man/man3/qb_list_splice_tail.3.gz +%%DOXYGEN%%man/man3/qb_log_blackbox_print_from_file.3.gz +%%DOXYGEN%%man/man3/qb_log_blackbox_write_to_file.3.gz +%%DOXYGEN%%man/man3/qb_log_callsite_get.3.gz +%%DOXYGEN%%man/man3/qb_log_callsites_dump.3.gz +%%DOXYGEN%%man/man3/qb_log_callsites_register.3.gz +%%DOXYGEN%%man/man3/qb_log_ctl.3.gz +%%DOXYGEN%%man/man3/qb_log_ctl2.3.gz +%%DOXYGEN%%man/man3/qb_log_custom_close.3.gz +%%DOXYGEN%%man/man3/qb_log_custom_open.3.gz +%%DOXYGEN%%man/man3/qb_log_facility2int.3.gz +%%DOXYGEN%%man/man3/qb_log_facility2str.3.gz +%%DOXYGEN%%man/man3/qb_log_file_close.3.gz +%%DOXYGEN%%man/man3/qb_log_file_open.3.gz +%%DOXYGEN%%man/man3/qb_log_file_reopen.3.gz +%%DOXYGEN%%man/man3/qb_log_filter_ctl.3.gz +%%DOXYGEN%%man/man3/qb_log_filter_ctl2.3.gz +%%DOXYGEN%%man/man3/qb_log_filter_fn_set.3.gz +%%DOXYGEN%%man/man3/qb_log_fini.3.gz +%%DOXYGEN%%man/man3/qb_log_format_set.3.gz +%%DOXYGEN%%man/man3/qb_log_from_external_source.3.gz +%%DOXYGEN%%man/man3/qb_log_from_external_source_va.3.gz +%%DOXYGEN%%man/man3/qb_log_init.3.gz +%%DOXYGEN%%man/man3/qb_log_real_.3.gz +%%DOXYGEN%%man/man3/qb_log_real_va_.3.gz +%%DOXYGEN%%man/man3/qb_log_tags_stringify_fn_set.3.gz +%%DOXYGEN%%man/man3/qb_log_target_format.3.gz +%%DOXYGEN%%man/man3/qb_log_target_user_data_get.3.gz +%%DOXYGEN%%man/man3/qb_log_target_user_data_set.3.gz +%%DOXYGEN%%man/man3/qb_log_thread_priority_set.3.gz +%%DOXYGEN%%man/man3/qb_log_thread_start.3.gz +%%DOXYGEN%%man/man3/qb_loop_create.3.gz +%%DOXYGEN%%man/man3/qb_loop_destroy.3.gz +%%DOXYGEN%%man/man3/qb_loop_job_add.3.gz +%%DOXYGEN%%man/man3/qb_loop_job_del.3.gz +%%DOXYGEN%%man/man3/qb_loop_poll_add.3.gz +%%DOXYGEN%%man/man3/qb_loop_poll_del.3.gz +%%DOXYGEN%%man/man3/qb_loop_poll_low_fds_event_set.3.gz +%%DOXYGEN%%man/man3/qb_loop_poll_mod.3.gz +%%DOXYGEN%%man/man3/qb_loop_run.3.gz +%%DOXYGEN%%man/man3/qb_loop_signal_add.3.gz +%%DOXYGEN%%man/man3/qb_loop_signal_del.3.gz +%%DOXYGEN%%man/man3/qb_loop_signal_mod.3.gz +%%DOXYGEN%%man/man3/qb_loop_stop.3.gz +%%DOXYGEN%%man/man3/qb_loop_timer_add.3.gz +%%DOXYGEN%%man/man3/qb_loop_timer_del.3.gz +%%DOXYGEN%%man/man3/qb_loop_timer_expire_time_get.3.gz +%%DOXYGEN%%man/man3/qb_loop_timer_expire_time_remaining.3.gz +%%DOXYGEN%%man/man3/qb_loop_timer_is_running.3.gz +%%DOXYGEN%%man/man3/qb_map_count_get.3.gz +%%DOXYGEN%%man/man3/qb_map_destroy.3.gz +%%DOXYGEN%%man/man3/qb_map_foreach.3.gz +%%DOXYGEN%%man/man3/qb_map_get.3.gz +%%DOXYGEN%%man/man3/qb_map_iter_create.3.gz +%%DOXYGEN%%man/man3/qb_map_iter_free.3.gz +%%DOXYGEN%%man/man3/qb_map_iter_next.3.gz +%%DOXYGEN%%man/man3/qb_map_notify_add.3.gz +%%DOXYGEN%%man/man3/qb_map_notify_del.3.gz +%%DOXYGEN%%man/man3/qb_map_notify_del_2.3.gz +%%DOXYGEN%%man/man3/qb_map_pref_iter_create.3.gz +%%DOXYGEN%%man/man3/qb_map_put.3.gz +%%DOXYGEN%%man/man3/qb_map_rm.3.gz +%%DOXYGEN%%man/man3/qb_rb_chmod.3.gz +%%DOXYGEN%%man/man3/qb_rb_chown.3.gz +%%DOXYGEN%%man/man3/qb_rb_chunk_alloc.3.gz +%%DOXYGEN%%man/man3/qb_rb_chunk_commit.3.gz +%%DOXYGEN%%man/man3/qb_rb_chunk_peek.3.gz +%%DOXYGEN%%man/man3/qb_rb_chunk_read.3.gz +%%DOXYGEN%%man/man3/qb_rb_chunk_reclaim.3.gz +%%DOXYGEN%%man/man3/qb_rb_chunk_write.3.gz +%%DOXYGEN%%man/man3/qb_rb_chunks_used.3.gz +%%DOXYGEN%%man/man3/qb_rb_close.3.gz +%%DOXYGEN%%man/man3/qb_rb_create_from_file.3.gz +%%DOXYGEN%%man/man3/qb_rb_name_get.3.gz +%%DOXYGEN%%man/man3/qb_rb_open.3.gz +%%DOXYGEN%%man/man3/qb_rb_refcount_get.3.gz +%%DOXYGEN%%man/man3/qb_rb_shared_user_data_get.3.gz +%%DOXYGEN%%man/man3/qb_rb_space_free.3.gz +%%DOXYGEN%%man/man3/qb_rb_space_used.3.gz +%%DOXYGEN%%man/man3/qb_rb_write_to_file.3.gz +%%DOXYGEN%%man/man3/qb_skiplist_create.3.gz +%%DOXYGEN%%man/man3/qb_strerror_r.3.gz +%%DOXYGEN%%man/man3/qb_thread_lock.3.gz +%%DOXYGEN%%man/man3/qb_thread_lock_create.3.gz +%%DOXYGEN%%man/man3/qb_thread_lock_destroy.3.gz +%%DOXYGEN%%man/man3/qb_thread_trylock.3.gz +%%DOXYGEN%%man/man3/qb_thread_unlock.3.gz +%%DOXYGEN%%man/man3/qb_timespec_add_ms.3.gz +%%DOXYGEN%%man/man3/qb_trie_create.3.gz +%%DOXYGEN%%man/man3/qb_trie_dump.3.gz +%%DOXYGEN%%man/man3/qb_util_nano_current_get.3.gz +%%DOXYGEN%%man/man3/qb_util_nano_from_epoch_get.3.gz +%%DOXYGEN%%man/man3/qb_util_nano_monotonic_hz.3.gz +%%DOXYGEN%%man/man3/qb_util_set_log_function.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_create.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_free.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_sec_elapsed_get.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_split.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_split_ctl.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_split_last.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_start.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_stop.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_time_split_get.3.gz +%%DOXYGEN%%man/man3/qb_util_stopwatch_us_elapsed_get.3.gz +%%DOXYGEN%%man/man3/qb_util_timespec_from_epoch_get.3.gz %%DOXYGEN%%man/man3/qbarray.h.3.gz %%DOXYGEN%%man/man3/qbatomic.h.3.gz %%DOXYGEN%%man/man3/qbdefs.h.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202102350.21ANof9P066611>