From 47da6cf9cea71098ef961fb9b57c242f55c16ada Mon Sep 17 00:00:00 2001 From: Michael Moll Date: Tue, 21 Aug 2018 00:10:52 +0200 Subject: [PATCH] devel/gearmand: update to 1.1.18 --- devel/gearmand/Makefile | 11 +- devel/gearmand/PLIST | 7 +- devel/gearmand/buildlink3.mk | 1 + devel/gearmand/distinfo | 10 +- devel/gearmand/patches/patch-Makefile.in | 104 ------------------ .../patches/patch-libgearman-1.0_gearman.h | 18 --- 6 files changed, 18 insertions(+), 133 deletions(-) delete mode 100644 devel/gearmand/patches/patch-Makefile.in delete mode 100644 devel/gearmand/patches/patch-libgearman-1.0_gearman.h diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index f251db396fcc..fc1022d6d529 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -1,9 +1,11 @@ # $NetBSD: Makefile,v 1.32 2018/08/16 18:54:28 adam Exp $ -DISTNAME= gearmand-1.0.6 -PKGREVISION= 29 +VERSION= 1.1.18 +DISTNAME= gearmand-${VERSION} CATEGORIES= devel -MASTER_SITES= https://launchpad.net/gearmand/1.0/1.0.6/+download/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=gearman/} +GITHUB_PROJECT= gearmand +GITHUB_RELEASE= ${VERSION} MAINTAINER= filip@joyent.com HOMEPAGE= http://gearman.org/ @@ -17,6 +19,7 @@ USE_LANGUAGES= c gnu++03 CONFIGURE_ARGS+= --enable-jobserver=no CONFIGURE_ARGS+= --disable-libdrizzle +CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs} .include "options.mk" @@ -24,8 +27,10 @@ PKGCONFIG_OVERRIDE+= support/gearmand.pc.in .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" +.include "../../devel/gperf/buildlink3.mk" .include "../../devel/libevent/buildlink3.mk" .include "../../devel/libexecinfo/buildlink3.mk" +.include "../../devel/libuuid/buildlink3.mk" .include "../../security/libssh2/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gearmand/PLIST b/devel/gearmand/PLIST index 2177a6769376..d406604c68fb 100644 --- a/devel/gearmand/PLIST +++ b/devel/gearmand/PLIST @@ -5,6 +5,7 @@ include/libgearman-1.0/actions.h include/libgearman-1.0/aggregator.h include/libgearman-1.0/allocator.h include/libgearman-1.0/argument.h +include/libgearman-1.0/cancel.h include/libgearman-1.0/client.h include/libgearman-1.0/client_callbacks.h include/libgearman-1.0/configure.h @@ -14,14 +15,16 @@ include/libgearman-1.0/core.h include/libgearman-1.0/execute.h include/libgearman-1.0/function.h include/libgearman-1.0/gearman.h +include/libgearman-1.0/interface/client.h +include/libgearman-1.0/interface/job.h include/libgearman-1.0/interface/status.h include/libgearman-1.0/interface/task.h +include/libgearman-1.0/interface/worker.h include/libgearman-1.0/job.h include/libgearman-1.0/job_handle.h include/libgearman-1.0/kill.h include/libgearman-1.0/limits.h include/libgearman-1.0/ostream.hpp -include/libgearman-1.0/packet.h include/libgearman-1.0/parse.h include/libgearman-1.0/priority.h include/libgearman-1.0/protocol.h @@ -33,7 +36,6 @@ include/libgearman-1.0/strerror.h include/libgearman-1.0/string.h include/libgearman-1.0/task.h include/libgearman-1.0/task_attr.h -include/libgearman-1.0/universal.h include/libgearman-1.0/util.h include/libgearman-1.0/version.h include/libgearman-1.0/visibility.h @@ -119,6 +121,7 @@ man/man3/gearman_job_send_warning.3 man/man3/gearman_job_st.3 man/man3/gearman_job_take_workload.3 man/man3/gearman_job_unique.3 +man/man3/gearman_job_use_client.3 man/man3/gearman_job_workload.3 man/man3/gearman_job_workload_size.3 man/man3/gearman_log_fn.3 diff --git a/devel/gearmand/buildlink3.mk b/devel/gearmand/buildlink3.mk index 9ee2b8a3b249..96d2ea9da0ed 100644 --- a/devel/gearmand/buildlink3.mk +++ b/devel/gearmand/buildlink3.mk @@ -13,6 +13,7 @@ BUILDLINK_PKGSRCDIR.gearmand?= ../../devel/gearmand .include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/libevent/buildlink3.mk" .include "../../devel/libexecinfo/buildlink3.mk" +.include "../../devel/libuuid/buildlink3.mk" .include "../../security/libssh2/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .endif # GEARMAND_BUILDLINK3_MK diff --git a/devel/gearmand/distinfo b/devel/gearmand/distinfo index d0dd9d109e9b..85a7b7d777af 100644 --- a/devel/gearmand/distinfo +++ b/devel/gearmand/distinfo @@ -1,17 +1,15 @@ $NetBSD: distinfo,v 1.3 2015/11/03 03:27:27 agc Exp $ -SHA1 (gearmand-1.0.6.tar.gz) = 872d5e13c20a29a20e45df3afa8f3981dc52d363 -RMD160 (gearmand-1.0.6.tar.gz) = 44f1caead6fbd7e6a440be3275098bd798a807d0 -SHA512 (gearmand-1.0.6.tar.gz) = 90e79935760ac1279b8fc82dff619e9c54b0f2d30e80f5ea0fe668a23e0e0e7651dfe032e255af209f7ee6bacf6ed492d20154a8763fda469d99f6dc953066d6 -Size (gearmand-1.0.6.tar.gz) = 935050 bytes -SHA1 (patch-Makefile.in) = ec857867640d5282dc9a06ab8258c82b8cb1ba55 +SHA1 (gearmand-1.1.18.tar.gz) = eb7f1d806635cba309c40460c3ca5f2ff76d6519 +RMD160 (gearmand-1.1.18.tar.gz) = 2bbe1042932dd763fcc68f4c8e6227d6a53be7e0 +SHA512 (gearmand-1.1.18.tar.gz) = fd2c978775bde19a8f1ffaf720b4c8adfda9859e5f554b247e7edca15fcc684168fb279af6c63e29c0524c8c863a9f3d07ea802e67eec42be793c0487b9beb9a +Size (gearmand-1.1.18.tar.gz) = 1044664 bytes SHA1 (patch-benchmark_blobslap__worker.cc) = 12f805d65b36a2f25e5751b8c36a95ac28ec757a SHA1 (patch-configure) = d5eb9dc8bf6aec65580de30734e3e4b6505cd0ae SHA1 (patch-examples_reverse__client.cc) = 3e8a27626c8a922919adfddcd9b3b4bfec06390d SHA1 (patch-examples_reverse__client__bg.cc) = 63db59b98a8128565cecaa682334be85edf37584 SHA1 (patch-examples_reverse__client__cb.cc) = 33f9710ca20101ce11cda04407eff1e05b14d29a SHA1 (patch-examples_reverse__client__epoch.cc) = e4ea3dc00f9fc403a5500d95591255c0990da6d3 -SHA1 (patch-libgearman-1.0_gearman.h) = d97a3078ababae57922bee92e6bdcd28a4fb1aae SHA1 (patch-libgearman-server__log.cc) = ecad056d7704451bce88e889fc0f9ce528281223 SHA1 (patch-libgearman_backtrace.cc) = f8b643a91fb7d3656c10616fcd37a9dc0749904e SHA1 (patch-libtest__exception.hpp) = 193ee0e3711272f99ee3594f8629e27d572ca116 diff --git a/devel/gearmand/patches/patch-Makefile.in b/devel/gearmand/patches/patch-Makefile.in deleted file mode 100644 index f01e975663f0..000000000000 --- a/devel/gearmand/patches/patch-Makefile.in +++ /dev/null @@ -1,104 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2013/10/04 07:03:37 fhajny Exp $ - -Install manual pages. - ---- Makefile.in.orig 2013-05-09 10:16:17.000000000 +0000 -+++ Makefile.in -@@ -2216,9 +2216,94 @@ noinst_HEADERS = libtest/client.hpp libt - tests/workers/v2/increment_reset.h \ - tests/workers/v2/sleep_return_random.h \ - tests/workers/v2/split.h tests/workers/v2/unique.h --man1_MANS = --man3_MANS = --man8_MANS = -+man1_MANS = man/gearadmin.1 man/gearman.1 -+man3_MANS = man/gearman_actions_t.3 man/gearman_allocator_t.3 \ -+ man/gearman_argument_make.3 man/gearman_argument_t.3 \ -+ man/gearman_bugreport.3 man/gearman_client_add_options.3 \ -+ man/gearman_client_add_server.3 man/gearman_client_add_servers.3 \ -+ man/gearman_client_add_task.3 man/gearman_client_add_task_background.3 \ -+ man/gearman_client_add_task_high.3 \ -+ man/gearman_client_add_task_high_background.3 \ -+ man/gearman_client_add_task_low.3 \ -+ man/gearman_client_add_task_low_background.3 \ -+ man/gearman_client_add_task_status.3 man/gearman_client_clear_fn.3 \ -+ man/gearman_client_clone.3 man/gearman_client_context.3 \ -+ man/gearman_client_create.3 man/gearman_client_do.3 \ -+ man/gearman_client_do_background.3 man/gearman_client_do_high.3 \ -+ man/gearman_client_do_high_background.3 \ -+ man/gearman_client_do_job_handle.3 man/gearman_client_do_low.3 \ -+ man/gearman_client_do_low_background.3 man/gearman_client_do_status.3 \ -+ man/gearman_client_echo.3 man/gearman_client_errno.3 \ -+ man/gearman_client_error.3 man/gearman_client_free.3 \ -+ man/gearman_client_has_option.3 man/gearman_client_job_status.3 \ -+ man/gearman_client_options.3 man/gearman_client_options_t.3 \ -+ man/gearman_client_remove_options.3 \ -+ man/gearman_client_remove_servers.3 man/gearman_client_run_tasks.3 \ -+ man/gearman_client_set_complete_fn.3 man/gearman_client_set_context.3 \ -+ man/gearman_client_set_created_fn.3 man/gearman_client_set_data_fn.3 \ -+ man/gearman_client_set_exception_fn.3 man/gearman_client_set_fail_fn.3 \ -+ man/gearman_client_set_log_fn.3 \ -+ man/gearman_client_set_memory_allocators.3 \ -+ man/gearman_client_set_namespace.3 man/gearman_client_set_options.3 \ -+ man/gearman_client_set_status_fn.3 \ -+ man/gearman_client_set_task_context_free_fn.3 \ -+ man/gearman_client_set_timeout.3 man/gearman_client_set_warning_fn.3 \ -+ man/gearman_client_set_workload_fn.3 \ -+ man/gearman_client_set_workload_free_fn.3 \ -+ man/gearman_client_set_workload_malloc_fn.3 \ -+ man/gearman_client_st.3 man/gearman_client_task_free_all.3 \ -+ man/gearman_client_timeout.3 man/gearman_client_wait.3 \ -+ man/gearman_continue.3 man/gearman_execute.3 \ -+ man/gearman_failed.3 man/gearman_job_free.3 \ -+ man/gearman_job_free_all.3 man/gearman_job_function_name.3 \ -+ man/gearman_job_handle.3 man/gearman_job_handle_t.3 \ -+ man/gearman_job_send_complete.3 man/gearman_job_send_data.3 \ -+ man/gearman_job_send_exception.3 man/gearman_job_send_fail.3 \ -+ man/gearman_job_send_status.3 man/gearman_job_send_warning.3 \ -+ man/gearman_job_st.3 man/gearman_job_take_workload.3 \ -+ man/gearman_job_unique.3 man/gearman_job_workload.3 \ -+ man/gearman_job_workload_size.3 man/gearman_log_fn.3 \ -+ man/gearman_parse_servers.3 man/gearman_result_boolean.3 \ -+ man/gearman_result_integer.3 man/gearman_result_is_null.3 \ -+ man/gearman_result_size.3 man/gearman_result_store_integer.3 \ -+ man/gearman_result_store_string.3 man/gearman_result_store_value.3 \ -+ man/gearman_result_string.3 man/gearman_return_t.3 \ -+ man/gearman_strerror.3 man/gearman_string_t.3 \ -+ man/gearman_success.3 man/gearman_task_attr_init.3 \ -+ man/gearman_task_attr_init_background.3 \ -+ man/gearman_task_attr_init_epoch.3 \ -+ man/gearman_task_attr_t.3 man/gearman_task_context.3 \ -+ man/gearman_task_data.3 man/gearman_task_data_size.3 \ -+ man/gearman_task_denominator.3 man/gearman_task_error.3 \ -+ man/gearman_task_free.3 man/gearman_task_function_name.3 \ -+ man/gearman_task_give_workload.3 man/gearman_task_is_known.3 \ -+ man/gearman_task_is_running.3 man/gearman_task_job_handle.3 \ -+ man/gearman_task_numerator.3 man/gearman_task_recv_data.3 \ -+ man/gearman_task_return.3 man/gearman_task_send_workload.3 \ -+ man/gearman_task_set_context.3 man/gearman_task_st.3 \ -+ man/gearman_task_take_data.3 man/gearman_task_unique.3 \ -+ man/gearman_verbose_name.3 man/gearman_verbose_t.3 \ -+ man/gearman_version.3 man/gearman_worker_add_function.3 \ -+ man/gearman_worker_add_options.3 man/gearman_worker_add_server.3 \ -+ man/gearman_worker_add_servers.3 man/gearman_worker_clone.3 \ -+ man/gearman_worker_context.3 man/gearman_worker_create.3 \ -+ man/gearman_worker_define_function.3 man/gearman_worker_echo.3 \ -+ man/gearman_worker_errno.3 man/gearman_worker_error.3 \ -+ man/gearman_worker_free.3 man/gearman_worker_function_exist.3 \ -+ man/gearman_worker_grab_job.3 man/gearman_worker_options.3 \ -+ man/gearman_worker_register.3 man/gearman_worker_remove_options.3 \ -+ man/gearman_worker_remove_servers.3 man/gearman_worker_set_context.3 \ -+ man/gearman_worker_set_identifier.3 man/gearman_worker_set_log_fn.3 \ -+ man/gearman_worker_set_memory_allocators.3 \ -+ man/gearman_worker_set_namespace.3 man/gearman_worker_set_options.3 \ -+ man/gearman_worker_set_timeout.3 \ -+ man/gearman_worker_set_workload_free_fn.3 \ -+ man/gearman_worker_set_workload_malloc_fn.3 \ -+ man/gearman_worker_st.3 man/gearman_worker_timeout.3 \ -+ man/gearman_worker_unregister.3 man/gearman_worker_unregister_all.3 \ -+ man/gearman_worker_wait.3 man/gearman_worker_work.3 \ -+ man/libgearman.3 -+man8_MANS = man/gearmand.8 - DISTCLEANFILES = aminclude.am config/top.h - EXTRA_DIST = libtest/run.gdb libtest/version.h \ - libhashkit-1.0/configure.h.in tests/perl/worker/echo.pl \ diff --git a/devel/gearmand/patches/patch-libgearman-1.0_gearman.h b/devel/gearmand/patches/patch-libgearman-1.0_gearman.h deleted file mode 100644 index 540b0fb80349..000000000000 --- a/devel/gearmand/patches/patch-libgearman-1.0_gearman.h +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-libgearman-1.0_gearman.h,v 1.1 2013/10/10 00:04:52 joerg Exp $ - ---- libgearman-1.0/gearman.h.orig 2013-10-09 23:41:20.000000000 +0000 -+++ libgearman-1.0/gearman.h -@@ -50,8 +50,12 @@ - #endif - - #ifdef __cplusplus --# include - # include -+# if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) -+# include -+# else -+# include -+# endif - # include - # include - #else