diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile index ed3387e3ffa1..0dc920905c1c 100644 --- a/databases/libmemcached/Makefile +++ b/databases/libmemcached/Makefile @@ -1,129 +1,127 @@ # New ports collection makefile for: libmemcached # Date created: January 22, 2008 # Whom: Yen-Ming Lee # # $FreeBSD$ # PORTNAME= libmemcached PORTVERSION= 0.37 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://download.tangent.org/ MAINTAINER= vanilla@FreeBSD.org COMMENT= A C and C++ client library to the memcached server -LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent - USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack gnometarget pkgconfig -CONFIGURE_ARGS= --with-memcached=no +CONFIGURE_ARGS= --with-memcached=no --disable-libevent --without-libevent-prefix post-patch: ${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = $${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in .if defined(NO_INSTALL_MANPAGES) ${REINPLACE_CMD} -e 's|^SUBDIRS = docs |SUBDIRS = |' ${WRKSRC}/Makefile.in .endif .if !defined(NO_INSTALL_MANPAGES) USE_PERL5_BUILD=yes # pod2man MAN1= memcapable.1 \ memcat.1 \ memcp.1 \ memdump.1 \ memerror.1 \ memflush.1 \ memrm.1 \ memslap.1 \ memstat.1 MAN3= hashkit_clone.3 \ hashkit_crc32.3 \ hashkit_create.3 \ hashkit_fnv1_32.3 \ hashkit_fnv1_64.3 \ hashkit_fnv1a_32.3 \ hashkit_fnv1a_64.3 \ hashkit_free.3 \ hashkit_functions.3 \ hashkit_hsieh.3 \ hashkit_is_allocated.3 \ hashkit_jenkins.3 \ hashkit_md5.3 \ hashkit_murmur.3 \ hashkit_value.3 \ libmemcached.3 \ libmemcachedutil.3 \ libmemcached_examples.3 \ memcached_add.3 \ memcached_add_by_key.3 \ memcached_analyze.3 \ memcached_append.3 \ memcached_append_by_key.3 \ memcached_behavior_get.3 \ memcached_behavior_set.3 \ memcached_callback_get.3 \ memcached_callback_set.3 \ memcached_cas.3 \ memcached_cas_by_key.3 \ memcached_clone.3 \ memcached_create.3 \ memcached_decrement.3 \ memcached_decrement_with_initial.3 \ memcached_delete.3 \ memcached_delete_by_key.3 \ memcached_dump.3 \ memcached_fetch.3 \ memcached_flush_buffers.3 \ memcached_fetch_execute.3 \ memcached_fetch_result.3 \ memcached_free.3 \ memcached_generate_hash_value.3 \ memcached_get.3 \ memcached_get_by_key.3 \ memcached_get_memory_allocators.3 \ memcached_get_user_data.3 \ memcached_increment.3 \ memcached_increment_with_initial.3 \ memcached_lib_version.3 \ memcached_mget.3 \ memcached_mget_by_key.3 \ memcached_mget_execute.3 \ memcached_mget_execute_by_key.3 \ memcached_pool_behavior_get.3 \ memcached_pool_behavior_set.3 \ memcached_pool_create.3 \ memcached_pool_destroy.3 \ memcached_pool_pop.3 \ memcached_pool_push.3 \ memcached_prepend.3 \ memcached_prepend_by_key.3 \ memcached_quit.3 \ memcached_replace.3 \ memcached_replace_by_key.3 \ memcached_server_add.3 \ memcached_server_count.3 \ memcached_server_cursor.3 \ memcached_server_list.3 \ memcached_server_list_append.3 \ memcached_server_list_count.3 \ memcached_server_list_free.3 \ memcached_server_push.3 \ memcached_servers_parse.3 \ memcached_set.3 \ memcached_set_by_key.3 \ memcached_set_memory_allocators.3 \ memcached_set_user_data.3 \ memcached_stat.3 \ memcached_stat_get_keys.3 \ memcached_stat_get_value.3 \ memcached_stat_servername.3 \ memcached_strerror.3 \ memcached_verbosity.3 \ memcached_version.3 .endif .include diff --git a/databases/libmemcached/files/patch-configure b/databases/libmemcached/files/patch-configure index dc9abf6967b7..c4f2e341429d 100644 --- a/databases/libmemcached/files/patch-configure +++ b/databases/libmemcached/files/patch-configure @@ -1,11 +1,35 @@ ---- configure.orig 2010-01-07 11:15:40.000000000 +0800 -+++ configure 2010-01-08 10:38:18.000000000 +0800 -@@ -22430,7 +22430,7 @@ $as_echo "$ac_cv_safe_to_use_Wno_attribu +--- configure.orig 2010-01-12 08:22:27.000000000 +0800 ++++ configure 2010-01-19 12:20:44.000000000 +0800 +@@ -22431,7 +22431,7 @@ $as_echo "$ac_cv_safe_to_use_Wno_attribu if test "$ac_cv_safe_to_use_Wno_attributes_" = "yes"; then - CC_WARNINGS="${CC_WARNINGS} -Wno-attributes" + CC_WARNINGS="${CC_WARNINGS}" NO_ATTRIBUTES="-Wno-attributes" fi +@@ -24391,10 +24391,10 @@ fi + { $as_echo "$as_me:$LINENO: result: $ac_cv_libevent" >&5 + $as_echo "$ac_cv_libevent" >&6; } + if test "$ac_cv_libevent" = yes; then +- HAVE_LIBEVENT=yes ++ HAVE_LIBEVENT=no + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_LIBEVENT 1 ++#define HAVE_LIBEVENT 0 + _ACEOF + + { $as_echo "$as_me:$LINENO: checking how to link with libevent" >&5 +@@ -24417,8 +24417,8 @@ $as_echo "$LIBEVENT" >&6; } + + + if test "x${ac_cv_libevent}" = "xyes"; then +- HAVE_LIBEVENT_TRUE= +- HAVE_LIBEVENT_FALSE='#' ++ HAVE_LIBEVENT_TRUE='#' ++ HAVE_LIBEVENT_FALSE= + else + HAVE_LIBEVENT_TRUE='#' + HAVE_LIBEVENT_FALSE= diff --git a/databases/libmemcached/pkg-plist b/databases/libmemcached/pkg-plist index 039ac3c73338..f0939e81eef8 100644 --- a/databases/libmemcached/pkg-plist +++ b/databases/libmemcached/pkg-plist @@ -1,58 +1,57 @@ bin/memcapable bin/memcat bin/memcp bin/memdump bin/memerror bin/memflush bin/memrm -bin/memslap bin/memstat include/libhashkit/algorithm.h include/libhashkit/behavior.h include/libhashkit/hashkit.h include/libhashkit/strerror.h include/libhashkit/types.h include/libhashkit/visibility.h include/libmemcached/analyze.h include/libmemcached/auto.h include/libmemcached/behavior.h include/libmemcached/callback.h include/libmemcached/configure.h include/libmemcached/constants.h include/libmemcached/dump.h include/libmemcached/exception.hpp include/libmemcached/get.h include/libmemcached/memcached.h include/libmemcached/memcached.hpp include/libmemcached/memcached_util.h include/libmemcached/memcached/protocol_binary.h include/libmemcached/protocol_handler.h include/libmemcached/protocol/cache.h include/libmemcached/protocol/callback.h include/libmemcached/result.h include/libmemcached/server.h include/libmemcached/stats.h include/libmemcached/storage.h include/libmemcached/string.h include/libmemcached/types.h include/libmemcached/util/pool.h include/libmemcached/visibility.h include/libmemcached/watchpoint.h lib/libhashkit.la lib/libhashkit.so lib/libhashkit.so.0 lib/libmemcached.la lib/libmemcached.so lib/libmemcached.so.4 lib/libmemcachedprotocol.la lib/libmemcachedprotocol.so lib/libmemcachedprotocol.so.0 lib/libmemcachedutil.la lib/libmemcachedutil.so lib/libmemcachedutil.so.0 libdata/pkgconfig/libmemcached.pc @dirrm include/libmemcached/util @dirrm include/libmemcached/protocol @dirrm include/libmemcached/memcached @dirrm include/libmemcached @dirrm include/libhashkit