8 files changed, 76 insertions, 64 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index e338af48c05a..30bd472cb461 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.7.1.1
-PORTREVISION=	1
+PORTVERSION=	1.7.2.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_KERNEL_ORG}
 MASTER_SITE_SUBDIR=	software/scm/${PORTNAME}
@@ -165,7 +164,8 @@ MAN7=		gitcli.7 \
 		gitcore-tutorial.7 \
 		gitdiffcore.7 \
 		gittutorial-2.7 \
-		gitworkflows.7
+		gitworkflows.7 \
+		gitrevisions.7
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -354,6 +354,9 @@ post-patch:
 .ifndef (WITH_SVN)
 	@${REINPLACE_CMD} -e '/git-svn.perl/d' ${WRKSRC}/Makefile
 .endif
+.ifndef (WITH_GITWEB)
+	@${REINPLACE_CMD} -e '/$$(MAKE) -C gitweb install/d' ${WRKSRC}/Makefile
+.endif
 
 post-build:
 .ifdef (WITH_P4) || defined (WITH_CONTRIB)
@@ -385,14 +388,6 @@ post-install:
 		${PREFIX}/lib/xemacs/site-lisp/git/git.el
 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/git-blame.el \
 		${PREFIX}/lib/xemacs/site-lisp/git/git-blame.el
-.ifdef (WITH_GITWEB)
-	${RM} ${WRKSRC}/gitweb/Makefile \
-		${WRKSRC}/gitweb/GITWEB-BUILD-OPTIONS \
-		${WRKSRC}/gitweb/gitweb.perl
-	@${ECHO_MSG} "===> Installing gitweb files"
-	${MKDIR} ${EXAMPLESDIR}/gitweb
-	(cd ${WRKSRC}/gitweb/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/gitweb)
-.endif
 .ifdef (WITH_CONTRIB)
 	@${ECHO_MSG} "===> Installing contributed scripts"
 	${MKDIR} ${PREFIX}/share/git-core/contrib
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 193695a16a8b..8f75a6eef8db 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,18 +1,18 @@
-MD5 (git-1.7.1.1.tar.bz2) = 1b116a3e2ecce46a89e4272abf0de955
-SHA256 (git-1.7.1.1.tar.bz2) = f70c0fbb4445d3b638febbf33393adfc43d547926349c1df0a69f290a6b9c14a
-SIZE (git-1.7.1.1.tar.bz2) = 2491729
-MD5 (git-manpages-1.7.1.1.tar.bz2) = d56a2b79e76efa7b207335f562fbefbe
-SHA256 (git-manpages-1.7.1.1.tar.bz2) = ebb0732f5058dd365683b40ca6aa937a4bc31d971a6c73cde0176ae14e923af0
-SIZE (git-manpages-1.7.1.1.tar.bz2) = 279139
-MD5 (git-htmldocs-1.7.1.1.tar.bz2) = 642edbab5bcf66694c07e0929c0ca223
-SHA256 (git-htmldocs-1.7.1.1.tar.bz2) = 075b99aa5af90f220961cc6adaeac4ee1270ce4212d4d5fe790129ab09e184a3
-SIZE (git-htmldocs-1.7.1.1.tar.bz2) = 881196
-MD5 (git-1.7.1.1.tar.bz2.sign) = 6266e0503155b2bbf1698f6173b1edb8
-SHA256 (git-1.7.1.1.tar.bz2.sign) = 12d23bde39070e07bf6aaa5e3b3dd3a6c43d544a22abc497c54cdd8123d5ffea
-SIZE (git-1.7.1.1.tar.bz2.sign) = 248
-MD5 (git-manpages-1.7.1.1.tar.bz2.sign) = d978e98ad641a9ff09d938a3237b06b5
-SHA256 (git-manpages-1.7.1.1.tar.bz2.sign) = 5a5a909ff43f8cccc83b301d22dae48ee8d5f01f2f78b2d59f00275877a9646b
-SIZE (git-manpages-1.7.1.1.tar.bz2.sign) = 248
-MD5 (git-htmldocs-1.7.1.1.tar.bz2.sign) = ffd72035d4c2065a295c4dd9c65a61f2
-SHA256 (git-htmldocs-1.7.1.1.tar.bz2.sign) = b89dd4fe2219632534b9caa973db00217c50cb6386cf405e7cd3215c80ba4868
-SIZE (git-htmldocs-1.7.1.1.tar.bz2.sign) = 248
+MD5 (git-1.7.2.2.tar.bz2) = 4a5840b6d650692cb320eddb5ccefbaf
+SHA256 (git-1.7.2.2.tar.bz2) = 9ea4936f04f56426e8b643d22caeb9e1d1e5a5b28111fcd3839b6735b3610a66
+SIZE (git-1.7.2.2.tar.bz2) = 2564964
+MD5 (git-manpages-1.7.2.2.tar.bz2) = 2278da6b57891bd9b789d313dc8eb772
+SHA256 (git-manpages-1.7.2.2.tar.bz2) = 98fbdfcb884b3c0ea0e444417724cdd2baf49b70a400a3037dc87120d76ae8d9
+SIZE (git-manpages-1.7.2.2.tar.bz2) = 287738
+MD5 (git-htmldocs-1.7.2.2.tar.bz2) = 83ce6457a4d80c38ce7c4d477bdf5600
+SHA256 (git-htmldocs-1.7.2.2.tar.bz2) = 564218c2b5b9dfd61ef974f2386c13555f01c9cab567f8d164327a5fdba54e3d
+SIZE (git-htmldocs-1.7.2.2.tar.bz2) = 897657
+MD5 (git-1.7.2.2.tar.bz2.sign) = 0853b10d9c4a65e310722dfc8997d9d8
+SHA256 (git-1.7.2.2.tar.bz2.sign) = 283eac0a7bb8c6d28ca227244ab9c8d5359d2f641ff6f44f5d2c4ec908b1d933
+SIZE (git-1.7.2.2.tar.bz2.sign) = 248
+MD5 (git-manpages-1.7.2.2.tar.bz2.sign) = a8b2ac10ee1e54dd9a73b9cc1383f6ba
+SHA256 (git-manpages-1.7.2.2.tar.bz2.sign) = b099025fb36cb94d990f68b948688159ea5a7aa80b521f090dc7d973649c8ad0
+SIZE (git-manpages-1.7.2.2.tar.bz2.sign) = 248
+MD5 (git-htmldocs-1.7.2.2.tar.bz2.sign) = 5fd69f1c3a45a402f5f3128b39ccbd64
+SHA256 (git-htmldocs-1.7.2.2.tar.bz2.sign) = 846f3dcd8e34a354b02454ecaf48160880670e7bd0e39ff0adb26ac674d2d9da
+SIZE (git-htmldocs-1.7.2.2.tar.bz2.sign) = 248
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index 93b5766ac493..0a53fbcbd3b3 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,5 +1,5 @@
---- Documentation/Makefile.orig	2010-03-07 17:13:40.000000000 -0500
-+++ Documentation/Makefile	2010-03-14 12:02:57.551179596 -0400
+--- ./Documentation/Makefile.orig	2010-07-28 13:03:43.000000000 -0400
++++ ./Documentation/Makefile	2010-08-16 21:56:14.233982716 -0400
 @@ -30,10 +30,10 @@
  DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
  DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
@@ -22,3 +22,4 @@
 +all: html
  
  html: $(DOC_HTML)
+ 
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 541ee2e466ec..d921a72716a7 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2009-04-10 23:26:19.911276986 -0400
-+++ Makefile	2009-04-10 23:26:23.213278777 -0400
-@@ -173,8 +173,8 @@
+--- ./Makefile.orig	2010-07-28 13:03:43.000000000 -0400
++++ ./Makefile	2010-08-16 21:56:54.957322822 -0400
+@@ -255,8 +255,8 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -8,10 +8,10 @@
 -LDFLAGS =
 +CFLAGS ?= -g -O2 -Wall
 +LDFLAGS ?=
