- Update to 0.11

PR:		141303
Submitted by:	Vick Khera <vivek@khera.org>
Approved by:	maintainer timeout

4 files changed, 152 insertions, 94 deletions

diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile
index 95baf25e7b63..951fe932960f 100644
--- a/devel/gearmand/Makefile
+++ b/devel/gearmand/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gearmand
-PORTVERSION=	0.9
+PORTVERSION=	0.11
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/gearmand/trunk/${PORTVERSION}/+download/
 
@@ -14,7 +14,6 @@ MAINTAINER=	gslin@gslin.org
 COMMENT=	Gearman C Server and Library
 
 LIB_DEPENDS=	event:${PORTSDIR}/devel/libevent \
-		memcached:${PORTSDIR}/databases/libmemcached \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
@@ -25,10 +24,17 @@ USE_LDCONFIG=	yes
 USE_RC_SUBR=	gearmand.sh
 
 OPTIONS=	PQ "Enable PostgreSQL support" off \
-		SQLITE3 "Enable SQLite3 support" off
+		SQLITE3 "Enable SQLite3 support" off \
+		MEMCACHED "Enable memcached support" on
 
 MAN1=		gearman.1
-MAN3=		gearman_bugreport.3 \
+MAN3=		gearman_add_con.3 \
+		gearman_add_con_args.3 \
+		gearman_add_options.3 \
+		gearman_add_packet.3 \
+		gearman_add_packet_args.3 \
+		gearman_bugreport.3 \
+		gearman_client_add_options.3 \
 		gearman_client_add_server.3 \
 		gearman_client_add_servers.3 \
 		gearman_client_add_task.3 \
@@ -40,8 +46,8 @@ MAN3=		gearman_bugreport.3 \
 		gearman_client_add_task_status.3 \
 		gearman_client_clear_fn.3 \
 		gearman_client_clone.3 \
+		gearman_client_context.3 \
 		gearman_client_create.3 \
-		gearman_client_data.3 \
 		gearman_client_do.3 \
 		gearman_client_do_background.3 \
 		gearman_client_do_high.3 \
@@ -55,54 +61,57 @@ MAN3=		gearman_bugreport.3 \
 		gearman_client_error.3 \
 		gearman_client_free.3 \
 		gearman_client_job_status.3 \
+		gearman_client_options.3 \
+		gearman_client_remove_options.3 \
+		gearman_client_remove_servers.3 \
 		gearman_client_run_tasks.3 \
 		gearman_client_set_complete_fn.3 \
+		gearman_client_set_context.3 \
 		gearman_client_set_created_fn.3 \
-		gearman_client_set_data.3 \
 		gearman_client_set_data_fn.3 \
+		gearman_client_set_event_watch_fn.3 \
 		gearman_client_set_exception_fn.3 \
 		gearman_client_set_fail_fn.3 \
+		gearman_client_set_log_fn.3 \
 		gearman_client_set_options.3 \
 		gearman_client_set_status_fn.3 \
-		gearman_client_set_task_fn_arg_free.3 \
+		gearman_client_set_task_context_free_fn.3 \
+		gearman_client_set_timeout.3 \
 		gearman_client_set_warning_fn.3 \
 		gearman_client_set_workload_fn.3 \
-		gearman_client_set_workload_free.3 \
-		gearman_client_set_workload_malloc.3 \
+		gearman_client_set_workload_free_fn.3 \
+		gearman_client_set_workload_malloc_fn.3 \
+		gearman_client_task_free_all.3 \
+		gearman_client_timeout.3 \
+		gearman_client_wait.3 \
 		gearman_clone.3 \
-		gearman_con_add.3 \
-		gearman_con_clone.3 \
+		gearman_clone_con.3 \
+		gearman_con_add_options.3 \
 		gearman_con_close.3 \
 		gearman_con_connect.3 \
-		gearman_con_create.3 \
-		gearman_con_data.3 \
-		gearman_con_echo.3 \
+		gearman_con_context.3 \
 		gearman_con_flush.3 \
-		gearman_con_flush_all.3 \
 		gearman_con_free.3 \
-		gearman_con_protocol_data.3 \
+		gearman_con_options.3 \
+		gearman_con_protocol_context.3 \
 		gearman_con_read.3 \
-		gearman_con_ready.3 \
 		gearman_con_recv.3 \
 		gearman_con_recv_data.3 \
+		gearman_con_remove_options.3 \
 		gearman_con_reset_addrinfo.3 \
 		gearman_con_send.3 \
-		gearman_con_send_all.3 \
 		gearman_con_send_data.3 \
-		gearman_con_set_data.3 \
+		gearman_con_set_context.3 \
 		gearman_con_set_events.3 \
 		gearman_con_set_fd.3 \
+		gearman_con_set_host.3 \
 		gearman_con_set_options.3 \
 		gearman_con_set_packet_pack_fn.3 \
 		gearman_con_set_packet_unpack_fn.3 \
-		gearman_con_set_protocol_data.3 \
-		gearman_con_set_protocol_data_free_fn.3 \
-		gearman_con_set_recv_data_fn.3 \
-		gearman_con_set_recv_fn.3 \
+		gearman_con_set_port.3 \
+		gearman_con_set_protocol_context.3 \
+		gearman_con_set_protocol_context_free_fn.3 \
 		gearman_con_set_revents.3 \
-		gearman_con_set_send_data_fn.3 \
-		gearman_con_set_send_fn.3 \
-		gearman_con_wait.3 \
 		gearman_conf_create.3 \
 		gearman_conf_errno.3 \
 		gearman_conf_error.3 \
@@ -117,47 +126,46 @@ MAN3=		gearman_bugreport.3 \
 		gearman_conf_set_options.3 \
 		gearman_conf_usage.3 \
 		gearman_create.3 \
+		gearman_echo.3 \
 		gearman_errno.3 \
 		gearman_error.3 \
+		gearman_flush_all.3 \
 		gearman_free.3 \
-		gearman_job_complete.3 \
-		gearman_job_create.3 \
-		gearman_job_data.3 \
-		gearman_job_exception.3 \
-		gearman_job_fail.3 \
+		gearman_free_all_cons.3 \
+		gearman_free_all_packets.3 \
 		gearman_job_free.3 \
+		gearman_job_free_all.3 \
 		gearman_job_function_name.3 \
 		gearman_job_handle.3 \
-		gearman_job_status.3 \
+		gearman_job_send_complete.3 \
+		gearman_job_send_data.3 \
+		gearman_job_send_exception.3 \
+		gearman_job_send_fail.3 \
+		gearman_job_send_status.3 \
+		gearman_job_send_warning.3 \
+		gearman_job_take_workload.3 \
 		gearman_job_unique.3 \
-		gearman_job_warning.3 \
 		gearman_job_workload.3 \
 		gearman_job_workload_size.3 \
-		gearman_packet_add.3 \
+		gearman_log.3 \
+		gearman_log_crazy.3 \
+		gearman_log_debug.3 \
+		gearman_log_error.3 \
+		gearman_log_fatal.3 \
+		gearman_log_info.3 \
+		gearman_options.3 \
 		gearman_packet_add_arg.3 \
-		gearman_packet_create.3 \
 		gearman_packet_free.3 \
+		gearman_packet_give_data.3 \
 		gearman_packet_pack.3 \
 		gearman_packet_pack_header.3 \
-		gearman_packet_set_options.3 \
 		gearman_packet_take_data.3 \
 		gearman_packet_unpack.3 \
 		gearman_packet_unpack_header.3 \
 		gearman_parse_servers.3 \
-		gearman_protocol_http_conf.3 \
-		gearman_queue_fn_arg.3 \
-		gearman_queue_libdrizzle_conf.3 \
-		gearman_queue_libdrizzle_deinit.3 \
-		gearman_queue_libdrizzle_init.3 \
-		gearman_queue_libmemcached_conf.3 \
-		gearman_queue_libmemcached_deinit.3 \
-		gearman_queue_libmemcached_init.3 \
-		gearman_queue_libpq_conf.3 \
-		gearman_queue_libpq_deinit.3 \
-		gearman_queue_libpq_init.3 \
-		gearman_queue_libsqlite3_conf.3 \
-		gearman_queue_libsqlite3_deinit.3 \
-		gearman_queue_libsqlite3_init.3 \
+		gearman_ready.3 \
+		gearman_remove_options.3 \
+		gearman_send_all.3 \
 		gearman_server_client_add.3 \
 		gearman_server_client_create.3 \
 		gearman_server_client_free.3 \
