- Unbreak

- Upgrade to 0.26
- Add new build dependencies
- Add new build option for Redis persistent queue
- Move SQLite library version checking to BUILD_DEPENDS from the upstream
  configure script.  It always failed due to incorrect comparison of a version
  string with a version number.
- Update a bunch of depends and CONFIGURE_ARGS due to changes in the upstream
  configure script.

PR:		ports/164026 (based on)
Submitted by:	Marc Peters <marc.peters@trivago.com>

4 files changed, 377 insertions, 151 deletions

diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile
index 829ea6736a47..557ea774aa5b 100644
--- a/devel/gearmand/Makefile
+++ b/devel/gearmand/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gearmand
-PORTVERSION=	0.14
+PORTVERSION=	0.26
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/gearmand/trunk/${PORTVERSION}/+download/ \
 		LOCAL/glarkin
@@ -14,137 +14,180 @@ MASTER_SITES=	http://launchpad.net/gearmand/trunk/${PORTVERSION}/+download/ \
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Gearman C Server and Library
 
+BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
 LIB_DEPENDS=	event:${PORTSDIR}/devel/libevent \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
 
-BROKEN=		does not compile
-
 FETCH_ARGS=	-pRr
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	gearmand.sh
+CONFIGURE_ARGS+=--with-lib-prefix=${LOCALBASE} --with-boost=${LOCALBASE}
 
-OPTIONS=	DRIZZLE "Enable libdrizzle support" off \
-		MEMCACHED "Enable memcached support" on \
-		PQ "Enable PostgreSQL support" off \
-		SQLITE3 "Enable SQLite3 support" off \
-		TC "Enable Tokyo Cabinet support" off
+OPTIONS=	DRIZZLE "Enable Drizzle support for persistent queue" off \
+		MEMCACHED "Enable memcached support for persistent queue" off \
+		PGSQL "Enable PostgreSQL support for persistent queue" off \
+		SQLITE "Enable SQLite support for persistent queue" on \
+		REDIS "Enable Redis support for persistent queue" off \
+		TOKYOCAB "Enable Tokyo Cabinet support for persistent queue" off
 
-MAN1=		gearman.1
-MAN3=		gearman_bugreport.3 \
-		gearman_client_add_options.3 \
-		gearman_client_add_server.3 \
-		gearman_client_add_servers.3 \
-		gearman_client_add_task.3 \
-		gearman_client_add_task_background.3 \
-		gearman_client_add_task_high.3 \
-		gearman_client_add_task_high_background.3 \
-		gearman_client_add_task_low.3 \
-		gearman_client_add_task_low_background.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_do.3 \
-		gearman_client_do_background.3 \
-		gearman_client_do_high.3 \
-		gearman_client_do_high_background.3 \
-		gearman_client_do_job_handle.3 \
-		gearman_client_do_low.3 \
-		gearman_client_do_low_background.3 \
-		gearman_client_do_status.3 \
-		gearman_client_echo.3 \
-		gearman_client_errno.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_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_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_fn.3 \
-		gearman_client_set_workload_malloc_fn.3 \
-		gearman_client_task_free_all.3 \
-		gearman_client_timeout.3 \
-		gearman_client_wait.3 \
-		gearman_job_free.3 \
-		gearman_job_free_all.3 \
-		gearman_job_function_name.3 \
-		gearman_job_handle.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_workload.3 \
-		gearman_job_workload_size.3 \
-		gearman_parse_servers.3 \
-		gearman_task_context.3 \
-		gearman_task_data.3 \
-		gearman_task_data_size.3 \
-		gearman_task_denominator.3 \
-		gearman_task_free.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_workload.3 \
-		gearman_task_set_context.3 \
-		gearman_task_take_data.3 \
-		gearman_task_unique.3 \
-		gearman_verbose_name.3 \
-		gearman_version.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_function_exist.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_log_fn.3 \
-		gearman_worker_set_options.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
-MAN8=		gearmand.8
+MAN1=	gearadmin.1 \
+	gearman.1
+MAN3=	gearman_actions_t.3 \
+	gearman_allocator_t.3 \
+	gearman_argument_make.3 \
+	gearman_argument_t.3 \
+	gearman_bugreport.3 \
+	gearman_client_add_options.3 \
+	gearman_client_add_server.3 \
+	gearman_client_add_servers.3 \
+	gearman_client_add_task.3 \
+	gearman_client_add_task_background.3 \
+	gearman_client_add_task_high.3 \
+	gearman_client_add_task_high_background.3 \
+	gearman_client_add_task_low.3 \
+	gearman_client_add_task_low_background.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_do.3 \
+	gearman_client_do_background.3 \
+	gearman_client_do_high.3 \
+	gearman_client_do_high_background.3 \
+	gearman_client_do_job_handle.3 \
+	gearman_client_do_low.3 \
+	gearman_client_do_low_background.3 \
+	gearman_client_do_status.3 \
+	gearman_client_echo.3 \
+	gearman_client_errno.3 \
+	gearman_client_error.3 \
+	gearman_client_free.3 \
+	gearman_client_has_option.3 \
+	gearman_client_job_status.3 \
+	gearman_client_options.3 \
+	gearman_client_options_t.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_fn.3 \
+	gearman_client_set_exception_fn.3 \
+	gearman_client_set_fail_fn.3 \
+	gearman_client_set_log_fn.3 \
+	gearman_client_set_memory_allocators.3 \
+	gearman_client_set_namespace.3 \
+	gearman_client_set_options.3 \
+	gearman_client_set_status_fn.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_fn.3 \
+	gearman_client_set_workload_malloc_fn.3 \
+	gearman_client_st.3 \
+	gearman_client_task_free_all.3 \
+	gearman_client_timeout.3 \
+	gearman_client_wait.3 \
+	gearman_continue.3 \
+	gearman_execute.3 \
+	gearman_failed.3 \
+	gearman_job_free.3 \
+	gearman_job_free_all.3 \
+	gearman_job_function_name.3 \
+	gearman_job_handle.3 \
+	gearman_job_handle_t.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_st.3 \
+	gearman_job_take_workload.3 \
+	gearman_job_unique.3 \
+	gearman_job_workload.3 \
+	gearman_job_workload_size.3 \
+	gearman_log_fn.3 \
+	gearman_parse_servers.3 \
+	gearman_result_boolean.3 \
+	gearman_result_integer.3 \
+	gearman_result_is_null.3 \
+	gearman_result_size.3 \
+	gearman_result_store_integer.3 \
+	gearman_result_store_string.3 \
+	gearman_result_store_value.3 \
+	gearman_result_string.3 \
+	gearman_return_t.3 \
+	gearman_strerror.3 \
+	gearman_string_t.3 \
+	gearman_success.3 \
+	gearman_task_attr_init.3 \
+	gearman_task_attr_init_background.3 \
+	gearman_task_attr_init_epoch.3 \
+	gearman_task_attr_t.3 \
+	gearman_task_context.3 \
+	gearman_task_data.3 \
+	gearman_task_data_size.3 \
+	gearman_task_denominator.3 \
+	gearman_task_error.3 \
+	gearman_task_free.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_return.3 \
+	gearman_task_send_workload.3 \
+	gearman_task_set_context.3 \
+	gearman_task_st.3 \
+	gearman_task_take_data.3 \
+	gearman_task_unique.3 \
+	gearman_verbose_name.3 \
+	gearman_verbose_t.3 \
+	gearman_version.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_define_function.3 \
+	gearman_worker_echo.3 \
+	gearman_worker_errno.3 \
+	gearman_worker_error.3 \
+	gearman_worker_free.3 \
+	gearman_worker_function_exist.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_log_fn.3 \
+	gearman_worker_set_memory_allocators.3 \
+	gearman_worker_set_namespace.3 \
+	gearman_worker_set_options.3 \
+	gearman_worker_set_timeout.3 \
+	gearman_worker_set_workload_free_fn.3 \
+	gearman_worker_set_workload_malloc_fn.3 \
+	gearman_worker_st.3 \
+	gearman_worker_timeout.3 \
+	gearman_worker_unregister.3 \
+	gearman_worker_unregister_all.3 \
+	gearman_worker_wait.3 \
+	gearman_worker_work.3 \
+	libgearman.3
+MAN8=	gearmand.8
 
 .include <bsd.port.pre.mk>
 
@@ -159,38 +202,46 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .ifdef(WITH_DRIZZLE)
-CONFIGURE_ARGS+=	--with-libdrizzle-prefix
 LIB_DEPENDS+=		drizzle:${PORTSDIR}/databases/libdrizzle
 .else
 CONFIGURE_ARGS+=	--disable-libdrizzle
 .endif
 
 .ifdef(WITH_MEMCACHED)
-CONFIGURE_ARGS+=	--with-libmemcached-prefix
 LIB_DEPENDS+=		memcached:${PORTSDIR}/databases/libmemcached
+BUILD_DEPENDS+=		memcached>=0:${PORTSDIR}/databases/memcached
+CONFIGURE_ARGS+=	--enable-libmemcached --with-memcached=${LOCALBASE}/bin
 .else
 CONFIGURE_ARGS+=	--disable-libmemcached
 .endif
 
-.ifdef(WITH_PQ)
-CONFIGURE_ARGS+=	--with-libpq-prefix
+.ifdef(WITH_PGSQL)
 USE_PGSQL=		yes
 .else
 CONFIGURE_ARGS+=	--disable-libpq
 .endif
 
-.ifdef(WITH_SQLITE3)
-CONFIGURE_ARGS+=	--with-libsqlite3-prefix
-USE_SQLITE=		yes
+.ifdef(WITH_SQLITE)
+BUILD_DEPENDS+=		sqlite3>=3.0.0:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}/lib
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-configure
 .else
-CONFIGURE_ARGS+=	--disable-libsqlite3
+CONFIGURE_ARGS+=	--without-sqlite3
 .endif
 
-.ifdef(WITH_TC)
-CONFIGURE_ARGS+=	--with-libtokyocabinet-prefix
+.ifdef(WITH_TOKYOCAB)
 LIB_DEPENDS+=		tokyocabinet:${PORTSDIR}/databases/tokyocabinet
+CONFIGURE_ARGS+=	--with-libtokyocabinet-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--disable-libtokyocabinet
 .endif
 
