Date: Thu, 13 Sep 2012 15:46:50 +0800 (CST) From: Gasol Wu <gasol.wu@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: glarkin@FreeBSD.org Subject: ports/171593: [PATCH] devel/gearmand: update to 1.1.0 Message-ID: <20120913074650.A3C987478EC@goingmarry.kkbox.com> Resent-Message-ID: <201209130800.q8D80IGE078927@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171593 >Category: ports >Synopsis: [PATCH] devel/gearmand: update to 1.1.0 >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: Thu Sep 13 08:00:18 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Gasol Wu >Release: FreeBSD 9.1-RC1 amd64 >Organization: >Environment: System: FreeBSD goingmarry 9.1-RC1 FreeBSD 9.1-RC1 #0: Tue Aug 14 04:25:06 UTC 2012 >Description: - Update to 1.1.0 Added file(s): - files/patch-configure.ac - files/patch-libtest__memcached.hpp - files/patch-support__include.am Removed file(s): - files/extra-patch-libtest__test.cc - files/patch-configure Port maintainer (glarkin@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports) >How-To-Repeat: >Fix: --- gearmand-1.1.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/gearmand/Makefile ./Makefile --- /usr/ports/devel/gearmand/Makefile 2012-08-06 07:19:36.000000000 +0800 +++ ./Makefile 2012-09-13 15:43:34.045243000 +0800 @@ -6,33 +6,33 @@ # PORTNAME= gearmand -PORTVERSION= 0.26 +PORTVERSION= 1.1.0 CATEGORIES= devel -MASTER_SITES= http://launchpad.net/gearmand/trunk/${PORTVERSION}/+download/ \ - LOCAL/glarkin +MASTER_SITES= https://launchpad.net/gearmand/1.2/${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 + 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 \ - REDIS "Enable Redis support for persistent queue" off \ - TOKYOCAB "Enable Tokyo Cabinet support for persistent queue" off + TOKYOCAB "Enable Tokyo Cabinet support for persistent queue" off \ + MYSQL "Enable MySQL support for persistent queue" off MAN1= gearadmin.1 \ gearman.1 @@ -191,12 +191,16 @@ .include <bsd.port.pre.mk> -# Workaround for missing sigignore that wasn't introduced until -# FreeBSD 8.0 -.if ${OSVERSION} < 800500 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libtest__test.cc +.if ${OSVERSION} < 800000 +BROKEN= does not compile on FreeBSD 7.x .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) @@ -242,11 +246,10 @@ CONFIGURE_ARGS+= --disable-libtokyocabinet .endif -.ifdef(WITH_REDIS) -LIB_DEPENDS+= hiredis:${PORTSDIR}/databases/hiredis -CONFIGURE_ARGS+= --with-libhiredis-prefix=${LOCALBASE} +.ifdef(WITH_MYSQL) +USE_MYSQL= yes .else -CONFIGURE_ARGS+= --without-libhiredis-prefix +CONFIGURE_ARGS+= --without-mysql .endif .include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/devel/gearmand/distinfo ./distinfo --- /usr/ports/devel/gearmand/distinfo 2012-01-14 05:59:09.000000000 +0800 +++ ./distinfo 2012-09-12 10:08:34.470710000 +0800 @@ -1,2 +1,2 @@ -SHA256 (gearmand-0.26.tar.gz) = 79ae2233bafe8f092ebf4157f83c2e0535a1fe1765da04cb01f34bcdf520dd33 -SIZE (gearmand-0.26.tar.gz) = 773491 +SHA256 (gearmand-1.1.0.tar.gz) = a6500f8cd88c874ef500603903f58f931a7c68838a0aba935d50ff93d76338cd +SIZE (gearmand-1.1.0.tar.gz) = 841690 diff -ruN --exclude=CVS /usr/ports/devel/gearmand/files/extra-patch-libtest__test.cc ./files/extra-patch-libtest__test.cc --- /usr/ports/devel/gearmand/files/extra-patch-libtest__test.cc 2012-02-04 05:40:00.000000000 +0800 +++ ./files/extra-patch-libtest__test.cc 1970-01-01 08:00:00.000000000 +0800 @@ -1,14 +0,0 @@ ---- ./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()) diff -ruN --exclude=CVS /usr/ports/devel/gearmand/files/patch-configure ./files/patch-configure --- /usr/ports/devel/gearmand/files/patch-configure 2012-01-17 04:18:06.000000000 +0800 +++ ./files/patch-configure 1970-01-01 08:00:00.000000000 +0800 @@ -1,10 +0,0 @@ ---- ./configure.orig 2012-01-16 15:07:46.000000000 -0500 -+++ ./configure 2012-01-16 15:08:21.000000000 -0500 -@@ -23441,6 +23441,7 @@ - | sed -e 's/"//'` - if test $ac_sqlite3_version != ""; then - SQLITE3_VERSION=$ac_sqlite3_version -+ ac_cv_libsqlite3=yes - 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;} diff -ruN --exclude=CVS /usr/ports/devel/gearmand/files/patch-configure.ac ./files/patch-configure.ac --- /usr/ports/devel/gearmand/files/patch-configure.ac 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-configure.ac 2012-09-13 12:08:44.686506000 +0800 @@ -0,0 +1,11 @@ +remove -Werror in CXXFLAGS +--- ./configure.ac.orig 2012-09-06 10:41:35.000000000 +0800 ++++ ./configure.ac 2012-09-13 11:53:59.796281000 +0800 +@@ -35,6 +35,7 @@ + # +- increment if interfaces have been added, removed or changed + AC_SUBST(GEARMAN_LIBRARY_VERSION) + ++ax_cv_check_cxxflags___Werror=false + LT_PREREQ([2.4]) + LT_INIT([disable-static]) + LT_LANG([C++]) diff -ruN --exclude=CVS /usr/ports/devel/gearmand/files/patch-libtest__memcached.hpp ./files/patch-libtest__memcached.hpp --- /usr/ports/devel/gearmand/files/patch-libtest__memcached.hpp 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-libtest__memcached.hpp 2012-09-13 12:08:18.590629000 +0800 @@ -0,0 +1,29 @@ +--- ./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; + } diff -ruN --exclude=CVS /usr/ports/devel/gearmand/files/patch-support__include.am ./files/patch-support__include.am --- /usr/ports/devel/gearmand/files/patch-support__include.am 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-support__include.am 2012-09-13 12:08:18.568648000 +0800 @@ -0,0 +1,9 @@ +--- ./support/include.am.orig 2012-09-13 12:07:40.791463000 +0800 ++++ ./support/include.am 2012-09-13 12:08:07.579647000 +0800 +@@ -7,5 +7,5 @@ + support/gearmand.pc \ + support/gearmand.spec + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = support/gearmand.pc diff -ruN --exclude=CVS /usr/ports/devel/gearmand/pkg-plist ./pkg-plist --- /usr/ports/devel/gearmand/pkg-plist 2012-01-14 05:59:09.000000000 +0800 +++ ./pkg-plist 2012-09-13 12:19:15.538038000 +0800 @@ -13,33 +13,36 @@ 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.6 +lib/libgearman.so.8 libdata/pkgconfig/gearmand.pc sbin/gearmand +@dirrm include/libgearman-1.0/interface @dirrm include/libgearman-1.0 @dirrm include/libgearman --- gearmand-1.1.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120913074650.A3C987478EC>