@@ -199,9 +207,29 @@ MAN3=		gearman_bugreport.3 \
 		gearman_server_packet_free.3 \
 		gearman_server_proc_packet_add.3 \
 		gearman_server_proc_packet_remove.3 \
+		gearman_server_queue_context.3 \
+		gearman_server_queue_libdrizzle_conf.3 \
+		gearman_server_queue_libdrizzle_deinit.3 \
+		gearman_server_queue_libdrizzle_init.3 \
+		gearman_server_queue_libmemcached_conf.3 \
+		gearman_server_queue_libmemcached_deinit.3 \
+		gearman_server_queue_libmemcached_init.3 \
+		gearman_server_queue_libpq_conf.3 \
+		gearman_server_queue_libpq_deinit.3 \
+		gearman_server_queue_libpq_init.3 \
+		gearman_server_queue_libsqlite3_conf.3 \
+		gearman_server_queue_libsqlite3_deinit.3 \
+		gearman_server_queue_libsqlite3_init.3 \
 		gearman_server_queue_replay.3 \
 		gearman_server_run_command.3 \
-		gearman_server_set_log.3 \
+		gearman_server_set_job_retries.3 \
+		gearman_server_set_log_fn.3 \
+		gearman_server_set_queue_add_fn.3 \
+		gearman_server_set_queue_context.3 \
+		gearman_server_set_queue_done_fn.3 \
+		gearman_server_set_queue_flush_fn.3 \
+		gearman_server_set_queue_replay_fn.3 \
+		gearman_server_set_worker_wakeup.3 \
 		gearman_server_shutdown_graceful.3 \
 		gearman_server_thread_create.3 \
 		gearman_server_thread_errno.3 \
@@ -209,55 +237,65 @@ MAN3=		gearman_bugreport.3 \
 		gearman_server_thread_free.3 \
 		gearman_server_thread_run.3 \
 		gearman_server_thread_set_event_watch.3 \
-		gearman_server_thread_set_log.3 \
+		gearman_server_thread_set_log_fn.3 \
 		gearman_server_thread_set_run.3 \
 		gearman_server_worker_add.3 \
 		gearman_server_worker_create.3 \
 		gearman_server_worker_free.3 \
-		gearman_set_event_watch.3 \
-		gearman_set_log.3 \
+		gearman_set_error.3 \
+		gearman_set_event_watch_fn.3 \
+		gearman_set_log_fn.3 \
 		gearman_set_options.3 \
-		gearman_set_queue_add.3 \
-		gearman_set_queue_done.3 \
-		gearman_set_queue_flush.3 \
-		gearman_set_queue_fn_arg.3 \
-		gearman_set_queue_replay.3 \
-		gearman_set_task_fn_arg_free.3 \
-		gearman_set_workload_free.3 \
-		gearman_set_workload_malloc.3 \
-		gearman_task_create.3 \
+		gearman_set_timeout.3 \
+		gearman_set_workload_free_fn.3 \
+		gearman_set_workload_malloc_fn.3 \
+		gearman_task_context.3 \
 		gearman_task_data.3 \
 		gearman_task_data_size.3 \
 		gearman_task_denominator.3 \
-		gearman_task_fn_arg.3 \
 		gearman_task_free.3 \
-		gearman_task_function.3 \
+		gearman_task_function_name.3 \
+		gearman_task_give_workload.3 \
 		gearman_task_is_known.3 \
 		gearman_task_is_running.3 \
 		gearman_task_job_handle.3 \
 		gearman_task_numerator.3 \
 		gearman_task_recv_data.3 \
