From 8491f658a6959e9b9c45ecdced1f8c5ee3cda04c Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Thu, 23 Mar 2017 09:22:47 +0000
Subject: main/charybdis: upgrade to 3.5.5, changed upstream url

---
 main/charybdis/APKBUILD | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

(limited to 'main/charybdis/APKBUILD')

diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
index f310792786..964b2d167c 100644
--- a/main/charybdis/APKBUILD
+++ b/main/charybdis/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=charybdis
-pkgver=3.5.3
-pkgrel=1
+pkgver=3.5.5
+pkgrel=0
 pkgdesc="A highly-scalable IRCv3-compliant IRC daemon"
 url="http://www.atheme.org/project/charybdis.html"
 arch="all"
@@ -13,22 +13,14 @@ depends_dev="bison flex libressl-dev zlib-dev libtool"
 makedepends="$depends_dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.bz2::http://distfiles.charybdis.io/$pkgname-$pkgver.tar.bz2
+source="$pkgname-$pkgver.tar.gz::https://github.com/charybdis-ircd/$pkgname/archive/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-			*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/$pkgname-$pkgname-$pkgver
+
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -46,7 +38,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 
         install -m755 -D "$srcdir"/$pkgname.initd \
@@ -56,17 +48,8 @@ package() {
         chown ircd "$pkgdir"/var/run/charybdis
         chown ircd "$pkgdir"/var/log/charybdis
         chown ircd "$pkgdir"/var/charybdis
-	sed -i -e "s/\"modules\"/\"\/usr\/lib\/charybdis\/modules\"/g" $pkgdir/etc/$pkgname/example.conf
-	sed -i -e "s/\"modules\/autoload\"/\"\/usr\/lib\/charybdis\/modules\/autoload\"/g" "$pkgdir"/etc/$pkgname/example.conf
-	sed -i -e "s/usr\/local\/ircd\/modules/usr\/lib\/charybdis\/modules/g" "$pkgdir"/etc/$pkgname/reference.conf
 }
 
-md5sums="77b6d03fd5f155ce048de37482bdb72a  charybdis-3.5.3.tar.bz2
-8dbb181d29609e29f6389e6b1dbb7d0e  charybdis.initd
-11d70cc7c9fa0eb5ad52af35801d57c6  charybdis.confd"
-sha256sums="9fb928524acbadeabedef56b0b6446c2d6de365382e256f5c21170c75390e16b  charybdis-3.5.3.tar.bz2
-8b8c1f411ee1c9bdf4dd0b4e063464969abfa27e92bc4e15807cdeaed74c5fcd  charybdis.initd
-3d1d8b8e722efe6a9eb3171a65d96651bb93c8d6265bd4980bcbb4b8d500f6ad  charybdis.confd"
-sha512sums="46b77a6071d36d0e6744729794f14f847fca3ec775a918c0857118da35407adad3712d28afa784cdfc0c8b465382a797e3d2df81945931795f8aacc962e660d6  charybdis-3.5.3.tar.bz2
+sha512sums="4922132e7c23bf5270841497b94c71ba91996d03a54d4c68e2a2abd6fc8466b9ba7d42b48862cb2f0e490007dc56eb7da3ee7df7cec93ae3d840f8ecd9a538d0  charybdis-3.5.5.tar.gz
 584d28ded8c943172764ee89a0dcf2593e8a71a9ce876635b6fb86485171caad7c5e7fe0ec18fc217bfe93b7ceb865e9930e3af74458cb1f0b698c38fd70947f  charybdis.initd
 1886b312b0ea40945de45db7a379bff2a3af426155fb77676e03f21f8d1d733e057fb5c3cb65fb72bb56008c4c92f3d2d0010563f871fd0802446de443ddfd5e  charybdis.confd"
-- 
cgit v1.2.3