From keramida@freebsd.org  Thu Jun  5 13:03:27 2008
Return-Path: <keramida@freebsd.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CAD991065674
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Jun 2008 13:03:27 +0000 (UTC)
	(envelope-from keramida@freebsd.org)
Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36])
	by mx1.freebsd.org (Postfix) with ESMTP id E6B118FC19
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Jun 2008 13:03:26 +0000 (UTC)
	(envelope-from keramida@freebsd.org)
Received: from kobe.laptop (adsl14-103.kln.forthnet.gr [77.49.141.103])
	(authenticated bits=128)
	by igloo.linux.gr (8.14.3/8.14.3/Debian-4) with ESMTP id m55D1XaT008948
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT)
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 5 Jun 2008 16:01:42 +0300
Received: from kobe.laptop (kobe.laptop [127.0.0.1])
	by kobe.laptop (8.14.2/8.14.2) with ESMTP id m55D1W99019647
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 5 Jun 2008 16:01:32 +0300 (EEST)
	(envelope-from keramida@freebsd.org)
Received: (from keramida@localhost)
	by kobe.laptop (8.14.2/8.14.2/Submit) id m55D1VcI019646;
	Thu, 5 Jun 2008 16:01:31 +0300 (EEST)
	(envelope-from keramida@freebsd.org)
Message-Id: <87wsl4xcgl.fsf@kobe.laptop>
Date: Thu, 05 Jun 2008 16:01:30 +0300
From: Giorgos Keramidas <keramida@freebsd.org>
Reply-To: Giorgos Keramidas <keramida@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] "git help diff" is broken in devel/git [1.5.5]
X-Send-Pr-Version: 3.113
X-GNATS-Notify: keramida@FreeBSD.org

>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:    anholt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 05 13:10:02 UTC 2008
>Closed-Date:    Mon Jun 16 17:38:29 UTC 2008
>Last-Modified:  Mon Jun 16 17:38:29 UTC 2008
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->anholt 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jun 5 13:10:12 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124301 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Mon Jun 16 17:38:29 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124301 
>Unformatted:
