- [1]: Update to 1.6.2.4

- [2]: Respect WITHOUT_X11 along with WITHOUT_GUI

Changelogs between old version and 1.6.2.4 are at:
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.2.3.txt
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.2.4.txt

PR:		ports/133925 [1], private mail [2]
Submitted by:	Eygene Ryabinkin <rea-fbsd@codelabs.ru> [1]
		Dmitry Morozovsky <marck@rinet.ru> [2]

4 files changed, 15 insertions, 12 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 8504c2299a35..3f1ec31b7477 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.6.2.2
+PORTVERSION=	1.6.2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -173,6 +173,7 @@ USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=	CURLDIR=${LOCALBASE} \
 		NEEDS_LIBICONV=yes \
+		OLD_ICONV=yes \
 		PERL_PATH=${PERL} \
 		LIBMD_SHA1=yes
 MAKE_ARGS+=	prefix="${PREFIX}"
@@ -198,7 +199,7 @@ PLIST_SUB+=	HTMLDOCS=""
 PLIST_SUB+=	HTMLDOCS="@comment "
 .endif
 
-.ifndef (WITHOUT_GUI)
+.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
 USE_TK=		84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 MAN1+=		git-citool.1 \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 638822d7b508..90983c9f763e 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.2.2.tar.bz2) = d219aa5480ed6396f8ab968f3f7eb0f9
-SHA256 (git-1.6.2.2.tar.bz2) = 7b440c1589de36e94b751cfb3b9d60d9a3131eeab8229e759a1fd0328ea36166
-SIZE (git-1.6.2.2.tar.bz2) = 2016513
-MD5 (git-manpages-1.6.2.2.tar.bz2) = 88f9c5c6d092173ac47be23c82ab5e46
-SHA256 (git-manpages-1.6.2.2.tar.bz2) = e6dc1cf2e2e2748314300c825a36ff808158d5d288b7d75009c40972a338f6f5
-SIZE (git-manpages-1.6.2.2.tar.bz2) = 236466
-MD5 (git-1.6.2.2.tar.bz2.sign) = a60bdcbef8b0611f5327cf549d00da79
-SHA256 (git-1.6.2.2.tar.bz2.sign) = a54a7b0c474d8b6216b5fecb0387d8ebd39499f98c19c6d2c970e55b0c539f30
-SIZE (git-1.6.2.2.tar.bz2.sign) = 248
+MD5 (git-1.6.2.4.tar.bz2) = c24d796879bb09e1cc5545bf3a3d7cf6
+SHA256 (git-1.6.2.4.tar.bz2) = 7f33a25798452a637740a65591608777e876cc6774162c50ace3822c0532a10f
+SIZE (git-1.6.2.4.tar.bz2) = 2019308
+MD5 (git-manpages-1.6.2.4.tar.bz2) = 7a1c179cfc1ee135dc54877be9c6a5f3
+SHA256 (git-manpages-1.6.2.4.tar.bz2) = 68ad3a55a2bd0bdad8e180586700450e1bdc499809684c225780d6d4d3a88208
+SIZE (git-manpages-1.6.2.4.tar.bz2) = 236920
+MD5 (git-1.6.2.4.tar.bz2.sign) = 8d87df5faf6874935aa8063cb948d4da
+SHA256 (git-1.6.2.4.tar.bz2.sign) = 50566b69673b24572edf219ba6884c917d9860a15cbaf8d94c6e0acaa614b594
+SIZE (git-1.6.2.4.tar.bz2.sign) = 248
diff --git a/devel/git/pkg-descr b/devel/git/pkg-descr
index 67039848a9fb..53dd70d94512 100644
--- a/devel/git/pkg-descr
+++ b/devel/git/pkg-descr
@@ -8,4 +8,4 @@ to e.g. GNU Arch or Monotone (or, in the commercial world, BitKeeper). Every
 GIT working directory is a full-fledged repository with full revision tracking
 capabilities, not dependent on network access to a central server.
 
-WWW: http://git.or.cz/
+WWW: http://git-scm.org/
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 74765edf7e51..2532d1a40ede 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -528,6 +528,8 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.4.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png