Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Sep 2009 17:23:13 GMT
From:      Keith Gaughan <k@stereochro.me>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/138614: devel/gearmand: Upgrade to 0.9, and dependency fixes
Message-ID:  <200909071723.n87HND2L014112@www.freebsd.org>
Resent-Message-ID: <200909071730.n87HU20F007390@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         138614
>Category:       ports
>Synopsis:       devel/gearmand: Upgrade to 0.9, and dependency fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 07 17:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Keith Gaughan
>Release:        FreeBSD 7.1
>Organization:
>Environment:
FreeBSD lir 7.1-RELEASE FreeBSD 7.1-RELEASE #0: Thu Jan  1 14:37:25 UTC 2009     root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
The attached shar file (with the extension .txt because the browser MIME type problems) contains a patch for the port Makefile to have it install gearman 0.9 and and patch to the configure script to allow it to correctly detect the presence of libmemcached.

As the configure script will detect the SQLite 3 and PostgresSQL client libraries automatically and there is no way to turn off detection, the port now also checks for these libraries and adds them as dependencies if present, and does the same with libmemcached.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	Makefile.patch
#	patch-configure
#
echo x - Makefile.patch
sed 's/^X//' >Makefile.patch << '510beb51362fa3774a3169b33b47ec43'
X--- Makefile.orig	2009-09-07 18:10:31.000000000 +0100
X+++ Makefile	2009-09-07 18:10:22.000000000 +0100
X@@ -2,11 +2,11 @@
X # Date created:		2009-01-29
X # Whom:			Gea-Suan Lin <gslin@gslin.org>
X #
X-# $FreeBSD: ports/devel/gearmand/Makefile,v 1.7 2009/07/04 23:21:05 miwi Exp $
X+# $FreeBSD$
X #
X 
X PORTNAME=	gearmand
X-PORTVERSION=	0.8
X+PORTVERSION=	0.9
X CATEGORIES=	devel
X MASTER_SITES=	http://launchpad.net/gearmand/trunk/${PORTVERSION}/+download/
X 
X@@ -14,7 +14,8 @@
X COMMENT=	Gearman C Server and Library
X 
X LIB_DEPENDS=	event:${PORTSDIR}/devel/libevent \
X-		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
X+		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
X+		memcached:${PORTSDIR}/databases/libmemcached
X 
X CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
X FETCH_ARGS=	-pRr
X@@ -23,6 +24,20 @@
X USE_LDCONFIG=	yes
X USE_RC_SUBR=	gearmand.sh
X 
X+CONFIGURE_ARGS+=	--without-memcached
X+
X+.include <bsd.port.options.mk>
X+
X+# Both of these are detected automatically by ./configure, and can't be
X+# turned off, so it's best to add them as dependencies if present to
X+# prevent breakage.
X+.if exists(${LOCALBASE}/lib/libpq.so)
X+USE_PGSQL=	yes
X+.endif
X+.if exists(${LOCALBASE}/libdata/pkgconfig/sqlite3.pc)
X+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
X+.endif
X+
X MAN1=		gearman.1
X MAN3=		gearman_bugreport.3 \
X 		gearman_client_add_server.3 \
X@@ -148,6 +163,12 @@
X 		gearman_queue_libmemcached_conf.3 \
X 		gearman_queue_libmemcached_deinit.3 \
X 		gearman_queue_libmemcached_init.3 \
X+		gearman_queue_libpq_conf.3 \
X+		gearman_queue_libpq_deinit.3 \
X+		gearman_queue_libpq_init.3 \
X+		gearman_queue_libsqlite3_conf.3 \
X+		gearman_queue_libsqlite3_deinit.3 \
X+		gearman_queue_libsqlite3_init.3 \
X 		gearman_server_client_add.3 \
X 		gearman_server_client_create.3 \
X 		gearman_server_client_free.3 \
X@@ -262,6 +283,10 @@
X 		gearmand_queue_libdrizzle_init.3 \
X 		gearmand_queue_libmemcached_deinit.3 \
X 		gearmand_queue_libmemcached_init.3 \
X+		gearmand_queue_libpq_deinit.3 \
X+		gearmand_queue_libpq_init.3 \
X+		gearmand_queue_libsqlite3_deinit.3 \
X+		gearmand_queue_libsqlite3_init.3 \
X 		gearmand_run.3 \
X 		gearmand_set_backlog.3 \
X 		gearmand_set_log.3 \
510beb51362fa3774a3169b33b47ec43
echo x - patch-configure
sed 's/^X//' >patch-configure << '3d0de32cf684c49206e6b02056c21fac'
X--- configure.orig	2009-09-07 15:34:37.000000000 +0100
X+++ configure	2009-09-07 15:34:21.000000000 +0100
X@@ -24161,7 +24161,7 @@
X 
X     memcached_st memc;
X     memcached_dump_func *df;
X-    memcached_version();
X+    memcached_lib_version();
X 
X   ;
X   return 0;
3d0de32cf684c49206e6b02056c21fac
exit



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909071723.n87HND2L014112>