[pkgsrc/trunk]: pkgsrc/devel/memcached Fix this the right way, thanks to joer...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a06b5ebf847c
branches:  trunk
changeset: 652014:a06b5ebf847c
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Thu May 21 22:21:08 2015 +0000

description:
Fix this the right way, thanks to joerg@. Noticed this is linking against
pthread too, so let's included that bl3.mk here as well.

diffstat:

 devel/memcached/Makefile                  |   3 ++-
 devel/memcached/PLIST                     |   3 ++-
 devel/memcached/distinfo                  |   4 ++--
 devel/memcached/patches/patch-memcached.c |  12 +++++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diffs (70 lines):

diff -r 3d15ba9652a1 -r a06b5ebf847c devel/memcached/Makefile
--- a/devel/memcached/Makefile  Thu May 21 20:44:06 2015 +0000
+++ b/devel/memcached/Makefile  Thu May 21 22:21:08 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2015/01/04 23:41:04 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2015/05/21 22:21:08 rodent Exp $
 
 DISTNAME=      memcached-1.4.22
 CATEGORIES=    devel
@@ -47,4 +47,5 @@
 
 .include "../../devel/libevent/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=       libevent>=1.0
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3d15ba9652a1 -r a06b5ebf847c devel/memcached/PLIST
--- a/devel/memcached/PLIST     Thu May 21 20:44:06 2015 +0000
+++ b/devel/memcached/PLIST     Thu May 21 22:21:08 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/03/11 14:05:01 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/05/21 22:21:08 rodent Exp $
 bin/memcached
 bin/memcached-tool
 include/memcached/protocol_binary.h
@@ -6,3 +6,4 @@
 share/doc/memcached/protocol.txt
 share/doc/memcached/readme.txt
 share/doc/memcached/threads.txt
+share/examples/rc.d/memcached
diff -r 3d15ba9652a1 -r a06b5ebf847c devel/memcached/distinfo
--- a/devel/memcached/distinfo  Thu May 21 20:44:06 2015 +0000
+++ b/devel/memcached/distinfo  Thu May 21 22:21:08 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2015/05/21 14:06:08 rodent Exp $
+$NetBSD: distinfo,v 1.24 2015/05/21 22:21:08 rodent Exp $
 
 SHA1 (memcached-1.4.22.tar.gz) = 5968d357d504a1f52622f9f8a3e85c29558acaa5
 RMD160 (memcached-1.4.22.tar.gz) = 2cde1cec77d312a118fbb74514021e95a3a84395
@@ -8,4 +8,4 @@
 SHA1 (patch-aa) = f1cf7fdf89e3dac1264385bdffb98b41b879462c
 SHA1 (patch-ab) = 76af28c72db1e2b15da61f04e64464d3b42c5c10
 SHA1 (patch-configure) = d44e07c0c38029df4f10bb5411049595b5a8ffbb
-SHA1 (patch-memcached.c) = 7c8b32fd54a880db599e8f8b34efb015939694cc
+SHA1 (patch-memcached.c) = 3c39c873332704c8d269de4a3c7049281bf101c6
diff -r 3d15ba9652a1 -r a06b5ebf847c devel/memcached/patches/patch-memcached.c
--- a/devel/memcached/patches/patch-memcached.c Thu May 21 20:44:06 2015 +0000
+++ b/devel/memcached/patches/patch-memcached.c Thu May 21 22:21:08 2015 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-memcached.c,v 1.1 2015/05/21 14:07:10 rodent Exp $
+$NetBSD: patch-memcached.c,v 1.2 2015/05/21 22:21:08 rodent Exp $
 
-Silences: format specifies type 'int' but the argument has type 'long'
+Fix this the right way thanks to joerg@.
 
 --- memcached.c.orig   2015-01-01 07:50:52.000000000 +0000
 +++ memcached.c
-@@ -2765,7 +2765,7 @@ static void process_stats_conns(ADD_STAT
+@@ -2764,8 +2764,8 @@ static void process_stats_conns(ADD_STAT
+                 APPEND_NUM_STAT(i, "addr", "%s", conn_name);
                  APPEND_NUM_STAT(i, "state", "%s",
                          state_text(conns[i]->state));
-                 APPEND_NUM_STAT(i, "secs_since_last_cmd", "%d",
+-                APPEND_NUM_STAT(i, "secs_since_last_cmd", "%d",
 -                        current_time - conns[i]->last_cmd_time);
-+                        (int)(current_time - conns[i]->last_cmd_time));
++                APPEND_NUM_STAT(i, "secs_since_last_cmd", "%jd",
++                        (intmax_t)(current_time - conns[i]->last_cmd_time));
              }
          }
      }