From 6ec2e04d4c8bb4ae58c86327c0514685c317e5fe Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 9 May 2015 18:23:51 +0200
Subject: [PATCH] beanstalkd: enable PIE; install man/docs; fix runit service;
 replaces beanstalk.

---
 srcpkgs/beanstalkd/files/beanstalkd/run | 3 +--
 srcpkgs/beanstalkd/template             | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/beanstalkd/files/beanstalkd/run b/srcpkgs/beanstalkd/files/beanstalkd/run
index 39767c32449..3430cfa9fe2 100755
--- a/srcpkgs/beanstalkd/files/beanstalkd/run
+++ b/srcpkgs/beanstalkd/files/beanstalkd/run
@@ -1,6 +1,5 @@
 #!/bin/sh
 # By default use persistent storage (binary log)
-: ${OPTS:=-b /var/lib/beanstalkd}
 [ -r conf ] && . ./conf
 [ -d /var/lib/beanstalkd ] || install -D -o beanstalkd -g beanstalkd /var/lib/beanstalkd
-exec chpst -u beanstalkd:beanstalkd ${OPTS} 2>&1
+exec chpst -u beanstalkd:beanstalkd beanstalkd ${OPTS:=-b /var/lib/beanstalkd} 2>&1
diff --git a/srcpkgs/beanstalkd/template b/srcpkgs/beanstalkd/template
index bd8c563a1a2..082443ad636 100644
--- a/srcpkgs/beanstalkd/template
+++ b/srcpkgs/beanstalkd/template
@@ -1,7 +1,8 @@
 # Template file for 'beanstalkd'
 pkgname=beanstalkd
 version=1.10
-revision=1
+revision=2
+build_pie=yes
 short_desc="A simple, fast, general-purpose work queue"
 maintainer="bougyman <bougyman@voidlinux.eu>"
 license="MIT"
@@ -9,6 +10,7 @@ homepage="http://kr.github.io/beanstalkd/"
 distfiles="https://github.com/kr/beanstalkd/archive/v${version}.tar.gz"
 checksum=923b1e195e168c2a91adcc75371231c26dcf23868ed3e0403cd4b1d662a52d59
 system_accounts="beanstalkd"
+replaces="beanstalk>=0"
 
 do_build() {
 	sed -i 's,sys/fcntl.h,fcntl.h,' sd-daemon.c
@@ -16,6 +18,9 @@ do_build() {
 }
 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install
+	vman doc/beanstalkd.1
 	vdoc README
+	vdoc doc/protocol.txt
+	vlicense LICENSE
 	vsv beanstalkd
 }