Attachment #127730 for bug #171593

View | Details | Raw Unified | Return to bug 171593
Collapse All | Expand All




#

PORTNAME=	gearmand
PORTVERSION=	1.1.0
CATEGORIES=	devel
MASTER_SITES=	https://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/
		LOCAL/glarkin

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 \
		execinfo:${PORTSDIR}/devel/libexecinfo

FETCH_ARGS=	-pRr
USE_PERL5_BUILD=yes
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_GNOME=	gnomehack
USE_LDCONFIG=	yes
USE_AUTOTOOLS=	aclocal autoconf automake
ACLOCAL_ARGS=	-I m4
CPPFLAGS+=	-isystem ${LOCALBASE}/include
USE_RC_SUBR=	gearmand
CONFIGURE_ARGS+=--with-lib-prefix=${LOCALBASE} --with-boost=${LOCALBASE}

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 \
		TOKYOCAB "Enable Tokyo Cabinet support for persistent queue" off \
		MYSQL "Enable MySQL support for persistent queue" off

MAN1=	gearadmin.1 \
	gearman.1


.include <bsd.port.pre.mk>

.if ${OSVERSION} < 800000
BROKEN=		does not compile on FreeBSD 7.x
.if ${OSVERSION} < 800500
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libtest__test.cc
.endif

.if ${ARCH} == "i386"
LDFLAGS+=	-fstack-protector
.endif

LDFLAGS+=	-lexecinfo

# This hack is required for the test programs invoked by configure,
# in the event that libmemcached was compiled with SASL support.
.if exists(${LOCALBASE}/lib/libsasl.so)

CONFIGURE_ARGS+=	--disable-libtokyocabinet
.endif

.ifdef(WITH_MYSQL)
USE_MYSQL=		yes
CONFIGURE_ARGS+=	--with-libhiredis-prefix=${LOCALBASE}
.else
CONFIGURE_ARGS+=	--without-mysql
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (gearmand-0.26.tar.gz) = 79ae2233bafe8f092ebf4157f83c2e0535a1fe1765da04cb01f34bcdf520dd33	1	SHA256 (gearmand-1.1.0.tar.gz) = a6500f8cd88c874ef500603903f58f931a7c68838a0aba935d50ff93d76338cd
2	SIZE (gearmand-0.26.tar.gz) = 773491	2	SIZE (gearmand-1.1.0.tar.gz) = 841690




--- ./libtest/test.cc.orig	2012-01-27 17:12:33.000000000 -0500
+++ ./libtest/test.cc	2012-01-27 17:14:02.000000000 -0500
@@ -113,7 +113,10 @@
     return EXIT_FAILURE;
   }
 
-  assert(sigignore(SIGPIPE) == 0);
+  struct sigaction ignore_action;
+  ignore_action.sa_handler = SIG_IGN;
+  ignore_action.sa_flags = SA_RESTART;
+  assert(sigaction(SIGPIPE, &ignore_action, NULL) == 0);
 
   libtest::SignalThread signal;
   if (not signal.setup())

Lines 1-10 Link Here

