Skip site navigation (1)Skip section navigation (2)
Date:      Tue,  5 May 2009 17:36:07 +0400 (MSD)
From:      Eygene Ryabinkin <rea-fbsd@codelabs.ru>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/134232: [patch] devel/git: update to 1.6.2.5 and create the list of mirrors for kernel.org
Message-ID:  <20090505133607.A4D73173C8@amnesiac.at.no.dns>
Resent-Message-ID: <200905051350.n45Do1RI000396@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         134232
>Category:       ports
>Synopsis:       [patch] devel/git: update to 1.6.2.5 and create the list of mirrors for kernel.org
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 05 13:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Eygene Ryabinkin
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
Code Labs
>Environment:

System: FreeBSD 8.0-CURRENT amd64

>Description:

Git now is at 1.6.2.5 [1].

>How-To-Repeat:

[1] http://git-scm.org/

>Fix:

The following patch updates the port and adds a list of kernel.org
mirrors.  If the patch will be accepted, I am planning to insert
MASTER_SITE_KERNEL_ORG to all ports that download files from there.

--- 1.6.2.4-to.1.6.2.5-and-kernel.org-mirrors.diff begins here ---
>From 5496e98422005884dc6830415f57d389ae30cf18 Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Date: Tue, 5 May 2009 17:11:16 +0400

For the list of the kernel.org mirrors, I had chosen sites with more
than one backend server (DNS alias) from the complete list of official
mirrors.

I had tested the complete list of the added mirrors and all of them work
fine (download of older release, git-1.6.2.4, is OK for each mirror).

Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
---
 Mk/bsd.sites.mk     |   12 ++++++++++++
 devel/git/Makefile  |    5 +++--
 devel/git/distinfo  |   18 +++++++++---------
 devel/git/pkg-plist |    1 +
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 841912a..2864705 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1472,6 +1472,18 @@ MASTER_SITE_XORG+= \
 	ftp://ftp.x.org/pub/%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_KERNEL_ORG)
+MASTER_SITE_KERNEL_ORG+= \
+	http://kernel.org/pub/%SUBDIR%/ \
+	http://www.us.kernel.org/pub/%SUBDIR%/ \
+	http://www.uk.kernel.org/pub/%SUBDIR%/ \
+	http://www.no.kernel.org/pub/%SUBDIR%/ \
+	http://www.de.kernel.org/pub/%SUBDIR%/ \
+	http://www.it.kernel.org/pub/%SUBDIR%/ \
+	http://www.ru.kernel.org/pub/%SUBDIR%/ \
+	http://www.au.kernel.org/pub/%SUBDIR%/
+.endif
+
 # Macro magic
 
 MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN SF:SOURCEFORGE SFE:SOURCEFORGE_EXTENDED \
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 2ca13ef..a8fa1dc 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.6.2.4
+PORTVERSION=	1.6.2.5
 CATEGORIES=	devel
-MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
+MASTER_SITES=	${MASTER_SITE_KERNEL_ORG}
+MASTER_SITE_SUBDIR=	software/scm/${PORTNAME}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sign
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 90983c9..871a717 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.2.4.tar.bz2) = c24d796879bb09e1cc5545bf3a3d7cf6
-SHA256 (git-1.6.2.4.tar.bz2) = 7f33a25798452a637740a65591608777e876cc6774162c50ace3822c0532a10f
-SIZE (git-1.6.2.4.tar.bz2) = 2019308
-MD5 (git-manpages-1.6.2.4.tar.bz2) = 7a1c179cfc1ee135dc54877be9c6a5f3
-SHA256 (git-manpages-1.6.2.4.tar.bz2) = 68ad3a55a2bd0bdad8e180586700450e1bdc499809684c225780d6d4d3a88208
-SIZE (git-manpages-1.6.2.4.tar.bz2) = 236920
-MD5 (git-1.6.2.4.tar.bz2.sign) = 8d87df5faf6874935aa8063cb948d4da
-SHA256 (git-1.6.2.4.tar.bz2.sign) = 50566b69673b24572edf219ba6884c917d9860a15cbaf8d94c6e0acaa614b594
-SIZE (git-1.6.2.4.tar.bz2.sign) = 248
+MD5 (git-1.6.2.5.tar.bz2) = 7ecacfbc97188b7680addf954ecf481f
+SHA256 (git-1.6.2.5.tar.bz2) = aca52a50e45a8fc3a6dd6705466afdc7d6d78d5d4ed7c44e9d60a0f29ba3219e
+SIZE (git-1.6.2.5.tar.bz2) = 2019842
+MD5 (git-manpages-1.6.2.5.tar.bz2) = cd4fcdf9ef4e09b7e63d539f6ea2192d
+SHA256 (git-manpages-1.6.2.5.tar.bz2) = a6659d9e50a2f610b7c0a6c676537268032ab8bf7637ce944d9872c6dc3d8af2
+SIZE (git-manpages-1.6.2.5.tar.bz2) = 236794
+MD5 (git-1.6.2.5.tar.bz2.sign) = 30cf212685546b7b64524e2302b78cb0
+SHA256 (git-1.6.2.5.tar.bz2.sign) = e97991e83b4bcbeaa320bd08a4aedf7eeabad8b9c62cbd705d98dd99328f3cfd
+SIZE (git-1.6.2.5.tar.bz2.sign) = 248
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 2532d1a..faabf88 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -530,6 +530,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.5.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
-- 
1.6.2.5
--- 1.6.2.4-to.1.6.2.5-and-kernel.org-mirrors.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090505133607.A4D73173C8>