From 9c389471ef2552eac3c99168c1cdc9b2a0c3387f Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 29 Sep 2010 06:16:05 +0000 Subject: [PATCH] - Update to 0.8.3.4 - Update internal version of git to 1.7.3 --- devel/cgit/Makefile | 4 ++-- devel/cgit/distinfo | 12 ++++++------ devel/cgit/files/patch-Makefile | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index 31bd27db789e..55d0ab9685ad 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -6,14 +6,14 @@ # PORTNAME= cgit -PORTVERSION= 0.8.3.3 +PORTVERSION= 0.8.3.4 CATEGORIES= devel www MASTER_SITES= http://hjemli.net/git/cgit/snapshot/:cgit \ ${MASTER_SITE_KERNEL_ORG:S/$/:git/g} MASTER_SITE_SUBDIR= software/scm/git/:git DISTFILES= cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \ git-${GIT_VERSION}.tar.bz2:git -GIT_VERSION= 1.7.1.2 +GIT_VERSION= 1.7.3 MAINTAINER= bapt@FreeBSD.org COMMENT= A fast webinterface for git diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo index 541cf86db15f..74045bea972a 100644 --- a/devel/cgit/distinfo +++ b/devel/cgit/distinfo @@ -1,6 +1,6 @@ -MD5 (cgit-0.8.3.3.tar.bz2) = 30a28cb991d616970d19a5b5c470864a -SHA256 (cgit-0.8.3.3.tar.bz2) = 64c834eba1b16088206e4f7d95db83c8824ef3ee74f6a16fe03c80f72cb86709 -SIZE (cgit-0.8.3.3.tar.bz2) = 54759 -MD5 (git-1.7.1.2.tar.bz2) = af0ed51af47b9f5ca70176c2ef8e429a -SHA256 (git-1.7.1.2.tar.bz2) = 3275dee548e043bb41c7473b890b428ae53853ce7e7c8a5f41dfda28e9bdc5c2 -SIZE (git-1.7.1.2.tar.bz2) = 2494599 +MD5 (cgit-0.8.3.4.tar.bz2) = 712e4d3013d754aa5752e0101188cf32 +SHA256 (cgit-0.8.3.4.tar.bz2) = 9df3a84b40cefc468d41937a930635960ffb5fa12b88099c7a6b24ee4124e8a0 +SIZE (cgit-0.8.3.4.tar.bz2) = 54832 +MD5 (git-1.7.3.tar.bz2) = c18eb252ce63a688071f10c3f7bc28e1 +SHA256 (git-1.7.3.tar.bz2) = 0035a4a7906f65812072457b65c609f24c66f31593d0ad372b7c18894a26b07d +SIZE (git-1.7.3.tar.bz2) = 2629734 diff --git a/devel/cgit/files/patch-Makefile b/devel/cgit/files/patch-Makefile index 69b2e4e9f0d9..7941f298fd79 100644 --- a/devel/cgit/files/patch-Makefile +++ b/devel/cgit/files/patch-Makefile @@ -1,7 +1,7 @@ ---- Makefile.orig 2009-02-01 18:31:37.000000000 +0000 -+++ Makefile 2009-02-02 16:17:23.000000000 +0000 +--- ./Makefile.orig 2010-09-27 08:00:47.000000000 +0200 ++++ ./Makefile 2010-09-29 08:08:53.348328439 +0200 @@ -1,9 +1,9 @@ - CGIT_VERSION = v0.8.2 + CGIT_VERSION = v0.8.3.4 CGIT_SCRIPT_NAME = cgit.cgi -CGIT_SCRIPT_PATH = /var/www/htdocs/cgit -CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) @@ -12,14 +12,14 @@ +CGIT_CONFIG ?= /etc/cgitrc +CACHE_ROOT ?= /var/cache/cgit SHA1_HEADER = - GIT_VER = 1.6.1.1 + GIT_VER = 1.7.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 @@ -68,7 +68,7 @@ $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< --EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -L${LOCALBASE}/lib -liconv +-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread ++EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread -L${LOCALBASE}/lib -liconv OBJECTS = OBJECTS += cache.o OBJECTS += cgit.o