-		gearman_task_send_data.3 \
-		gearman_task_set_fn_arg.3 \
+		gearman_task_send_workload.3 \
+		gearman_task_set_context.3 \
 		gearman_task_take_data.3 \
-		gearman_task_uuid.3 \
+		gearman_task_unique.3 \
+		gearman_timeout.3 \
 		gearman_verbose_name.3 \
 		gearman_version.3 \
+		gearman_wait.3 \
 		gearman_worker_add_function.3 \
+		gearman_worker_add_options.3 \
 		gearman_worker_add_server.3 \
 		gearman_worker_add_servers.3 \
 		gearman_worker_clone.3 \
+		gearman_worker_context.3 \
 		gearman_worker_create.3 \
 		gearman_worker_echo.3 \
 		gearman_worker_errno.3 \
 		gearman_worker_error.3 \
 		gearman_worker_free.3 \
 		gearman_worker_grab_job.3 \
+		gearman_worker_options.3 \
 		gearman_worker_register.3 \
+		gearman_worker_remove_options.3 \
+		gearman_worker_remove_servers.3 \
+		gearman_worker_set_context.3 \
+		gearman_worker_set_event_watch_fn.3 \
+		gearman_worker_set_log_fn.3 \
 		gearman_worker_set_options.3 \
-		gearman_worker_set_workload_free.3 \
+		gearman_worker_set_timeout.3 \
+		gearman_worker_set_workload_free_fn.3 \
+		gearman_worker_set_workload_malloc_fn.3 \
+		gearman_worker_timeout.3 \
 		gearman_worker_unregister.3 \
 		gearman_worker_unregister_all.3 \
+		gearman_worker_wait.3 \
 		gearman_worker_work.3 \
 		gearmand_con_check_queue.3 \
 		gearmand_con_create.3 \
@@ -266,6 +304,7 @@ MAN3=		gearman_bugreport.3 \
 		gearmand_create.3 \
 		gearmand_free.3 \
 		gearmand_port_add.3 \
+		gearmand_protocol_http_conf.3 \
 		gearmand_protocol_http_deinit.3 \
 		gearmand_protocol_http_init.3 \
 		gearmand_queue_libdrizzle_deinit.3 \
@@ -278,8 +317,10 @@ MAN3=		gearman_bugreport.3 \
 		gearmand_queue_libsqlite3_init.3 \
 		gearmand_run.3 \
 		gearmand_set_backlog.3 \
-		gearmand_set_log.3 \
+		gearmand_set_job_retries.3 \
+		gearmand_set_log_fn.3 \
 		gearmand_set_threads.3 \
+		gearmand_set_worker_wakeup.3 \
 		gearmand_thread_create.3 \
 		gearmand_thread_free.3 \
 		gearmand_thread_run.3 \
@@ -289,13 +330,22 @@ MAN8=		gearmand.8
 
 .include <bsd.port.pre.mk>
 
+.ifdef(WITH_MEMCACHED)
+PLIST_SUB+=	MEMCACHED=""
+CONFIGURE_ARGS+=	--with-libmemcached-prefix --without-memcached
+LIB_DEPENDS+=	memcached:${PORTSDIR}/databases/libmemcached
+.else
+PLIST_SUB+=	MEMCACHED="@comment "
+CONFIGURE_ARGS+=	--disable-libmemcached
+.endif
+
 .ifdef(WITH_PQ)
 PLIST_SUB+=	PG=""
 CONFIGURE_ARGS+=	--with-libpq-prefix
 USE_PGSQL=	yes
 .else
 PLIST_SUB+=	PG="@comment "
-CONFIGURE_ARGS+=	--without-libpq-prefix
+CONFIGURE_ARGS+=	--disable-libpq
 .endif
 
 .ifdef(WITH_SQLITE3)
@@ -304,7 +354,7 @@ CONFIGURE_ARGS+=	--with-libsqlite3-prefix
 USE_SQLITE=	yes
 .else
 PLIST_SUB+=	SQLITE="@comment "
