aboutsummaryrefslogtreecommitdiffstats
path: root/main/cgit
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-03-03 08:38:47 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-03-03 09:36:41 +0000
commit431eaf711778752f3d08aa29e7eb1e1282d04c05 (patch)
tree57c393f790938574d91427a20f59da6e32cadaf8 /main/cgit
parent96e9074ba027940ff192aba7f7c1097e2c2572e9 (diff)
downloadaports-431eaf711778752f3d08aa29e7eb1e1282d04c05.tar.bz2
aports-431eaf711778752f3d08aa29e7eb1e1282d04c05.tar.xz
main/cgit: upgrade to 0.10.1
Diffstat (limited to 'main/cgit')
-rw-r--r--main/cgit/APKBUILD20
-rw-r--r--main/cgit/lua.patch48
2 files changed, 8 insertions, 60 deletions
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index 2eb096aedc..d8c7b67695 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cgit
-pkgver=0.10
+pkgver=0.10.1
pkgrel=0
-_gitver=1.8.5
+_gitver=1.9.0
pkgdesc="A fast webinterface for git"
url="http://git.zx2c4.com/cgit/"
arch="all"
@@ -12,7 +12,6 @@ depends=""
source="
http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz
http://git-core.googlecode.com/files/git-$_gitver.tar.gz
- lua.patch
"
_makeopts="NO_ICONV=YesPlease
@@ -53,12 +52,9 @@ package() {
ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit
}
-md5sums="19944c17ecea1b1d1944718ce8ce6b61 cgit-0.10.tar.xz
-16448b1cfd62fcbe738729edc6279e14 git-1.8.5.tar.gz
-6f9e6e41671ccfaa2814912ac828ed1d lua.patch"
-sha256sums="90c4227b7889bb268825b36e8a53cb7695895a6d63523b6ad34a670ad4e6de7a cgit-0.10.tar.xz
-870f52e19bb599b2835455e62db10e4c693fdbcc154f7802512d74393cc26b23 git-1.8.5.tar.gz
-2d0defeea43644e560a1f0fc4713b528b10f8b929dda81fdf9fafb9068f7f921 lua.patch"
-sha512sums="c00c5a9443774a58a64b0133ab1a7d9771ddf9cee53e09492ff87e79a113593ec918bdb41e60b5e12e2c455575c031d83d056fb805bbdc2c2b158178ab4f3b57 cgit-0.10.tar.xz
-3ecb2ab82ed6b98e4b1400c057a837947e36900b25f7758fd4cbca7814d6d882ecbc7502b2e3cb3b1808536f333706151129f331406e1806351125e53a7d13bc git-1.8.5.tar.gz
-2e1ea885787984a886c29f9702f0d94924918932f1fa4f98084943bee8f8a94f36bd5f911b2a45c4997ddb7f242de5260fc4180ec8c293d2bc21b5e00d21fad0 lua.patch"
+md5sums="060ef0aa95ebda6ea7daf823214bc4d0 cgit-0.10.1.tar.xz
+e16c14b27c644b8e0dd72bdb5ff77450 git-1.9.0.tar.gz"
+sha256sums="839ea3e330259b4b332a346007244f4b74d62c336352c272e4e9b8abd30d912d cgit-0.10.1.tar.xz
+de3097fdc36d624ea6cf4bb853402fde781acdb860f12152c5eb879777389882 git-1.9.0.tar.gz"
+sha512sums="3a6afe2eb47ed718b4c0661ffbd0905118b61f6f2f10723022a9fe7d2e4b2742fcc20fd2a5ecb68de6a22b55d1c9b679d4b7305f6d622d64fa4be66117a9ad02 cgit-0.10.1.tar.xz
+e81f320cf13262e08a262c9fb70d701b8d8017a5d6b10c8be959c234b99486012cb7fa808a49f97db143777cd6c4368fd08a69f8ef272f9e187f82aed32d0854 git-1.9.0.tar.gz"
diff --git a/main/cgit/lua.patch b/main/cgit/lua.patch
deleted file mode 100644
index 1bcb7ea2c3..0000000000
--- a/main/cgit/lua.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/cgit.mk b/cgit.mk
-index 3b8b79a..2e2992f 100644
---- a/cgit.mk
-+++ b/cgit.mk
-@@ -29,30 +29,18 @@ ifdef NO_LUA
- LUA_MESSAGE := linking without specified Lua support
- CGIT_CFLAGS += -DNO_LUA
- else
--LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null)
--LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null)
--LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null)
--LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null)
--ifeq (JIT,$(LUA_IMPLEMENTATION))
-- ifeq ($(strip $(LUAJIT_LIBS)),)
-- $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.)
-- endif
-- LUA_MESSAGE := linking with selected LuaJIT
-- CGIT_LIBS += $(LUAJIT_LIBS)
-- CGIT_CFLAGS += $(LUAJIT_CFLAGS)
--else ifeq (VANILLA,$(LUA_IMPLEMENTATION))
-- ifeq ($(strip $(LUA_LIBS)),)
-- $(error Lua specified via LUA_IMPLEMENTATION=VANILLA, but library could not be found.)
-- endif
-- LUA_MESSAGE := linking with selected Lua
-- CGIT_LIBS += $(LUA_LIBS)
-- CGIT_LIBS += $(LUA_CFLAGS)
--else ifneq ($(strip $(LUAJIT_LIBS)),)
-- LUA_MESSAGE := linking with autodetected LuaJIT
-- CGIT_LIBS += $(LUAJIT_LIBS)
-- CGIT_CFLAGS += $(LUAJIT_CFLAGS)
--else ifneq ($(strip $(LUA_LIBS)),)
-- LUA_MESSAGE := linking with autodetected Lua
-+ifeq ($(LUA_PKGCONFIG),)
-+ LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
-+ pkg-config --exists $$pc && echo $$pc && break; \
-+ done)
-+ LUA_MODE := autodetected
-+else
-+ LUA_MODE := specified
-+endif
-+ifneq ($(LUA_PKGCONFIG),)
-+ LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
-+ LUA_LIBS := $(shell pkg-config --libs $(LUA_PKGCONFIG) 2>/dev/null)
-+ LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKGCONFIG) 2>/dev/null)
- CGIT_LIBS += $(LUA_LIBS)
- CGIT_CFLAGS += $(LUA_CFLAGS)
- else
-