Index: head/databases/libmemcached/Makefile =================================================================== --- head/databases/libmemcached/Makefile (revision 443018) +++ head/databases/libmemcached/Makefile (revision 443019) @@ -1,63 +1,63 @@ # $FreeBSD$ PORTNAME= libmemcached PORTVERSION= 1.0.18 PORTREVISION= 6 CATEGORIES= databases MASTER_SITES= http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/ MAINTAINER= m.tsatsenko@gmail.com COMMENT= C and C++ client library to the memcached server LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS?= libevent.so:devel/libevent TEST_DEPENDS= memcached:databases/memcached USES= autoreconf execinfo gmake libtool localbase pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-memcached \ --without-sphinx-build \ --enable-libmemcachedprotocol -LIBS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -L${LOCALBASE}/lib -lexecinfo -lthr CXXFLAGS+= -D__STDC_CONSTANT_MACROS OPTIONS_DEFINE= DEBUG DTRACE MEMASLAP SASL OPTIONS_DEFAULT= MEMASLAP SASL MURMUR FNV64 OPTIONS_GROUP= HASH OPTIONS_GROUP_HASH= FNV64 HSIEH MURMUR DTRACE_DESC= Enable DTrace support MEMASLAP_DESC= Load generation and benchmark tool FNV64_DESC= Enable fnv64 hashing HSIEH_DESC= Enable hsieh hashing MURMUR_DESC= Enable murmur hashing DEBUG_CONFIGURE_ENABLE= debug DTRACE_CONFIGURE_ENABLE= dtrace MEMASLAP_CONFIGURE_ENABLE= memaslap FNV64_CONFIGURE_ENABLE= fnv64_hash HSIEH_CONFIGURE_ENABLE= hsieh_hash MURMUR_CONFIGURE_ENABLE= murmur_hash SASL_CONFIGURE_ENABLE= sasl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 PATHFIX_MAKEFILEIN= include.am post-patch: @${REINPLACE_CMD} -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} '/MAKE.*man/d' ${WRKSRC}/man/include.am post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* regression-test: build @cd ${WRKSRC} && ${GMAKE} check .include Index: head/databases/libmemcached/files/patch-log.hpp =================================================================== --- head/databases/libmemcached/files/patch-log.hpp (revision 443018) +++ head/databases/libmemcached/files/patch-log.hpp (nonexistent) @@ -1,10 +0,0 @@ ---- util/log.hpp.orig 2012-04-22 19:10:08.624721461 +0200 -+++ util/log.hpp 2012-04-22 19:11:43.651275813 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - #define UTIL_MAX_ERROR_SIZE 2048 Property changes on: head/databases/libmemcached/files/patch-log.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/libmemcached/files/patch-bug1400560 =================================================================== --- head/databases/libmemcached/files/patch-bug1400560 (revision 443018) +++ head/databases/libmemcached/files/patch-bug1400560 (nonexistent) @@ -1,29 +0,0 @@ -Fixed a bug that caused configure to disobey the enable/disable debug flag. The debug flag will default to disabled if not specified. -diff -ru libmemcached-1.0.18-orig/m4/ax_debug.m4 libmemcached-1.0.18/m4/ax_debug.m4 ---- m4/ax_debug.m4 2014-11-05 14:43:53.720284916 -0600 -+++ m4/ax_debug.m4 2014-11-19 14:23:19.512482198 -0600 -@@ -49,16 +49,18 @@ - [AC_PREREQ([2.63])dnl - AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], -- [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], -- [ax_enable_debug=yes -+ [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])]) -+ AS_IF([test "x$enable_debug" = "xyes"], [ -+ ax_enable_debug=yes - AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.]) - AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])]) - AX_ADD_AM_MACRO([--debug],[AM_YFLAGS]) -- AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])], -- [ax_enable_debug=no -+ AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS]) -+ ], [ -+ ax_enable_debug=no - AC_SUBST([MCHECK]) -- AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])]) -- -+ AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.]) -+ ]) - AC_MSG_CHECKING([for debug]) - AC_MSG_RESULT([$ax_enable_debug]) - AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])]) Property changes on: head/databases/libmemcached/files/patch-bug1400560 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/libmemcached/files/patch-bug1245562 =================================================================== --- head/databases/libmemcached/files/patch-bug1245562 (revision 443018) +++ head/databases/libmemcached/files/patch-bug1245562 (revision 443019) @@ -1,38 +1,34 @@ -diff --git a/clients/memflush.cc b/clients/memflush.cc -index 8bd0dbf..cdba743 100644 ---- clients/memflush.cc +--- clients/memflush.cc.orig 2014-02-09 11:52:42 UTC +++ clients/memflush.cc @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { options_parse(argc, argv); - if (opt_servers == false) + if (opt_servers == NULL) { char *temp; @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) opt_servers= strdup(temp); } - if (opt_servers == false) + if (opt_servers == NULL) { std::cerr << "No Servers provided" << std::endl; exit(EXIT_FAILURE); -diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h -index bc16e73..dcee395 100644 ---- libmemcached-1.0/memcached.h +--- libmemcached-1.0/memcached.h.orig 2014-02-09 11:52:42 UTC +++ libmemcached-1.0/memcached.h @@ -43,7 +43,11 @@ #endif #ifdef __cplusplus +#ifdef _LIBCPP_VERSION # include +#else +# include +#endif # include # include #else Index: head/databases/libmemcached/files/patch-libmemcached_assert.hpp =================================================================== --- head/databases/libmemcached/files/patch-libmemcached_assert.hpp (revision 443018) +++ head/databases/libmemcached/files/patch-libmemcached_assert.hpp (revision 443019) @@ -1,13 +1,13 @@ ---- libmemcached/assert.hpp.orig 2014-12-10 05:16:11 UTC +--- libmemcached/assert.hpp.orig 2014-02-09 11:52:42 UTC +++ libmemcached/assert.hpp @@ -51,8 +51,10 @@ # ifdef _WIN32 # include # else +#ifdef HAVE_ALLOCA_H # include # endif +# endif #ifdef __cplusplus # include Index: head/databases/libmemcached/files/patch-libtest_lite.h =================================================================== --- head/databases/libmemcached/files/patch-libtest_lite.h (revision 443018) +++ head/databases/libmemcached/files/patch-libtest_lite.h (revision 443019) @@ -1,13 +1,13 @@ ---- libtest/lite.h.orig 2014-12-09 03:34:21 UTC +--- libtest/lite.h.orig 2014-02-09 11:52:42 UTC +++ libtest/lite.h @@ -54,8 +54,10 @@ #if defined(WIN32) # include #else +#ifdef HAVE_ALLOCA_H # include #endif +#endif #ifndef __PRETTY_FUNCTION__ # define __PRETTY_FUNCTION__ __func__ Index: head/databases/libmemcached/files/patch-m4_ax__debug.m4 =================================================================== --- head/databases/libmemcached/files/patch-m4_ax__debug.m4 (nonexistent) +++ head/databases/libmemcached/files/patch-m4_ax__debug.m4 (revision 443019) @@ -0,0 +1,28 @@ +Fixed a bug that caused configure to disobey the enable/disable debug flag. The debug flag will default to disabled if not specified. +--- m4/ax_debug.m4.orig 2014-02-09 11:52:42 UTC ++++ m4/ax_debug.m4 +@@ -49,16 +49,18 @@ AC_DEFUN([AX_DEBUG], + [AC_PREREQ([2.63])dnl + AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], +- [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], +- [ax_enable_debug=yes ++ [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])]) ++ AS_IF([test "x$enable_debug" = "xyes"], [ ++ ax_enable_debug=yes + AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.]) + AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])]) + AX_ADD_AM_MACRO([--debug],[AM_YFLAGS]) +- AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])], +- [ax_enable_debug=no ++ AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS]) ++ ], [ ++ ax_enable_debug=no + AC_SUBST([MCHECK]) +- AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])]) +- ++ AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.]) ++ ]) + AC_MSG_CHECKING([for debug]) + AC_MSG_RESULT([$ax_enable_debug]) + AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])]) Property changes on: head/databases/libmemcached/files/patch-m4_ax__debug.m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/libmemcached/files/patch-util_log.hpp =================================================================== --- head/databases/libmemcached/files/patch-util_log.hpp (nonexistent) +++ head/databases/libmemcached/files/patch-util_log.hpp (revision 443019) @@ -0,0 +1,10 @@ +--- util/log.hpp.orig 2014-02-09 11:52:42 UTC ++++ util/log.hpp +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + #include + + #define UTIL_MAX_ERROR_SIZE 2048 Property changes on: head/databases/libmemcached/files/patch-util_log.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property