-CONFIGURE_ARGS+=	--without-libsqlite3-prefix
+CONFIGURE_ARGS+=	--disable-libsqlite3
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/gearmand/distinfo b/devel/gearmand/distinfo
index 359643123a12..c84600179100 100644
--- a/devel/gearmand/distinfo
+++ b/devel/gearmand/distinfo
@@ -1,3 +1,3 @@
-MD5 (gearmand-0.9.tar.gz) = 8bdedc7809180f5f33ec123e2c47389e
-SHA256 (gearmand-0.9.tar.gz) = 4cc4af55d235f3a343d791b7f5b7593cfb7dfc70d68f021a183b905606d2906e
-SIZE (gearmand-0.9.tar.gz) = 599884
+MD5 (gearmand-0.11.tar.gz) = 62da8118c76d29d07bf5e54099e11dbb
+SHA256 (gearmand-0.11.tar.gz) = 25848a11bc4ba91329e8992c5a3ccbb82afe104ef558e67cf3ca9669d3044a92
+SIZE (gearmand-0.11.tar.gz) = 593324
diff --git a/devel/gearmand/files/gearmand.sh.in b/devel/gearmand/files/gearmand.sh.in
index 1cbfcbd4aabf..0ed9c999006e 100644
--- a/devel/gearmand/files/gearmand.sh.in
+++ b/devel/gearmand/files/gearmand.sh.in
@@ -9,6 +9,7 @@
 . "%%RC_SUBR%%"
 
 name="gearmand"
+rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/gearmand"
 
 load_rc_config "$name"
diff --git a/devel/gearmand/pkg-plist b/devel/gearmand/pkg-plist
index 6817dd16d40f..ce330988587e 100644
--- a/devel/gearmand/pkg-plist
+++ b/devel/gearmand/pkg-plist
@@ -1,36 +1,43 @@
 @comment $FreeBSD$
 bin/gearman
+include/libgearman-server/client.h
+include/libgearman-server/conf.h
+include/libgearman-server/conf_module.h
+include/libgearman-server/conn.h
+include/libgearman-server/constants.h
+include/libgearman-server/function.h
+include/libgearman-server/gearmand.h
+include/libgearman-server/gearmand_con.h
+include/libgearman-server/gearmand_thread.h
+include/libgearman-server/job.h
+include/libgearman-server/packet.h
+include/libgearman-server/protocol_http.h
+%%MEMCACHED%%include/libgearman-server/queue_libmemcached.h
+%%PG%%include/libgearman-server/queue_libpq.h
+%%SQLITE%%include/libgearman-server/queue_libsqlite3.h
+include/libgearman-server/server.h
+include/libgearman-server/structs.h
+include/libgearman-server/thread.h
+include/libgearman-server/worker.h
 include/libgearman/client.h
-include/libgearman/conf.h
-include/libgearman/conf_module.h
 include/libgearman/conn.h
 include/libgearman/constants.h
 include/libgearman/gearman.h
-include/libgearman/gearmand.h
-include/libgearman/gearmand_con.h
-include/libgearman/gearmand_thread.h
 include/libgearman/job.h
 include/libgearman/packet.h
-include/libgearman/protocol_http.h
-%%PG%%include/libgearman/queue_libpq.h
-%%SQLITE%%include/libgearman/queue_libsqlite3.h
-include/libgearman/server.h
-include/libgearman/server_client.h
-include/libgearman/server_con.h
-include/libgearman/server_function.h
-include/libgearman/server_job.h
-include/libgearman/server_packet.h
-include/libgearman/server_thread.h
-include/libgearman/server_worker.h
 include/libgearman/structs.h
 include/libgearman/task.h
 include/libgearman/visibility.h
 include/libgearman/worker.h
+lib/libgearman-server.a
+lib/libgearman-server.la
+lib/libgearman-server.so
+lib/libgearman-server.so.0
 lib/libgearman.a
 lib/libgearman.la
 lib/libgearman.so
-lib/libgearman.so.1
+lib/libgearman.so.3
 libdata/pkgconfig/gearmand.pc
 sbin/gearmand
-@dirrmtry libdata/pkgconfig
-@dirrm include/libgearman
+@dirrmtry include/libgearman-server
+@dirrmtry include/libgearman