ports/113643: update ports/devel/git to 1.5.2.1

[Eygene Ryabinkin]

Me again.

The third patch: it removed the need in patching Makefile.  GNU
make respects the variables passed in the command line even if
they were initialized inside the Makefile.  And as Git maintainers
told me, it is the preferred way to go.

This patch is a kind of cosmetic.  I am Cc'ing Ed Shouten who did
that patch for the Makefile.  Ed, is that what you meant?

diff -urN ./Makefile ../git/Makefile
--- ./Makefile	Thu Jun 14 16:00:09 2007
+++ ../git/Makefile	Thu Jun 14 16:37:12 2007
@@ -183,15 +183,20 @@
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PYTHON_PATH=${LOCALBASE}/bin/python \
 		PERL_PATH=${PERL}
-MAKE_ARGS+=	prefix="${PREFIX}"
+MAKE_ARGS+=	prefix="${PREFIX}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="${CC}" \
+		TAR="${TAR}" \
+		INSTALL="${INSTALL}"
 
 .ifndef WITHOUT_GUI
 PLIST_SUB+=	GUI=""
 RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-MAKE_ENV+=	TCL_PATH=tclsh8.4 TCLTK_PATH=wish8.4
+MAKE_ARGS+=	TCL_PATH=tclsh8.4 TCLTK_PATH=wish8.4
 .else
 PLIST_SUB+=	GUI="@comment "
-MAKE_ENV+=	NO_TCLTK=yes
+MAKE_ARGS+=	NO_TCLTK=yes
 .endif
 
 .ifdef WITH_GITSVN
diff -urN ./files/patch-Makefile ../git/files/patch-Makefile
--- ./files/patch-Makefile	Thu Jun 14 16:00:09 2007
+++ ../git/files/patch-Makefile	Thu Jan  1 03:00:00 1970
@@ -1,34 +0,0 @@
---- Makefile	Sun May 20 10:40:55 2007
-+++ Makefile	Sat May 26 20:43:02 2007
-@@ -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
-@@ -172,13 +172,13 @@
- 
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
- 
--CC = gcc
--AR = ar
--TAR = tar
--INSTALL = install
--RPMBUILD = rpmbuild
--TCL_PATH = tclsh
--TCLTK_PATH = wish
-+CC ?= gcc
-+AR ?= ar
-+TAR ?= tar
-+INSTALL ?= install
-+RPMBUILD ?= rpmbuild
-+TCL_PATH ?= tclsh
-+TCLTK_PATH ?= wish
- 
- export TCL_PATH TCLTK_PATH
-