- ALL_CFLAGS = $(CFLAGS)
+ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -194,12 +194,12 @@
+@@ -276,13 +276,13 @@
  prefix = $(HOME)
  bindir_relative = bin
  bindir = $(prefix)/$(bindir_relative)
@@ -21,19 +21,22 @@
 +infodir = $(prefix)/info
  gitexecdir = libexec/git-core
  sharedir = $(prefix)/share
+-gitwebdir = $(sharedir)/gitweb
++gitwebdir = $(sharedir)/examples/git/gitweb
  template_dir = share/git-core/templates
 -htmldir = share/doc/git-doc
 +htmldir = share/doc/git
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
-@@ -230,16 +230,16 @@
+@@ -296,18 +296,18 @@
  
- export prefix bindir sharedir sysconfdir
+ export prefix bindir sharedir sysconfdir gitwebdir
  
 -CC = gcc
 -AR = ar
 -RM = rm -f
+-DIFF = diff
 -TAR = tar
 -FIND = find
 -INSTALL = install
@@ -41,9 +44,11 @@
 -TCL_PATH = tclsh
 -TCLTK_PATH = wish
 -PTHREAD_LIBS = -lpthread
+-PTHREAD_CFLAGS =
 +CC ?= gcc
 +AR ?= ar
 +RM ?= rm -f
++DIFF ?= diff
 +TAR ?= tar
 +FIND ?= find
 +INSTALL ?= install
@@ -51,10 +56,11 @@
 +TCL_PATH ?= tclsh
 +TCLTK_PATH ?= wish
 +PTHREAD_LIBS ?= -lpthread
++PTHREAD_CFLAGS ?=
  
  export TCL_PATH TCLTK_PATH
  
