From b86875c2f572b12a755bf22773c778c073bd3701 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Wed, 16 Jan 2019 11:11:43 -0200
Subject: [PATCH] bitlbee: only create /run/bitlbee on service, use make_dirs=
 for /var/lib/bitlbee

---
 srcpkgs/bitlbee/files/bitlbee/run |  3 +--
 srcpkgs/bitlbee/template          | 14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/bitlbee/files/bitlbee/run b/srcpkgs/bitlbee/files/bitlbee/run
index c04a2b9f19..e6d5705b60 100644
--- a/srcpkgs/bitlbee/files/bitlbee/run
+++ b/srcpkgs/bitlbee/files/bitlbee/run
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-mkdir -p /var/lib/bitlbee /run/bitlbee
-chown bitlbee:bitlbee /var/lib/bitlbee /run/bitlbee
+install -d -m0755 -o bitlbee -g bitlbee /run/bitlbee
 [ -r conf ] && . ./conf
 exec chpst -u bitlbee:bitlbee bitlbee -n ${OPTS:=-F}
diff --git a/srcpkgs/bitlbee/template b/srcpkgs/bitlbee/template
index 714cf872e8..c25b1bfc95 100644
--- a/srcpkgs/bitlbee/template
+++ b/srcpkgs/bitlbee/template
@@ -1,29 +1,31 @@
 # Template file for 'bitlbee'
 pkgname=bitlbee
 version=3.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--etcdir=/etc/bitlbee --sbindir=/usr/bin
  --pidfile=/run/${pkgname}/${pkgname}.pid
  --ipcsocket=/run/${pkgname}/${pkgname}.sock
  --ssl=openssl --strip=0 --otr=plugin --skype=plugin
  $(vopt_if purple --purple=1 --purple=0)"
+make_install_args="install-etc"
 hostmakedepends="pkg-config asciidoc"
 makedepends="libgcrypt-devel libotr-devel libressl-devel libglib-devel
  $(vopt_if purple libpurple-devel)"
-make_install_args="install-etc"
 short_desc="Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.bitlbee.org/"
-distfiles="http://get.bitlbee.org/src/$pkgname-$version.tar.gz"
+license="GPL-2.0-or-later"
+homepage="https://www.bitlbee.org/"
+distfiles="https://get.bitlbee.org/src/${pkgname}-${version}.tar.gz"
 checksum=9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69
 
 build_options="purple"
 desc_option_purple="Build with libpurple support"
 
 system_accounts="$pkgname"
-bitlbee_homedir="/var/lib/$pkgname"
+bitlbee_homedir="/var/lib/${pkgname}"
+
+make_dirs="/var/lib/bitlbee 0755 bitlbee bitlbee"
 
 conf_files="
  /etc/${pkgname}/*.txt