ports/124301: [patch] "git help diff" is broken in devel/git [1.5.5]

[Giorgos Keramidas]

>Number:         124301
>Category:       ports
>Synopsis:       [patch] "git help diff" is broken in devel/git [1.5.5]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 05 13:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Giorgos Keramidas
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD kobe 8.0-CURRENT FreeBSD 8.0-CURRENT #0: \
Tue Jun 3 19:35:11 EEST 2008 build at kobe:/home/build/obj/home/build/src/sys/KOBE i386

>Description:

The git(1) overrides the default MANPATH with GIT_MAN_PATH, so the
following odd thing happens in our git port:

    % git help diff
    No manpage for git-diff.
    % man git-diff
    [ Manpage shows up ]

The attached patch removes '/share/' from ${mandir} and ${sysconfdir} to
match our layout of /usr/local better.

>How-To-Repeat:
>Fix:

--- git-manpath.diff begins here ---
--- devel/git/files/patch-Makefile.orig	2008-06-05 15:50:18.000000000 +0300
+++ devel/git/files/patch-Makefile	2008-06-05 15:50:44.000000000 +0300
@@ -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-06-05 15:43:36.000000000 +0300
++++ Makefile	2008-06-05 15:44:15.000000000 +0300
+@@ -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
--- git-manpath.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: