OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 30-Jan-2009 09:08:19 Branch: HEAD Handle: 2009013008081900 Modified files: openpkg-src/memcached memcached.patch memcached.spec Log: modifying package: memcached-1.3.0 20081129 -> 20090130 Summary: Revision Changes Path 1.24 +37 -9 openpkg-src/memcached/memcached.patch 1.59 +3 -2 openpkg-src/memcached/memcached.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/memcached/memcached.patch ============================================================================ $ cvs diff -u -r1.23 -r1.24 memcached.patch --- openpkg-src/memcached/memcached.patch 29 Nov 2008 08:21:31 -0000 1.23 +++ openpkg-src/memcached/memcached.patch 30 Jan 2009 08:08:19 -0000 1.24 @@ -1,22 +1,50 @@ -Index: libmemcached-0.25/libmemcached/memcached.h ---- libmemcached-0.25/libmemcached/memcached.h.orig 2007-10-17 17:39:17 +0200 -+++ libmemcached-0.25/libmemcached/memcached.h 2007-10-28 09:22:00 +0100 +Index: Cache-Memcached-1.24/Makefile.PL +--- Cache-Memcached-1.24/Makefile.PL.orig 2009-01-30 08:59:11 +0100 ++++ Cache-Memcached-1.24/Makefile.PL 2009-01-30 08:59:11 +0100 +@@ -11,3 +11,4 @@ + AUTHOR => 'Brad Fitzpatrick <b...@danga.com>') : ()), + ); + ++ +Index: libmemcached-0.26/configure +--- libmemcached-0.26/configure.orig 2009-01-29 22:06:18 +0100 ++++ libmemcached-0.26/configure 2009-01-30 09:01:27 +0100 +@@ -21285,14 +21285,14 @@ + MEMC_BINARY="$withval" + fi + +- if test x$withval == xyes ++ if test x$withval = xyes + then + MEMC_BINARY=memcached + fi + + # just ignore the user if --without-memcached is passed.. it is + # only used by make test +- if test x$withval == xno ++ if test x$withval = xno + then + MEMC_BINARY=memcached + fi +Index: libmemcached-0.26/libmemcached/memcached.h +--- libmemcached-0.26/libmemcached/memcached.h.orig 2009-01-29 21:29:50 +0100 ++++ libmemcached-0.26/libmemcached/memcached.h 2009-01-30 08:59:04 +0100 @@ -10,6 +10,7 @@ #ifndef __MEMCACHED_H__ #define __MEMCACHED_H__ +#include <sys/types.h> #include <stdlib.h> - #include <stdint.h> - + #include <inttypes.h> + #if !defined(__cplusplus) Index: memcached-1.3.0/memcached.h ---- memcached-1.3.0/memcached.h.orig 2007-06-20 03:21:51 +0200 -+++ memcached-1.3.0/memcached.h 2007-10-28 09:17:17 +0100 -@@ -5,6 +5,7 @@ +--- memcached-1.3.0/memcached.h.orig 2008-03-30 10:40:44 +0200 ++++ memcached-1.3.0/memcached.h 2009-01-30 08:59:04 +0100 +@@ -8,6 +8,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> +#include <sys/socket.h> #include <netinet/in.h> #include <event.h> - + #include <netdb.h> @@ . patch -p0 <<'@@ .' Index: openpkg-src/memcached/memcached.spec ============================================================================ $ cvs diff -u -r1.58 -r1.59 memcached.spec --- openpkg-src/memcached/memcached.spec 29 Nov 2008 08:21:31 -0000 1.58 +++ openpkg-src/memcached/memcached.spec 30 Jan 2009 08:08:19 -0000 1.59 @@ -24,7 +24,7 @@ # package versions %define V_memcached 1.3.0 %define V_libmemcache 1.4.0.rc2 -%define V_libmemcached 0.25 +%define V_libmemcached 0.26 %define V_cache_memcached 1.24 # package information @@ -38,7 +38,7 @@ Group: System License: GPL Version: %{V_memcached} -Release: 20081129 +Release: 20090130 # list of sources Source0: http://www.danga.com/memcached/dist/memcached-%{V_memcached}.tar.gz @@ -134,6 +134,7 @@ ./configure \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ + --without-memcached \ --disable-shared %{l_make} %{l_mflags -O} ) || exit $? @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org