ports/124276: [update] devel/git 1.5.5 => 1.5.5.3

[Andrew Bennett]

>Number:         124276
>Category:       ports
>Synopsis:       [update] devel/git 1.5.5 => 1.5.5.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 04 16:30:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Bennett
>Release:        FreeBSD 7.0-RELEASE amd64
>Organization:
>Environment:
FreeBSD batman.mystock.com 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Tue Apr  8 17:31:16 UTC 2008     root at batman:/usr/obj/usr/src/sys/BATMAN  amd64
>Description:
This patch updates devel/git from 1.5.5 to 1.5.5.1

git 1.5.5 was released May 28, 2008 at http://git.or.cz/

Read the release notes since version 1.5.5:

 * [1.5.5.1] - http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.5.1.txt
 * [1.5.5.2] - http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.5.2.txt
 * [1.5.5.3] - http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.5.3.txt

This patch is based on http://www.freebsd.org/cgi/query-pr.cgi?pr=123318 which fixes the problem where git was unable to find the man pages when using the "--help" switch.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/devel/git/Makefile b/devel/git/Makefile
index da09cae..745a54b 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.5.5
+PORTVERSION=	1.5.5.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 887ad81..8af4593 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-MD5 (git-1.5.5.tar.bz2) = 09f15f0b0e330986d930746abf6962f4
-SHA256 (git-1.5.5.tar.bz2) = 27483890c598450d7d1b4583e40dd8ec6c8def08c7cec94b20eb7336bb83e65e
-SIZE (git-1.5.5.tar.bz2) = 1673736
-MD5 (git-manpages-1.5.5.tar.bz2) = 62a82276856add1d2b310d1e0b5ad5db
-SHA256 (git-manpages-1.5.5.tar.bz2) = cc7f16b72a228cafd6bcc41ea09fdc67f4c5d50a0bf4521b80d8ea75127bb802
-SIZE (git-manpages-1.5.5.tar.bz2) = 162609
+MD5 (git-1.5.5.3.tar.bz2) = 022ce5772b900243ef5d289deb7a3667
+SHA256 (git-1.5.5.3.tar.bz2) = c0a5220e7c80dc791e2077ec238298c2ec30af4d8d0ed6d2fbd7ca808266dfc0
+SIZE (git-1.5.5.3.tar.bz2) = 1677113
+MD5 (git-manpages-1.5.5.3.tar.bz2) = 374a62ddf37343a5130f3318eab1ce2b
+SHA256 (git-manpages-1.5.5.3.tar.bz2) = 770543b0ca871f72829f810d51f9e4d8b27659cbf4e73534fd09dfb5833f99de
+SIZE (git-manpages-1.5.5.3.tar.bz2) = 163895
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index b625711..bab0f8c 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2007-09-19 22:02:17.000000000 +0400
-+++ Makefile	2007-09-21 22:13:25.000000000 +0400
-@@ -135,8 +135,8 @@
+--- Makefile.orig	2008-05-01 23:11:03.000000000 +0000
++++ Makefile	2008-05-01 23:11:43.000000000 +0000
+@@ -164,16 +164,16 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -11,9 +11,19 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -173,15 +173,15 @@
  
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
+ prefix = $(HOME)
+ bindir = $(prefix)/bin
+-mandir = $(prefix)/share/man
+-infodir = $(prefix)/share/info
++mandir = $(prefix)/man
++infodir = $(prefix)/info
+ gitexecdir = $(bindir)
+ sharedir = $(prefix)/share
+ template_dir = $(sharedir)/git-core/templates
+@@ -206,15 +206,15 @@
+ 
+ export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
  
 -CC = gcc
 -AR = ar


>Release-Note:
>Audit-Trail:
>Unformatted: