From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 2 00:50:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F19C31065673 for ; Fri, 2 May 2008 00:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CA4F68FC19 for ; Fri, 2 May 2008 00:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m420o1fO002117 for ; Fri, 2 May 2008 00:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m420o1HP002116; Fri, 2 May 2008 00:50:01 GMT (envelope-from gnats) Resent-Date: Fri, 2 May 2008 00:50:01 GMT Resent-Message-Id: <200805020050.m420o1HP002116@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrew Bennett Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D895A106564A for ; Fri, 2 May 2008 00:46:15 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id C3AD38FC18 for ; Fri, 2 May 2008 00:46:15 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m420jXrt059581 for ; Fri, 2 May 2008 00:45:33 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m420jXXE059580; Fri, 2 May 2008 00:45:33 GMT (envelope-from nobody) Message-Id: <200805020045.m420jXXE059580@www.freebsd.org> Date: Fri, 2 May 2008 00:45:33 GMT From: Andrew Bennett To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/123318: [update+fix] devel/git 1.5.5.1 and manpage directory fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 May 2008 00:50:03 -0000 >Number: 123318 >Category: ports >Synopsis: [update+fix] devel/git 1.5.5.1 and manpage directory fix >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: Fri May 02 00:50:01 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@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 April 20, 2008 at http://git.or.cz Read the release notes here: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.5.1.txt This patch also fixes the problem where git was unable to find the man pages when using the "--help" switch. There's an example below. >How-To-Repeat: Run the following (or any of the git commands followed by --help): $ git checkout --help No manual entry for git-checkout $ git-checkout --help No manual entry for git-checkout $ man git-checkout (launches the man page as expected) After applying the patch... $ git checkout --help $ git-checkout --help $ man git-checkout (all of these launch the man page as expected) >Fix: The patch changes the $(mandir) variable in the Makefile for git. Patch attached with submission follows: diff --git a/devel/git/Makefile b/devel/git/Makefile index da09cae..6accfaa 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -6,7 +6,7 @@ # PORTNAME= git -PORTVERSION= 1.5.5 +PORTVERSION= 1.5.5.1 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..a84b69c 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.1.tar.bz2) = 6c5ffadc0e6a8652833b4160510ed27f +SHA256 (git-1.5.5.1.tar.bz2) = c95156a12cd86a20420e037304c255c847d44353af8e0dc77ee074fc59248707 +SIZE (git-1.5.5.1.tar.bz2) = 1675032 +MD5 (git-manpages-1.5.5.1.tar.bz2) = fce7fcb9ee6cab3e863d51e7c0dd35e1 +SHA256 (git-manpages-1.5.5.1.tar.bz2) = d9a253c30a12ccd3b0e0a69d48c7fe61b16dbfc119da855febaf6e599cecf689 +SIZE (git-manpages-1.5.5.1.tar.bz2) = 163214 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: