Bump to 4.x versions

3 files changed, 23 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77113c0696bf..88c0615480ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,18 @@
-# Generated by mksrcinfo v8
-# Tue Apr 19 13:49:56 UTC 2016
 pkgbase = irccd-hg
-	pkgdesc = IRC client daemon
-	pkgver = 94.339808b0c007
+	pkgdesc = A flexible, fast IRC bot
+	pkgver = 1080.84d567d1c641
 	pkgrel = 1
 	url = http://projects.malikania.fr/irccd/
-	arch = i686
 	arch = x86_64
 	license = custom:ISC
 	makedepends = mercurial
-	makedepends = cmake
 	makedepends = openssl
 	provides = irccd
 	conflicts = irccd
 	backup = etc/irccd.conf
-	backup = etc/irccdctl.conf
 	source = irccd-hg::hg+http://hg.malikania.fr/irccd
+	source = irccd-sysusers.conf
 	md5sums = SKIP
+	md5sums = 9a2172be1a0b56ee719048cb0b4ee594
 
 pkgname = irccd-hg
-
diff --git a/PKGBUILD b/PKGBUILD
index e9c15ed65d3b..3de287a987a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# irccd packaging script for ArchLinux - Copyright (c) 2013 Pierre Choffet
+# irccd packaging script for ArchLinux - Copyright (c) 2013-2021 Pierre Choffet
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,27 +19,28 @@
 # THE SOFTWARE.
 
 pkgname=irccd-hg
-pkgver=94.339808b0c007
+pkgver=1080.84d567d1c641
 pkgrel=1
 epoch=
-pkgdesc="IRC client daemon"
-arch=('i686' 'x86_64')
-url="http://projects.malikania.fr/irccd/"
+pkgdesc="A flexible, fast IRC bot"
+arch=('x86_64')
+url='http://projects.malikania.fr/irccd/'
 license=('custom:ISC')
 groups=()
 depends=()
-makedepends=('mercurial' 'cmake' 'openssl')
+makedepends=('mercurial' 'openssl')
 checkdepends=()
 optdepends=()
 provides=('irccd')
 conflicts=('irccd')
 replaces=()
-backup=("etc/irccd.conf" "etc/irccdctl.conf")
+backup=("etc/irccd.conf")
 options=()
 changelog=
-source=("$pkgname"::"hg+http://hg.malikania.fr/irccd")
+source=("$pkgname"::"hg+http://hg.malikania.fr/irccd" 'irccd-sysusers.conf')
 noextract=()
-md5sums=('SKIP')
+md5sums=('SKIP'
+         '9a2172be1a0b56ee719048cb0b4ee594')
 
 pkgver() {
 	cd $pkgname
@@ -47,26 +48,16 @@ pkgver() {
 }
 
 build() {
-	cd $srcdir/$pkgname
-	mkdir _build
-	cd _build
-	cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr' -DWITH_CONFDIR='../etc' -DWITH_MANDIR='share/man' -DWITH_DOCDIR='share/doc/irccd' -DWITH_PLUGINDIR='share/irccd/plugins'
-	make
+	mkdir "$srcdir/$pkgname/build"
+	cd "$srcdir/$pkgname/build"
+	
+	make ETCDIR=/etc PREFIX=/usr VARDIR=/var -C .. all plugins
 }
 
 package() {
-	cd $srcdir/$pkgname/_build
-	make DESTDIR="$pkgdir" install
-
-	mkdir -p $pkgdir/usr/share/licenses/$pkgname
-	cp ../LICENSE.md $pkgdir/usr/share/licenses/$pkgname/LICENSE
-	
-	# Copy systemd unit
-	mkdir -p $pkgdir/usr/lib/systemd/system/
-	sed 's/@PATH@/\/usr\/bin\/irccd/' contrib/irccd.service > $pkgdir/usr/lib/systemd/system/irccd.service
-	sed -i 's/Type=forking/Type=simple/' $pkgdir/usr/lib/systemd/system/irccd.service
+	cd "$srcdir/$pkgname/build"
+	make ETCDIR=/etc PREFIX=/usr DESTDIR="$pkgdir" USER=irccd GROUP=irccd -C .. install install-plugins install-systemd
 	
-	# Copy default config files
-	mv $pkgdir/etc/irccd.conf.sample $pkgdir/etc/irccd.conf
-	mv $pkgdir/etc/irccdctl.conf.sample $pkgdir/etc/irccdctl.conf
+	mv $pkgdir/etc/irccd.conf{.sample,}
+	install -D -m 0644 "$srcdir/irccd-sysusers.conf" "$pkgdir/usr/lib/sysusers.d/irccd.conf"
 }
diff --git a/irccd-sysusers.conf b/irccd-sysusers.conf
new file mode 100644
index 000000000000..89bc431de712
--- /dev/null
+++ b/irccd-sysusers.conf
@@ -0,0 +1 @@
+u irccd - "irccd daemon user" - -