-@@ -880,9 +880,9 @@
+@@ -1232,9 +1232,9 @@
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
diff --git a/devel/git/files/patch-setup.c b/devel/git/files/patch-setup.c
deleted file mode 100644
index c5b46349ff7d..000000000000
--- a/devel/git/files/patch-setup.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.c.orig	2010-07-22 11:30:51.186311264 -0400
-+++ ./setup.c	2010-07-22 11:32:10.173155632 -0400
-@@ -170,6 +170,8 @@
- 	char path[PATH_MAX];
- 	size_t len = strlen(suspect);
- 
-+	if (PATH_MAX <= len + strlen("/objects"))
-+		die("Too long path: %.*s", 60, suspect);
- 	strcpy(path, suspect);
- 	if (getenv(DB_ENVIRONMENT)) {
- 		if (access(getenv(DB_ENVIRONMENT), X_OK))
diff --git a/devel/git/files/patch-wrapper.c b/devel/git/files/patch-wrapper.c
index c66a97b8f272..ad095f151938 100644
--- a/devel/git/files/patch-wrapper.c
+++ b/devel/git/files/patch-wrapper.c
@@ -1,6 +1,6 @@
---- wrapper.c.orig	2010-04-17 10:41:51.454820281 -0400
-+++ wrapper.c	2010-04-17 11:00:32.542693956 -0400
-@@ -117,7 +117,7 @@
+--- ./wrapper.c.orig	2010-07-28 13:03:43.000000000 -0400
++++ ./wrapper.c	2010-08-16 21:56:14.250979872 -0400
+@@ -131,7 +131,7 @@
  {
  	ssize_t nr;
  	while (1) {
@@ -9,7 +9,7 @@
  		if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
  			continue;
  		return nr;
-@@ -133,7 +133,7 @@
+@@ -147,7 +147,7 @@
  {
  	ssize_t nr;
  	while (1) {
diff --git a/devel/git/files/pkg-message.in b/devel/git/files/pkg-message.in
index 9ceb521e3f60..a5ba36d30f56 100644
--- a/devel/git/files/pkg-message.in
+++ b/devel/git/files/pkg-message.in
@@ -7,7 +7,7 @@ In the directory %%EXAMPLESDIR%%/gitweb you can find all files to
 make gitweb work as a public repository on the web.
 
 All you have to do to make gitweb work is:
-1) Copy the files %%EXAMPLESDIR%%/gitweb/git* to a directory on
+1) Copy the files %%EXAMPLESDIR%%/gitweb/* to a directory on
    your web server (e.g. Apache2) in which you are able to execute
    CGI-scripts.
 2) In gitweb.cgi, adjust the variable $projectroot to point to
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 7a072982cf91..e0f0866d4d1b 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -14,6 +14,14 @@ bin/git-shell
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/git.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/repo.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/repo.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/non_local.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/non_local.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/importer.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/importer.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/exporter.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/exporter.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers-0.1.0-py%%PYTHON_VER%%.egg-info
 libexec/git-core/git
 libexec/git-core/git-add
@@ -121,6 +129,7 @@ libexec/git-core/git-receive-pack
 libexec/git-core/git-reflog
 libexec/git-core/git-relink
 libexec/git-core/git-remote
+libexec/git-core/git-remote-testgit
 %%CURL%%libexec/git-core/git-remote-http
 %%CURL%%libexec/git-core/git-remote-https
 %%CURL%%libexec/git-core/git-remote-ftp
@@ -610,6 +619,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-daemon.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-index-pack.txt
 %%HTMLDOCS%%%%DOCSDIR%%/rev-list-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/revisions.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-rerere.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-fast-export.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-get-tar-commit-id.txt
@@ -655,10 +665,12 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-gc.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitattributes.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-update-index.txt
-%%HTMLDOCS%%%%DOCSDIR%%/gitdiffcore.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-check-ref-format.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-unpack-objects.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-diff.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitdiffcore.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitrevisions.html
+%%HTMLDOCS%%%%DOCSDIR%%/gitrevisions.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.2.txt
@@ -758,17 +770,18 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.5.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.7.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.1.txt
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-logo.png
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.2.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.2.2.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.js
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.css
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-logo.png
 %%CONTRIB%%share/git-core/contrib/README
 %%CONTRIB%%share/git-core/contrib/blameview/README
 %%CONTRIB%%share/git-core/contrib/blameview/blameview.perl
@@ -839,10 +852,17 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%share/git-core/contrib/stats/git-common-hash
 %%CONTRIB%%share/git-core/contrib/stats/mailmap.pl
 %%CONTRIB%%share/git-core/contrib/stats/packinfo.pl
+%%CONTRIB%%share/git-core/contrib/svn-fe/svn-fe.c
+%%CONTRIB%%share/git-core/contrib/svn-fe/svn-fe.txt
+%%CONTRIB%%share/git-core/contrib/svn-fe/.gitignore
+%%CONTRIB%%share/git-core/contrib/svn-fe/Makefile
 %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README
 %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh
 %%CONTRIB%%share/git-core/contrib/vim/README
 %%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir
+%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb/static
+%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
+%%GITWEB%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
 @dirrm lib/xemacs/site-lisp/git
 @dirrmtry lib/xemacs/site-lisp
@@ -878,6 +898,7 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%@dirrm share/git-core/contrib/p4import
 %%CONTRIB%%@dirrm share/git-core/contrib/patches
 %%CONTRIB%%@dirrm share/git-core/contrib/stats
+%%CONTRIB%%@dirrm share/git-core/contrib/svn-fe
 %%CONTRIB%%@dirrm share/git-core/contrib/thunderbird-patch-inline
 %%CONTRIB%%@dirrm share/git-core/contrib/vim
 %%CONTRIB%%@dirrm share/git-core/contrib/workdir