cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to cgit-0.9.2

Browse Source 
- bump git to 1.8.3.2
- sync MASTER_SITES with the git port

ok landry@
This commit is contained in:
jasper 2013-07-15 07:00:49 +00:00
parent 5179817bc8
commit cc117eb26c
4 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/cgit/Makefile
View File

@ -1,19 +1,15 @@
# $OpenBSD: Makefile,v 1.11 2013/07/05 09:34:35 jasper Exp $
# $OpenBSD: Makefile,v 1.12 2013/07/15 07:00:49 jasper Exp $
COMMENT = web frontend for git repositories
DISTNAME = cgit-0.9.1
REVISION = 0
DISTNAME = cgit-0.9.2
CATEGORIES = www devel
DISTFILES = cgit-0.9.1.tar.gz:0 \
git-1.7.4.5.tar.gz:1
DISTFILES = ${DISTNAME}.tar.gz:0 \
git-1.8.3.2.tar.gz:1
MASTER_SITES0 = http://git.zx2c4.com/cgit/snapshot/
MASTER_SITES1 = http://ftp.kernel.org/pub/software/scm/git/ \
ftp://ftp.kernel.org/pub/software/scm/git/ \
ftp://ftp.de.kernel.org/pub/software/scm/git/ \
ftp://ftp.au.kernel.org/pub/software/scm/git/
MASTER_SITES1 = http://git-core.googlecode.com/files/
HOMEPAGE = http://git.zx2c4.com/cgit/about/
# GPLv2
@ -22,14 +18,13 @@ PERMIT_PACKAGE_CDROM = Yes
USE_GMAKE = yes
MODULES = converters/libiconv
WANTLIB += c crypto pthread z
PREFIX = ${VARBASE}/www
MAKE_FLAGS += V=1 NEEDS_LIBICONV=1 LDFLAGS+='-static -L${LOCALBASE}/lib'
post-extract:
rmdir ${WRKSRC}/git
ln -s ${WRKDIR}/git-* ${WRKSRC}/git
mv ${WRKDIR}/git-* ${WRKSRC}/git
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/conf/modules.sample

8
www/cgit/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (cgit-0.9.1.tar.gz) = 6w0FZVg65IJdAftURfDnH4LBcqBh6bFvOUW3V1a77fA=
SHA256 (git-1.7.4.5.tar.gz) = A1RxPPBKqAECqktkdIyWQFxp3/GM0uvyTVIJ9EZodCc=
SIZE (cgit-0.9.1.tar.gz) = 80347
SIZE (git-1.7.4.5.tar.gz) = 3277828
SHA256 (cgit-0.9.2.tar.gz) = P3wqvH1NWs2+Xxn0L7B0WgbNxo2ehPF/4bPigvNVVJg=
SHA256 (git-1.8.3.2.tar.gz) = w7h2YeJ3C6cgJA+yhYieQuWaz0HsAb1mzxfB3Bik3lU=
SIZE (cgit-0.9.2.tar.gz) = 100158
SIZE (git-1.8.3.2.tar.gz) = 4474363

23
www/cgit/patches/patch-Makefile
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-Makefile,v 1.3 2012/11/15 19:58:48 sthen Exp $
--- Makefile.orig Thu Nov 15 00:28:59 2012
+++ Makefile Thu Nov 15 11:19:51 2012
@@ -1,10 +1,10 @@
CGIT_VERSION = v0.9.1
$OpenBSD: patch-Makefile,v 1.4 2013/07/15 07:00:49 jasper Exp $
--- Makefile.orig Sun Jul 14 23:16:35 2013
+++ Makefile Sun Jul 14 23:18:53 2013
@@ -2,11 +2,11 @@ all::
CGIT_VERSION = v0.9.2
CGIT_SCRIPT_NAME = cgit.cgi
-CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
-CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@ -17,20 +18,12 @@ $OpenBSD: patch-Makefile,v 1.3 2012/11/15 19:58:48 sthen Exp $
libdir = $(prefix)/lib
filterdir = $(libdir)/cgit/filters
docdir = $(prefix)/share/doc/cgit
@@ -142,6 +142,7 @@ VERSION: force-version
CFLAGS += -g -Wall -Igit
+CFLAGS += -I${LOCALBASE}/include
CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
@@ -188,8 +189,6 @@ install: all
@@ -77,8 +77,6 @@ install: all
$(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
$(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
$(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
- $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
- $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
- $(COPYTREE) filters/* $(DESTDIR)$(filterdir)
install-doc: install-man install-html install-pdf

11
www/cgit/patches/patch-cgit_mk Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-cgit_mk,v 1.1 2013/07/15 07:00:49 jasper Exp $
--- cgit.mk.orig Sun Jul 14 23:18:05 2013
+++ cgit.mk Sun Jul 14 23:18:39 2013
@@ -17,6 +17,7 @@ $(CGIT_PREFIX)VERSION: force-version
# CGIT_CFLAGS is a separate variable so that we can track it separately
# and avoid rebuilding all of Git when these variables change.
+CGIT_CFLAGS += -L${LOCALBASE}/include
CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'