4 files changed, 27 insertions, 53 deletions

diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile
index ae352a42b5b2..9997eac0e1b7 100644
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@@ -6,10 +6,13 @@
 #
 
 PORTNAME=	cgit
-PORTVERSION=	0.8.1
-PORTREVISION=	3
+PORTVERSION=	0.8.2
 CATEGORIES=	devel www
-MASTER_SITES= 	http://hjemli.net/git/cgit/snapshot/
+MASTER_SITES= 	http://hjemli.net/git/cgit/snapshot/:cgit \
+		http://www.kernel.org/pub/software/scm/git/:git
+DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
+		git-${GIT_VERSION}.tar.bz2:git
+GIT_VERSION=	1.6.1.1
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	A fast webinterface for git
@@ -28,6 +31,13 @@ MAKE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
 
 SUB_FILES=	pkg-message
 
+post-extract:
+	@${RMDIR} ${WRKSRC}/git
+	@${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^CC =/d' ${WRKSRC}/git/Makefile
+
 post-install:
 	@${MKDIR} /var/cache/${PORTNAME}
 	@${CHOWN} ${WWWOWN}:${WWWGRP} /var/cache/${PORTNAME}
diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo
index 0e79fed949b5..64bb4d301d54 100644
--- a/devel/cgit/distinfo
+++ b/devel/cgit/distinfo
@@ -1,6 +1,6 @@
-MD5 (cgit-0.8.1.tar.bz2) = 7e1411cfcc370c3ae190ea83b11dfbae
-SHA256 (cgit-0.8.1.tar.bz2) = ba779088ba25acfba99863d34c4b130d01f1620f011af8d83f4bb6e9f22649eb
-SIZE (cgit-0.8.1.tar.bz2) = 1879354
-MD5 (git-1.6.0.2.tar.bz2) = 1e4d9bfc1cb0abf165d4de93b5172324
-SHA256 (git-1.6.0.2.tar.bz2) = a332fbcb1c9cf8b1dc224135d5b14e99da4720fc8b082e595b4f20eaf640dad8
-SIZE (git-1.6.0.2.tar.bz2) = 1865485
+MD5 (cgit-0.8.2.tar.bz2) = 872fafaa1ea6bd9292f312878864b665
+SHA256 (cgit-0.8.2.tar.bz2) = 6d12fc4e394b4ed775899dcbbadab35f223e22b467074b45770481b7280f002a
+SIZE (cgit-0.8.2.tar.bz2) = 50418
+MD5 (git-1.6.1.1.tar.bz2) = d2b6925cb03e1e33911fdf9392946747
+SHA256 (git-1.6.1.1.tar.bz2) = ebc170c0e932ff74d8f99d705f88babe0e2691bb262a2f7ad3d91f116b9eb3e2
+SIZE (git-1.6.1.1.tar.bz2) = 1972491
diff --git a/devel/cgit/files/patch-Makefile b/devel/cgit/files/patch-Makefile
index d1b909a2f137..69b2e4e9f0d9 100644
--- a/devel/cgit/files/patch-Makefile
+++ b/devel/cgit/files/patch-Makefile
@@ -1,18 +1,20 @@
---- Makefile.orig	2008-04-14 23:00:11.000000000 +0100
-+++ Makefile	2008-04-17 01:29:10.000000000 +0100
-@@ -1,8 +1,8 @@
- CGIT_VERSION = v0.7.2
+--- Makefile.orig	2009-02-01 18:31:37.000000000 +0000
++++ Makefile	2009-02-02 16:17:23.000000000 +0000
+@@ -1,9 +1,9 @@
+ CGIT_VERSION = v0.8.2
  CGIT_SCRIPT_NAME = cgit.cgi
 -CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
+-CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 -CGIT_CONFIG = /etc/cgitrc
 -CACHE_ROOT = /var/cache/cgit
 +CGIT_SCRIPT_PATH ?= /var/www/htdocs/cgit
++CGIT_DATA_PATH ?= $(CGIT_SCRIPT_PATH)
 +CGIT_CONFIG ?= /etc/cgitrc
 +CACHE_ROOT ?= /var/cache/cgit
  SHA1_HEADER = <openssl/sha.h>
- GIT_VER = 1.5.5
+ GIT_VER = 1.6.1.1
  GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
-@@ -46,7 +46,7 @@
+@@ -68,7 +68,7 @@
  	$(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
  
  
diff --git a/devel/cgit/files/patch-git_Makefile b/devel/cgit/files/patch-git_Makefile
deleted file mode 100644
index 32ba3889aed6..000000000000
--- a/devel/cgit/files/patch-git_Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- git/Makefile.orig	2008-01-15 12:21:54.000000000 +0000
-+++ git/Makefile	2008-01-15 12:25:23.000000000 +0000
-@@ -135,8 +135,8 @@
- 
- # CFLAGS and LDFLAGS are for the users to override from the command line.
- 
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
-+CFLAGS ?= -g -O2 -Wall
-+LDFLAGS ?=
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-@@ -173,15 +173,15 @@
- 
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
- 
--CC = gcc
--AR = ar
--RM = rm -f
--TAR = tar
--FIND = find
--INSTALL = install
--RPMBUILD = rpmbuild
--TCL_PATH = tclsh
--TCLTK_PATH = wish
-+CC ?= gcc
-+AR ?= ar
-+RM ?= rm -f
-+TAR ?= tar
-+FIND ?= find
-+INSTALL ?= install
-+RPMBUILD ?= rpmbuild
-+TCL_PATH ?= tclsh
-+TCLTK_PATH ?= wish
- 
- export TCL_PATH TCLTK_PATH
-