[pkgsrc/trunk]: pkgsrc/devel/memcached Add patch to silence compilation warni...

[rodent <rodent%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/93817b289028
branches:  trunk
changeset: 652007:93817b289028
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Thu May 21 14:06:08 2015 +0000

description:
Add patch to silence compilation warning found on NetBSD with gcc and
FreeBSD with clang: format specifies type 'int' but the argument has type 'long'
This seems to be fallout from the time_t change patches. Defuzz patches
while we're here.

diffstat:

 devel/memcached/distinfo                  |  11 ++++++-----
 devel/memcached/patches/patch-Makefile.am |   6 +++---
 devel/memcached/patches/patch-Makefile.in |   8 ++++----
 devel/memcached/patches/patch-aa          |   8 ++++----
 devel/memcached/patches/patch-ab          |   6 +++---
 devel/memcached/patches/patch-memcached.c |  15 +++++++++++++++
 6 files changed, 35 insertions(+), 19 deletions(-)

diffs (126 lines):

diff -r 0f4cf9cea5f8 -r 93817b289028 devel/memcached/distinfo
--- a/devel/memcached/distinfo  Thu May 21 13:20:57 2015 +0000
+++ b/devel/memcached/distinfo  Thu May 21 14:06:08 2015 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.22 2015/03/26 10:16:14 jperkin Exp $
+$NetBSD: distinfo,v 1.23 2015/05/21 14:06:08 rodent Exp $
 
 SHA1 (memcached-1.4.22.tar.gz) = 5968d357d504a1f52622f9f8a3e85c29558acaa5
 RMD160 (memcached-1.4.22.tar.gz) = 2cde1cec77d312a118fbb74514021e95a3a84395
 Size (memcached-1.4.22.tar.gz) = 346632 bytes
-SHA1 (patch-Makefile.am) = c8e6c2f4c7ce8264c2b4dcad6445248264a8fa9e
-SHA1 (patch-Makefile.in) = e71671670abd24440fc9ce783b0c6be8adf6c27c
-SHA1 (patch-aa) = 43803d05d1da91440f6619b321c3e1ff4fcb8e2f
-SHA1 (patch-ab) = a870c803752bca12550da73d19ee0e675b5e576d
+SHA1 (patch-Makefile.am) = 184b10f693f7aa85e3a5922790d1d2c1451c0329
+SHA1 (patch-Makefile.in) = 4c21920e41bdad77dc8ff39c62001aea0d73c78a
+SHA1 (patch-aa) = f1cf7fdf89e3dac1264385bdffb98b41b879462c
+SHA1 (patch-ab) = 76af28c72db1e2b15da61f04e64464d3b42c5c10
 SHA1 (patch-configure) = d44e07c0c38029df4f10bb5411049595b5a8ffbb
+SHA1 (patch-memcached.c) = 7c8b32fd54a880db599e8f8b34efb015939694cc
diff -r 0f4cf9cea5f8 -r 93817b289028 devel/memcached/patches/patch-Makefile.am
--- a/devel/memcached/patches/patch-Makefile.am Thu May 21 13:20:57 2015 +0000
+++ b/devel/memcached/patches/patch-Makefile.am Thu May 21 14:06:08 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.am,v 1.1 2012/10/03 10:46:47 asau Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2015/05/21 14:07:10 rodent Exp $
 
 List test prerequisite.
 
---- Makefile.am.orig   2012-01-06 18:19:50.000000000 +0000
+--- Makefile.am.orig   2015-01-01 06:49:53.000000000 +0000
 +++ Makefile.am
-@@ -73,7 +73,7 @@ EXTRA_DIST = doc scripts t memcached.spe
+@@ -75,7 +75,7 @@ EXTRA_DIST = doc scripts t memcached.spe
  
  MOSTLYCLEANFILES = *.gcov *.gcno *.gcda *.tcov
  
diff -r 0f4cf9cea5f8 -r 93817b289028 devel/memcached/patches/patch-Makefile.in
--- a/devel/memcached/patches/patch-Makefile.in Thu May 21 13:20:57 2015 +0000
+++ b/devel/memcached/patches/patch-Makefile.in Thu May 21 14:06:08 2015 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.3 2014/04/25 09:27:37 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2015/05/21 14:07:10 rodent Exp $
 
 Don't build programs that won't be installed
 List test prerequisite.
 
---- Makefile.in.orig   2014-04-17 23:11:27.000000000 +0000
+--- Makefile.in.orig   2015-01-01 07:53:30.000000000 +0000
 +++ Makefile.in
-@@ -68,7 +68,7 @@ CONFIG_HEADER = config.h
+@@ -112,7 +112,7 @@ CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"
@@ -14,7 +14,7 @@
  am__memcached_SOURCES_DIST = memcached.c memcached.h hash.c hash.h \
        jenkins_hash.c jenkins_hash.h murmur3_hash.c murmur3_hash.h \
        slabs.c slabs.h items.c items.h assoc.c assoc.h thread.c \
-@@ -1372,7 +1372,7 @@ memcached_dtrace.o: $(memcached_OBJECTS)
+@@ -1478,7 +1478,7 @@ memcached_dtrace.o: $(memcached_OBJECTS)
  memcached_debug_dtrace.o: $(memcached_debug_OBJECTS)
        $(DTRACE) $(DTRACEFLAGS) -G -o memcached_debug_dtrace.o -s ${srcdir}/memcached_dtrace.d $(memcached_debug_OBJECTS)
  
diff -r 0f4cf9cea5f8 -r 93817b289028 devel/memcached/patches/patch-aa
--- a/devel/memcached/patches/patch-aa  Thu May 21 13:20:57 2015 +0000
+++ b/devel/memcached/patches/patch-aa  Thu May 21 14:06:08 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.7 2014/04/25 09:27:37 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2015/05/21 14:07:10 rodent Exp $
 
 time_t changes
 
---- items.c.orig       2014-04-17 22:59:33.000000000 +0000
+--- items.c.orig       2015-01-01 07:50:52.000000000 +0000
 +++ items.c
-@@ -409,9 +409,9 @@ char *do_item_cachedump(const unsigned i
+@@ -440,9 +440,9 @@ char *do_item_cachedump(const unsigned i
          /* Copy the key since it may not be null-terminated in the struct */
          strncpy(key_temp, ITEM_key(it), it->nkey);
          key_temp[it->nkey] = 0x00; /* terminate */
@@ -16,7 +16,7 @@
          if (bufcurr + len + 6 > memlimit)  /* 6 is END\r\n\0 */
              break;
          memcpy(buffer + bufcurr, temp, len);
-@@ -472,13 +472,13 @@ void do_item_stats(ADD_STAT add_stats, v
+@@ -506,13 +506,13 @@ void do_item_stats(ADD_STAT add_stats, v
                  continue;
              }
              APPEND_NUM_FMT_STAT(fmt, i, "number", "%u", sizes[i]);
diff -r 0f4cf9cea5f8 -r 93817b289028 devel/memcached/patches/patch-ab
--- a/devel/memcached/patches/patch-ab  Thu May 21 13:20:57 2015 +0000
+++ b/devel/memcached/patches/patch-ab  Thu May 21 14:06:08 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.8 2012/02/25 20:52:53 mspo Exp $
+$NetBSD: patch-ab,v 1.9 2015/05/21 14:07:10 rodent Exp $
 
 time_t changes
 
---- memcached.h.orig   2011-08-10 04:53:38.000000000 +0000
+--- memcached.h.orig   2015-01-01 07:50:52.000000000 +0000
 +++ memcached.h
-@@ -199,7 +199,7 @@ enum delta_result_type {
+@@ -213,7 +213,7 @@ enum delta_result_type {
  };
  
  /** Time relative to server start. Smaller than time_t on 64-bit systems. */
diff -r 0f4cf9cea5f8 -r 93817b289028 devel/memcached/patches/patch-memcached.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/memcached/patches/patch-memcached.c Thu May 21 14:06:08 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-memcached.c,v 1.1 2015/05/21 14:07:10 rodent Exp $
+
+Silences: format specifies type 'int' but the argument has type 'long'
+
+--- memcached.c.orig   2015-01-01 07:50:52.000000000 +0000
++++ memcached.c
+@@ -2765,7 +2765,7 @@ static void process_stats_conns(ADD_STAT
+                 APPEND_NUM_STAT(i, "state", "%s",
+                         state_text(conns[i]->state));
+                 APPEND_NUM_STAT(i, "secs_since_last_cmd", "%d",
+-                        current_time - conns[i]->last_cmd_time);
++                        (int)(current_time - conns[i]->last_cmd_time));
+             }
+         }
+     }