From 2aed0493a021749b0f496711305db46e576ed913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Tue, 28 Mar 2017 22:10:47 +0200
Subject: main/cgit: upgrade to 1.1 and modernize abuild

---
 main/cgit/APKBUILD | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index 3aadaea1d4..b569b5bc3d 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -1,15 +1,14 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cgit
-pkgver=1.0
-pkgrel=1
-_gitver=2.8.3 # 2.7.1 and 2.7.0 are compatible
+pkgver=1.1
+pkgrel=0
+_gitver=2.10.2
 pkgdesc="A fast webinterface for git"
 url="http://git.zx2c4.com/cgit/"
 arch="all"
 license="GPL2"
-makedepends="libressl-dev zlib-dev lua5.2-dev asciidoc"
-depends=""
+makedepends="libressl-dev zlib-dev lua5.3-dev asciidoc"
 subpackages="$pkgname-doc"
 source="http://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz
 	https://www.kernel.org/pub/software/scm/git/git-$_gitver.tar.gz
@@ -19,12 +18,13 @@ _makeopts="NO_ICONV=YesPlease
 	NO_GETTEXT=YesPlease
 	NO_TCLTK=YesPlease
 	NO_SVN_TESTS=YesPlease
-	LUA_PKGCONFIG=lua5.2
+	NO_REGEX=NeedsStartEnd
+	LUA_PKGCONFIG=lua5.3
 	prefix=/usr"
 
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 
 	# check that upstream git ver corresponds with our
 	local _ver=$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile)
@@ -36,29 +36,21 @@ prepare() {
 	rm -rf git
 	mv ../git-$_gitver git
 
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare || return 1
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	make $_makeopts all doc-man || return 1
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make $_makeopts DESTDIR="$pkgdir" \
 		CGIT_SCRIPT_PATH=/usr/share/webapps/cgit \
 		install install-man || return 1
 	ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit || return 1
 }
 
-md5sums="1dbd155da1c4adc89703fb1faf249dff  cgit-1.0.tar.xz
-b181fc82592d6b5adf3d3226b4e9e757  git-2.8.3.tar.gz"
-sha256sums="a89754610922f122468c791888ed6309a81fa0f3ae948d118284b673cb40704d  cgit-1.0.tar.xz
-2dad50c758339d6f5235309db620e51249e0000ff34aa2f2acbcb84c2123ed09  git-2.8.3.tar.gz"
-sha512sums="de31418e80210ea02d4de7f4bbef09f72312d08fcd4739b2136a92b501898b11235d4598f05d317bdc4b146928372e1cd24b818113ce34064a9d75c803a627b7  cgit-1.0.tar.xz
-eb677dc5c1974919d225cdb7c6cad97cc1d4fd63cb5be4ed5ad82ef0a9d56ac4514268b436f0a9218694f801afdc2b5d3b89fb88e5258dce93056f6d9cf27acb  git-2.8.3.tar.gz"
+sha512sums="8f2ec418716d7a6f0880a713b622f2ee41217dc2d5462903841d59d978a021a8bc2be667ca65c25baee2b9dcd4a76bddd0c813bda0486109cc694e7610827051  cgit-1.1.tar.xz
+d8ee88732eed027f5cb822f003a17e4cf249c23927a6c6ff55cff49aa3b6951396375576d25f635bebe34ddbdfae5885cd69cee2c48d3848bed0ed9bebb60fb0  git-2.10.2.tar.gz"
-- 
cgit v1.2.3