mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-29 01:13:08 +00:00
- Updated to 1.0.6 (1.1.x versions will reside in devel/gearman-devel soon)
- Trimmed Makefile header - Added patches to work around missing alloca.h - Added CONFLICTS to p5-Gearman-Server for gearmand 1.0.* and 1.1.*
This commit is contained in:
Greg Larkin
parent
88f91d3078
commit
e8bdd4e827
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=323181
@ -1,12 +1,8 @@
|
||||
# New ports collection makefile for: gearmand
|
||||
# Date created: 2009-01-29
|
||||
# Whom: Gea-Suan Lin <gslin@gslin.org>
|
||||
#
|
||||
# Created by: Gea-Suan Lin <gslin@gslin.org>
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= gearmand
|
||||
PORTVERSION= 0.41
|
||||
PORTVERSION= 1.0.6
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/
|
||||
|
||||
@ -20,7 +16,7 @@ LIB_DEPENDS= event:${PORTSDIR}/devel/libevent \
|
||||
uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
|
||||
execinfo:${PORTSDIR}/devel/libexecinfo
|
||||
|
||||
CONFLICTS= p5-Gearman-Server-1.*
|
||||
CONFLICTS= p5-Gearman-Server-1.* gearmand-1.1.*
|
||||
|
||||
.if defined(MAINTAINER_MODE) && ${MAINTAINER_MODE:Myes}
|
||||
UID_FILES= ../../UIDs
|
||||
@ -198,6 +194,7 @@ MAN3= gearman_actions_t.3 \
|
||||
gearman_worker_remove_options.3 \
|
||||
gearman_worker_remove_servers.3 \
|
||||
gearman_worker_set_context.3 \
|
||||
gearman_worker_set_identifier.3 \
|
||||
gearman_worker_set_log_fn.3 \
|
||||
gearman_worker_set_memory_allocators.3 \
|
||||
gearman_worker_set_namespace.3 \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gearmand-0.41.tar.gz) = eda6bc1f66a8f8d66394744b31ea975bd55f7ef2dfcc3698d7f9835a06ceb875
|
||||
SIZE (gearmand-0.41.tar.gz) = 851863
|
||||
SHA256 (gearmand-1.0.6.tar.gz) = 52def140a4454d9729fbc0444a49f2c54256f6f6e65168461af12256bfd5d115
|
||||
SIZE (gearmand-1.0.6.tar.gz) = 935050
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- ./configure.orig 2012-10-03 15:37:17.000000000 -0400
|
||||
+++ ./configure 2012-10-03 15:37:17.000000000 -0400
|
||||
@@ -19021,7 +19021,7 @@
|
||||
--- ./configure.orig 2013-07-17 10:46:57.000000000 -0400
|
||||
+++ ./configure 2013-07-17 10:46:57.000000000 -0400
|
||||
@@ -17972,7 +17972,7 @@
|
||||
|
||||
else
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
CURL_CFLAGS="`$CURL_CONFIG $curl_config_args --cflags`"
|
||||
|
||||
@@ -19031,7 +19031,7 @@
|
||||
@@ -17982,7 +17982,7 @@
|
||||
|
||||
fi
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
CURL_LIBS="`$CURL_CONFIG $curl_config_args --libs`"
|
||||
|
||||
@@ -19842,6 +19842,7 @@
|
||||
@@ -18667,6 +18667,7 @@
|
||||
| sed -e 's/"//'`
|
||||
if test $ac_sqlite3_version != ""; then
|
||||
SQLITE3_VERSION=$ac_sqlite3_version
|
||||
@ -26,3 +26,14 @@
|
||||
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;}
|
||||
@@ -23849,8 +23850,8 @@
|
||||
LIBS="$PTHREAD_LIBS"
|
||||
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_compile='$CC -c $CFLAGS $CPPFLAGS -Werror conftest.$ac_ext >&5'
|
||||
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS -Werror $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
|
||||
11
devel/gearmand/files/patch-libgearman-server__log.cc
Normal file
11
devel/gearmand/files/patch-libgearman-server__log.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- ./libgearman-server/log.cc.orig 2013-05-04 05:34:54.000000000 -0400
|
||||
+++ ./libgearman-server/log.cc 2013-07-17 10:46:57.000000000 -0400
|
||||
@@ -56,6 +56,8 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <malloc.h>
|
||||
+#elif defined(__FreeBSD__)
|
||||
+# include <stdlib.h>
|
||||
#else
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
@ -0,0 +1,17 @@
|
||||
--- ./libgearman-server/plugins/queue/redis/queue.cc.orig 2013-07-17 10:53:36.000000000 -0400
|
||||
+++ ./libgearman-server/plugins/queue/redis/queue.cc 2013-07-17 10:53:49.000000000 -0400
|
||||
@@ -271,14 +271,11 @@
|
||||
assert(fmt_str_length != 1);
|
||||
return gearmand_gerror("snprintf() failed to produce a valud fmt_str for redis key", GEARMAN_QUEUE_ERROR);
|
||||
}
|
||||
-#pragma GCC diagnostic push
|
||||
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
|
||||
int ret= sscanf(reply->element[x]->str,
|
||||
fmt_str,
|
||||
prefix,
|
||||
function_name,
|
||||
unique);
|
||||
-#pragma GCC diagnostic pop
|
||||
if (ret == 0)
|
||||
{
|
||||
continue;
|
||||
11
devel/gearmand/files/patch-libtest__lite.h
Normal file
11
devel/gearmand/files/patch-libtest__lite.h
Normal file
@ -0,0 +1,11 @@
|
||||
--- ./libtest/lite.h.orig 2013-05-03 00:58:08.000000000 -0400
|
||||
+++ ./libtest/lite.h 2013-07-17 10:46:57.000000000 -0400
|
||||
@@ -53,6 +53,8 @@
|
||||
|
||||
#if defined(WIN32)
|
||||
# include <malloc.h>
|
||||
+#elif defined(__FreeBSD__)
|
||||
+# include <stdlib.h>
|
||||
#else
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
@ -1,9 +1,5 @@
|
||||
# New ports collection makefile for: p5-Gearman-Server
|
||||
# Date created: 2007-09-03
|
||||
# Whom: Tomoyuki Sakurai <cherry@trombik.org>
|
||||
#
|
||||
# Created by: Tomoyuki Sakurai <cherry@trombik.org>
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= Gearman-Server
|
||||
PORTVERSION= 1.11
|
||||
@ -19,7 +15,7 @@ COMMENT= Gearman server daemon
|
||||
RUN_DEPENDS= p5-Gearman>=1.10:${PORTSDIR}/devel/p5-Gearman \
|
||||
p5-Danga-Socket>=1.52:${PORTSDIR}/devel/p5-Danga-Socket
|
||||
|
||||
CONFLICTS= gearmand-0.*
|
||||
CONFLICTS= gearmand-0.* gearmand-1.0.* gearmand-1.1.*
|
||||
|
||||
PERL_CONFIGURE= yes
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user