Update beanstalkd version to 1.10

[Keke Pierre <kethzer.dr%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Keke Pierre <kethzer.dr%gmail.com@localhost>
Pushed By:	kethzer.dr
Date:		Wed Nov 18 18:13:47 2015 -0400
Changeset:	272eab453a9506f6f41353ed9d71094228b3f2ae

Modified Files:
	beanstalkd/Makefile
	beanstalkd/distinfo
	beanstalkd/patches/patch-Makefile
	beanstalkd/patches/patch-darwin.c

Log Message:
Update beanstalkd version to 1.10

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=272eab453a9506f6f41353ed9d71094228b3f2ae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 beanstalkd/Makefile               | 10 ++++++----
 beanstalkd/distinfo               | 11 +++++------
 beanstalkd/patches/patch-Makefile | 11 +++++------
 beanstalkd/patches/patch-darwin.c | 14 +++++++++++---
 4 files changed, 27 insertions(+), 19 deletions(-)

diffs:
diff --git a/beanstalkd/Makefile b/beanstalkd/Makefile
index db4e149..fef949d 100644
--- a/beanstalkd/Makefile
+++ b/beanstalkd/Makefile
@@ -1,11 +1,13 @@
 # $NetBSD: Makefile,v 1.3 2014/06/01 12:49:34 thomasklausner Exp $
 #
 
-DISTNAME=	v1.9
-PKGNAME=	beanstalkd${DISTNAME:S/v/-/1}
-PKGREVISION=	1
+GITHUB_TAG=	v1.10
+GITHUB_PROJECT=	beanstalkd
+DISTNAME=	${GITHUB_TAG}
+PKGNAME=	${GITHUB_PROJECT}${DISTNAME:S/v/-/1}
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/kr/beanstalkd/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=kr/}
+DIST_SUBDIR=	${PKGBASE}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://kr.github.io/beanstalkd/
diff --git a/beanstalkd/distinfo b/beanstalkd/distinfo
index 90fd7cc..e3a57ea 100644
--- a/beanstalkd/distinfo
+++ b/beanstalkd/distinfo
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.1 2014/01/03 05:31:52 othyro Exp $
 
-SHA1 (v1.9.tar.gz) = a3cdb93d9c7465491c58c8e7a99d63d779067845
-RMD160 (v1.9.tar.gz) = f6bee5e32abdaabad1b3211e782c4ca91f9f5888
-Size (v1.9.tar.gz) = 63794 bytes
-SHA1 (patch-Makefile) = b1a9bf20b52711868bcf07947d18557f140c2956
-SHA1 (patch-darwin.c) = f2040f4a8ab84213c9c69d6c78962900cab37774
-SHA1 (patch-dat.h) = ba5ff30986e077f33bb53804c86f2c655372d577
+SHA1 (beanstalkd/v1.10.tar.gz) = bfc0ccf99e15b15eac03ec1d8a57a3aaff143237
+RMD160 (beanstalkd/v1.10.tar.gz) = bcd40208a48499cb3662f44b99484b5c992223a0
+Size (beanstalkd/v1.10.tar.gz) = 66243 bytes
+SHA1 (patch-Makefile) = 30c5095705d93a9ed11958d1c78bc481d2c45163
+SHA1 (patch-darwin.c) = 83db9922d20d12cff4f99c5214a45ffdc17285c2
diff --git a/beanstalkd/patches/patch-Makefile b/beanstalkd/patches/patch-Makefile
index b9cfcfb..1ad3f7f 100644
--- a/beanstalkd/patches/patch-Makefile
+++ b/beanstalkd/patches/patch-Makefile
@@ -2,17 +2,16 @@ $NetBSD: patch-Makefile,v 1.1 2014/01/03 05:31:52 othyro Exp $
 
 Add NetBSD support. Don't hardcode ${PREFIX}.
 
---- Makefile.orig	2013-04-14 17:19:41.000000000 +0000
+--- Makefile.orig	2014-08-05 03:39:54.000000000 +0000
 +++ Makefile
 @@ -1,5 +1,5 @@
+ DESTDIR=
 -PREFIX=/usr/local
--BINDIR=$(PREFIX)/bin
-+#PREFIX=/usr/local
-+BINDIR=${DESTDIR}${PREFIX}/bin
++PREFIX?=/usr/local
+ BINDIR=$(DESTDIR)$(PREFIX)/bin
  CFLAGS=-Wall -Werror\
  	-Wformat=2\
- 	-g\
-@@ -91,3 +91,5 @@ doc/beanstalkd.1 doc/beanstalkd.1.html: 
+@@ -96,3 +96,5 @@ doc/beanstalkd.1 doc/beanstalkd.1.html: 
  	ronn $<
  
  freebsd.o: darwin.c
diff --git a/beanstalkd/patches/patch-darwin.c b/beanstalkd/patches/patch-darwin.c
index 5fc3108..fa6a77b 100644
--- a/beanstalkd/patches/patch-darwin.c
+++ b/beanstalkd/patches/patch-darwin.c
@@ -2,23 +2,31 @@ $NetBSD: patch-darwin.c,v 1.1 2014/01/03 05:31:52 othyro Exp $
 
 Fix casting errors.
 
---- darwin.c.orig	2013-04-14 17:19:41.000000000 +0000
+--- darwin.c.orig	2014-08-05 03:39:54.000000000 +0000
 +++ darwin.c
-@@ -79,7 +79,7 @@ sockwant(Socket *s, int rw)
+@@ -79,7 +79,11 @@ sockwant(Socket *s, int rw)
              ev->data = Infinity;
          }
          ev->flags = EV_ADD;
 -        ev->udata = s;
++#if defined(__NetBSD__)
 +        ev->udata = (intptr_t) s;
++#else
++	ev->udata = s;
++#endif
          s->added = ev->filter;
          ev++;
          n++;
-@@ -105,7 +105,7 @@ socknext(Socket **s, int64 timeout)
+@@ -105,7 +109,11 @@ socknext(Socket **s, int64 timeout)
      }
  
      if (r > 0) {
 -        *s = ev.udata;
++#if defined(__NetBSD__)
 +        *s = (Socket *) ev.udata;
++#else
++	*s = ev.udata;
++#endif
          if (ev.flags & EV_EOF) {
              return 'h';
          }