+.ifdef(WITH_REDIS)
+LIB_DEPENDS+=		hiredis:${PORTSDIR}/databases/hiredis
+CONFIGURE_ARGS+=	--with-libhiredis-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-libhiredis-prefix
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/gearmand/distinfo b/devel/gearmand/distinfo
index 47105e91fea1..97428901f748 100644
--- a/devel/gearmand/distinfo
+++ b/devel/gearmand/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gearmand-0.14.tar.gz) = 8e060683dd4b2bfc25a68e22924597ae50bbfd4126966e4088b47c3caa64e25c
-SIZE (gearmand-0.14.tar.gz) = 559748
+SHA256 (gearmand-0.26.tar.gz) = 79ae2233bafe8f092ebf4157f83c2e0535a1fe1765da04cb01f34bcdf520dd33
+SIZE (gearmand-0.26.tar.gz) = 773491
diff --git a/devel/gearmand/files/extra-patch-configure b/devel/gearmand/files/extra-patch-configure
new file mode 100644
index 000000000000..538cdefbdf21
--- /dev/null
+++ b/devel/gearmand/files/extra-patch-configure
@@ -0,0 +1,154 @@
+--- ./configure.orig	2012-01-13 16:41:29.000000000 -0500
++++ ./configure	2012-01-13 16:43:45.000000000 -0500
+@@ -23333,150 +23333,12 @@
+ 
+ fi
+ 
+-
+-    SQLITE3_CFLAGS=""
+-    SQLITE3_LDFLAGS=""
+-    SQLITE3_VERSION=""
+-
+-    if test "x$WANT_SQLITE3" = "xyes"; then
+-
+-        ac_sqlite3_header="sqlite3.h"
+-
+-        sqlite3_version_req=3.0.0
+-        sqlite3_version_req_shorten=`expr $sqlite3_version_req : '\([0-9]*\.[0-9]*\)'`
+-        sqlite3_version_req_major=`expr $sqlite3_version_req : '\([0-9]*\)'`
+-        sqlite3_version_req_minor=`expr $sqlite3_version_req : '[0-9]*\.\([0-9]*\)'`
+-        sqlite3_version_req_micro=`expr $sqlite3_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
+-        if test "x$sqlite3_version_req_micro" = "x" ; then
+-            sqlite3_version_req_micro="0"
+-        fi
+-
+-        sqlite3_version_req_number=`expr $sqlite3_version_req_major \* 1000000 \
+-                                   \+ $sqlite3_version_req_minor \* 1000 \
+-                                   \+ $sqlite3_version_req_micro`
+-
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite3 library >= $sqlite3_version_req" >&5
+-$as_echo_n "checking for SQLite3 library >= $sqlite3_version_req... " >&6; }
+-
+-        if test "$ac_sqlite3_path" != ""; then
+-            ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib"
+-            ac_sqlite3_cppflags="-I$ac_sqlite3_path/include"
+-        else
+-            for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
+-                if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
+-                    && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
+-                    ac_sqlite3_path=$ac_sqlite3_path_tmp
+-                    ac_sqlite3_cppflags="-I$ac_sqlite3_path_tmp/include"
+-                    ac_sqlite3_ldflags="-L$ac_sqlite3_path_tmp/lib"
+-                    break;
+-                fi
+-            done
+-        fi
+-
+-        ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3"
+-
+-        saved_CPPFLAGS="$CPPFLAGS"
+-        CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags"
+-
+-        ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-            #include <sqlite3.h>
+-int
+-main ()
+-{
+-
+-#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number)
+-// Everything is okay
+-#else
+-#  error SQLite version is too old
+-#endif
+-
+-
+-  ;
+-  return 0;
+-}
+-
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-            success="yes"
+-
+-else
+-
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
+-            success="no"
+-
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-        ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-        CPPFLAGS="$saved_CPPFLAGS"
+-
+-        if test "$success" = "yes"; then
+-
+-            SQLITE3_CFLAGS="$ac_sqlite3_cppflags"
+-            SQLITE3_LDFLAGS="$ac_sqlite3_ldflags"
+-
+-            ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header"
+-
+-                        if test "x$ac_sqlite3_header_path" != "x"; then
+-                ac_sqlite3_version=`cat $ac_sqlite3_header_path \
+-                    | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \
+-                        | sed -e 's/"//'`
+-                if test $ac_sqlite3_version != ""; then
+-                    SQLITE3_VERSION=$ac_sqlite3_version
+-                else
+-                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&5
+-$as_echo "$as_me: WARNING: Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&2;}
+-                fi
+-            fi
+-
+-
+-
+-
+-
+-$as_echo "#define HAVE_SQLITE3 /**/" >>confdefs.h
+-
+-        fi
+-    fi
+-
+-if test "x${ac_cv_libsqlite3}" = "xyes"; then :
+-
+-
+ $as_echo "#define HAVE_LIBSQLITE3  1 " >>confdefs.h
+ 
+ 
+-else
+-
+-       ac_cv_libsqlite3=no
+-
+-$as_echo "#define HAVE_LIBSQLITE3  0 " >>confdefs.h
+-
+-
+-fi
+- if test "x${ac_cv_libsqlite3}" = "xyes"; then
+   HAVE_LIBSQLITE3_TRUE=
+   HAVE_LIBSQLITE3_FALSE='#'
+-else
+-  HAVE_LIBSQLITE3_TRUE='#'
+-  HAVE_LIBSQLITE3_FALSE=
+-fi
++  ac_cv_libsqlite3=yes
+ 
+ 
+ 
diff --git a/devel/gearmand/pkg-plist b/devel/gearmand/pkg-plist
index ab77828f19ff..38a03189ecb2 100644
--- a/devel/gearmand/pkg-plist
+++ b/devel/gearmand/pkg-plist
@@ -1,24 +1,45 @@
-@comment $FreeBSD$
+bin/gearadmin
 bin/gearman
-include/libgearman/byteorder.h
-include/libgearman/client.h
-include/libgearman/command.h
-include/libgearman/configure.h
-include/libgearman/connection.h
-include/libgearman/constants.h
-include/libgearman/core.h
+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/client.h
+include/libgearman-1.0/client_callbacks.h
+include/libgearman-1.0/configure.h
+include/libgearman-1.0/connection.h
+include/libgearman-1.0/constants.h
+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/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
+include/libgearman-1.0/result.h
+include/libgearman-1.0/return.h
+include/libgearman-1.0/signal.h
+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
+include/libgearman-1.0/worker.h
 include/libgearman/gearman.h
-include/libgearman/job.h
-include/libgearman/log.h
-include/libgearman/packet.h
-include/libgearman/strerror.h
-include/libgearman/task.h
-include/libgearman/universal.h
-include/libgearman/visibility.h
-include/libgearman/worker.h
+lib/libgearman.a
 lib/libgearman.la
 lib/libgearman.so
-lib/libgearman.so.4
+lib/libgearman.so.6
 libdata/pkgconfig/gearmand.pc
 sbin/gearmand
-@dirrmtry include/libgearman
+@dirrm include/libgearman-1.0
+@dirrm include/libgearman