(-)./files/patch-configure (-10 lines)
1	--- ./configure.orig 2012-01-16 15:07:46.000000000 -0500
2	+++ ./configure 2012-01-16 15:08:21.000000000 -0500
3	@@ -23441,6 +23441,7 @@
4	\| sed -e 's/"//'`
5	if test $ac_sqlite3_version != ""; then
6	SQLITE3_VERSION=$ac_sqlite3_version
7	+ ac_cv_libsqlite3=yes
8	else
9	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&5
10	$as_echo "$as_me: WARNING: Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!" >&2;}

Line 0 Link Here

(-)./files/patch-configure.ac (+11 lines)
	1	remove -Werror in CXXFLAGS
	2	--- ./configure.ac.orig 2012-09-06 10:41:35.000000000 +0800
	3	+++ ./configure.ac 2012-09-13 11:53:59.796281000 +0800
	4	@@ -35,6 +35,7 @@
	5	# +- increment if interfaces have been added, removed or changed
	6	AC_SUBST(GEARMAN_LIBRARY_VERSION)
	7
	8	+ax_cv_check_cxxflags___Werror=false
	9	LT_PREREQ([2.4])
	10	LT_INIT([disable-static])
	11	LT_LANG([C++])




--- ./libtest/memcached.hpp.orig	2012-08-19 07:02:19.000000000 +0800
+++ ./libtest/memcached.hpp	2012-09-13 11:53:59.812264000 +0800
@@ -39,7 +39,7 @@
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
 inline bool operator== (const memcached_st& memc, const memcached_return_t rc)
 {
-  if (memcached_last_error(&memc) == rc)
+  if (memcached_last_error(&const_cast<memcached_st&>(memc)) == rc)
   {
     return true;
   }
@@ -49,7 +49,7 @@
 
 inline bool operator!= (const memcached_st& memc, const memcached_return_t rc)
 {
-  if (memcached_last_error(&memc) != rc)
+  if (memcached_last_error(&const_cast<memcached_st&>(memc)) != rc)
   {
     return true;
   }
@@ -59,7 +59,7 @@
 
 inline bool operator!= (const memcached_return_t rc, const memcached_st& memc)
 {
-  if (memcached_last_error(&memc) != rc)
+  if (memcached_last_error(&const_cast<memcached_st&>(memc)) != rc)
   {
     return true;
   }

Line 0 Link Here

(-)./files/patch-support__include.am (+9 lines)
	1	--- ./support/include.am.orig 2012-09-13 12:07:40.791463000 +0800
	2	+++ ./support/include.am 2012-09-13 12:08:07.579647000 +0800
	3	@@ -7,5 +7,5 @@
	4	support/gearmand.pc \
	5	support/gearmand.spec
	6
	7	-pkgconfigdir = $(libdir)/pkgconfig
	8	+pkgconfigdir = $(prefix)/libdata/pkgconfig
	9	pkgconfig_DATA = support/gearmand.pc




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/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
include/libgearman-1.0/result.h
include/libgearman-1.0/return.h
include/libgearman-1.0/signal.h
include/libgearman-1.0/status.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
lib/libgearman.a
lib/libgearman.la
lib/libgearman.so
lib/libgearman.so.8
libdata/pkgconfig/gearmand.pc
sbin/gearmand
@dirrm include/libgearman-1.0/interface
@dirrm include/libgearman-1.0
@dirrm include/libgearman

Return to bug 171593

Lines 6-38 Link Here

(-)./Makefile (-17 / +20 lines)
6	#	6	#
7		7
8	PORTNAME= gearmand	8	PORTNAME= gearmand
9	PORTVERSION= 0.26	9	PORTVERSION= 1.1.0
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://launchpad.net/gearmand/trunk/${PORTVERSION}/+download/ \	11	MASTER_SITES= https://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/
12	LOCAL/glarkin
13		12
14	MAINTAINER= glarkin@FreeBSD.org	13	MAINTAINER= glarkin@FreeBSD.org
15	COMMENT= Gearman C Server and Library	14	COMMENT= Gearman C Server and Library
16		15
17	BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs	16	BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs
18	LIB_DEPENDS= event:${PORTSDIR}/devel/libevent \	17	LIB_DEPENDS= event:${PORTSDIR}/devel/libevent \
19	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid	18	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
		19	execinfo:${PORTSDIR}/devel/libexecinfo
20		20
21	FETCH_ARGS= -pRr	21	FETCH_ARGS= -pRr
22	USE_PERL5_BUILD=yes
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
24	USE_GMAKE= yes	23	USE_GMAKE= yes
25	USE_GNOME= gnomehack
26	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
		25	USE_AUTOTOOLS= aclocal autoconf automake
		26	ACLOCAL_ARGS= -I m4
		27	CPPFLAGS+= -isystem ${LOCALBASE}/include
27	USE_RC_SUBR= gearmand	28	USE_RC_SUBR= gearmand
28	CONFIGURE_ARGS+=--with-lib-prefix=${LOCALBASE} --with-boost=${LOCALBASE}
29		29
30	OPTIONS= DRIZZLE "Enable Drizzle support for persistent queue" off \	30	OPTIONS= DRIZZLE "Enable Drizzle support for persistent queue" off \
31	MEMCACHED "Enable memcached support for persistent queue" off \	31	MEMCACHED "Enable memcached support for persistent queue" off \
32	PGSQL "Enable PostgreSQL support for persistent queue" off \	32	PGSQL "Enable PostgreSQL support for persistent queue" off \
33	SQLITE "Enable SQLite support for persistent queue" on \	33	SQLITE "Enable SQLite support for persistent queue" on \
34	REDIS "Enable Redis support for persistent queue" off \	34	TOKYOCAB "Enable Tokyo Cabinet support for persistent queue" off \
35	TOKYOCAB "Enable Tokyo Cabinet support for persistent queue" off	35	MYSQL "Enable MySQL support for persistent queue" off
36		36
37	MAN1= gearadmin.1 \	37	MAN1= gearadmin.1 \
38	gearman.1	38	gearman.1
Lines 191-202 Link Here
191		191
192	.include <bsd.port.pre.mk>	192	.include <bsd.port.pre.mk>
193		193
194	# Workaround for missing sigignore that wasn't introduced until	194	.if ${OSVERSION} < 800000
195	# FreeBSD 8.0	195	BROKEN= does not compile on FreeBSD 7.x
196	.if ${OSVERSION} < 800500
197	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libtest__test.cc
198	.endif	196	.endif
199		197
		198	.if ${ARCH} == "i386"
		199	LDFLAGS+= -fstack-protector
		200	.endif
		201
		202	LDFLAGS+= -lexecinfo
		203
200	# This hack is required for the test programs invoked by configure,	204	# This hack is required for the test programs invoked by configure,
201	# in the event that libmemcached was compiled with SASL support.	205	# in the event that libmemcached was compiled with SASL support.
202	.if exists(${LOCALBASE}/lib/libsasl.so)	206	.if exists(${LOCALBASE}/lib/libsasl.so)
Lines 242-252 Link Here
242	CONFIGURE_ARGS+= --disable-libtokyocabinet	246	CONFIGURE_ARGS+= --disable-libtokyocabinet
243	.endif	247	.endif
244		248
245	.ifdef(WITH_REDIS)	249	.ifdef(WITH_MYSQL)
246	LIB_DEPENDS+= hiredis:${PORTSDIR}/databases/hiredis	250	USE_MYSQL= yes
247	CONFIGURE_ARGS+= --with-libhiredis-prefix=${LOCALBASE}
248	.else	251	.else
249	CONFIGURE_ARGS+= --without-libhiredis-prefix	252	CONFIGURE_ARGS+= --without-mysql
250	.endif	253	.endif
251		254
252	.include <bsd.port.post.mk>	255	.include <bsd.port.post.mk>

Lines 1-14 Link Here

(-)./files/extra-patch-libtest__test.cc (-14 lines)
1	--- ./libtest/test.cc.orig 2012-01-27 17:12:33.000000000 -0500
2	+++ ./libtest/test.cc 2012-01-27 17:14:02.000000000 -0500
3	@@ -113,7 +113,10 @@
4	return EXIT_FAILURE;
5	}
6
7	- assert(sigignore(SIGPIPE) == 0);
8	+ struct sigaction ignore_action;
9	+ ignore_action.sa_handler = SIG_IGN;
10	+ ignore_action.sa_flags = SA_RESTART;
11	+ assert(sigaction(SIGPIPE, &ignore_action, NULL) == 0);
12
13	libtest::SignalThread signal;
14	if (not signal.setup())

Line 0 Link Here

(-)./files/patch-libtest__memcached.hpp (+29 lines)
	1	--- ./libtest/memcached.hpp.orig 2012-08-19 07:02:19.000000000 +0800
	2	+++ ./libtest/memcached.hpp 2012-09-13 11:53:59.812264000 +0800
	3	@@ -39,7 +39,7 @@
	4	#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
	5	inline bool operator== (const memcached_st& memc, const memcached_return_t rc)
	6	{
	7	- if (memcached_last_error(&memc) == rc)
	8	+ if (memcached_last_error(&const_cast<memcached_st&>(memc)) == rc)
	9	{
	10	return true;
	11	}
	12	@@ -49,7 +49,7 @@
	13
	14	inline bool operator!= (const memcached_st& memc, const memcached_return_t rc)
	15	{
	16	- if (memcached_last_error(&memc) != rc)
	17	+ if (memcached_last_error(&const_cast<memcached_st&>(memc)) != rc)
	18	{
	19	return true;
	20	}
	21	@@ -59,7 +59,7 @@
	22
	23	inline bool operator!= (const memcached_return_t rc, const memcached_st& memc)
	24	{
	25	- if (memcached_last_error(&memc) != rc)
	26	+ if (memcached_last_error(&const_cast<memcached_st&>(memc)) != rc)
	27	{
	28	return true;
	29	}

Lines 13-45 Link Here

(-)./pkg-plist (-4 / +7 lines)
13	include/libgearman-1.0/execute.h	13	include/libgearman-1.0/execute.h
14	include/libgearman-1.0/function.h	14	include/libgearman-1.0/function.h
15	include/libgearman-1.0/gearman.h	15	include/libgearman-1.0/gearman.h
		16	include/libgearman-1.0/interface/client.h
		17	include/libgearman-1.0/interface/status.h
		18	include/libgearman-1.0/interface/task.h
		19	include/libgearman-1.0/interface/worker.h
16	include/libgearman-1.0/job.h	20	include/libgearman-1.0/job.h
17	include/libgearman-1.0/job_handle.h	21	include/libgearman-1.0/job_handle.h
18	include/libgearman-1.0/kill.h	22	include/libgearman-1.0/kill.h
19	include/libgearman-1.0/limits.h	23	include/libgearman-1.0/limits.h
20	include/libgearman-1.0/ostream.hpp	24	include/libgearman-1.0/ostream.hpp
21	include/libgearman-1.0/packet.h
22	include/libgearman-1.0/parse.h	25	include/libgearman-1.0/parse.h
23	include/libgearman-1.0/priority.h	26	include/libgearman-1.0/priority.h
24	include/libgearman-1.0/protocol.h	27	include/libgearman-1.0/protocol.h
25	include/libgearman-1.0/result.h	28	include/libgearman-1.0/result.h
26	include/libgearman-1.0/return.h	29	include/libgearman-1.0/return.h
27	include/libgearman-1.0/signal.h	30	include/libgearman-1.0/signal.h
		31	include/libgearman-1.0/status.h
28	include/libgearman-1.0/strerror.h	32	include/libgearman-1.0/strerror.h
29	include/libgearman-1.0/string.h	33	include/libgearman-1.0/string.h
30	include/libgearman-1.0/task.h	34	include/libgearman-1.0/task.h
31	include/libgearman-1.0/task_attr.h	35	include/libgearman-1.0/task_attr.h
32	include/libgearman-1.0/universal.h
33	include/libgearman-1.0/util.h	36	include/libgearman-1.0/util.h
34	include/libgearman-1.0/version.h	37	include/libgearman-1.0/version.h
35	include/libgearman-1.0/visibility.h	38	include/libgearman-1.0/visibility.h
36	include/libgearman-1.0/worker.h	39	include/libgearman-1.0/worker.h
37	include/libgearman/gearman.h	40	include/libgearman/gearman.h
38	lib/libgearman.a
39	lib/libgearman.la	41	lib/libgearman.la
40	lib/libgearman.so	42	lib/libgearman.so
41	lib/libgearman.so.6	43	lib/libgearman.so.8
42	libdata/pkgconfig/gearmand.pc	44	libdata/pkgconfig/gearmand.pc
43	sbin/gearmand	45	sbin/gearmand
		46	@dirrm include/libgearman-1.0/interface
44	@dirrm include/libgearman-1.0	47	@dirrm include/libgearman-1.0
45	@dirrm include/libgearman	48	@dirrm include/libgearman