svn commit: r398232 - in head/devel/git: . files
Renato Botelho
garga at FreeBSD.org
Wed Sep 30 18:58:25 UTC 2015
Author: garga
Date: Wed Sep 30 18:58:23 2015
New Revision: 398232
URL: https://svnweb.freebsd.org/changeset/ports/398232
Log:
- Update devel/git to 2.6.0
- Use DISTVERSION instead of PORTVERSION to make it easy to test new version
RCs when they are available
Modified:
head/devel/git/Makefile
head/devel/git/distinfo
head/devel/git/files/patch-Makefile
head/devel/git/pkg-plist
Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile Wed Sep 30 18:58:04 2015 (r398231)
+++ head/devel/git/Makefile Wed Sep 30 18:58:23 2015 (r398232)
@@ -2,15 +2,14 @@
# $FreeBSD$
PORTNAME= git
-PORTVERSION= 2.5.3
-PORTREVISION= 1
+DISTVERSION= 2.6.0
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
+ ${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}
# We manually extract the htmldocs.
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
- ${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
+ ${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= garga at FreeBSD.org
COMMENT?= Distributed source code management tool
@@ -73,7 +72,7 @@ CURL_RUN_DEPENDS= curl:${PORTSDIR}/ftp/c
CURL_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
CURL_MAKE_ARGS_OFF= NO_CURL=1 NO_EXPAT=1
-HTMLDOCS_DISTFILES= ${PORTNAME}-htmldocs-${PORTVERSION}${EXTRACT_SUFX}
+HTMLDOCS_DISTFILES= ${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}
GUI_USES= tk
GUI_MAKE_ARGS= TCL_PATH=${TCLSH} TCLTK_PATH=${WISH}
@@ -132,7 +131,7 @@ post-extract:
.if ${PORT_OPTIONS:MHTMLDOCS}
@${MKDIR} ${WRKDIR}/htmldocs
@cd ${WRKDIR}/htmldocs && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
- ${DISTDIR}/${PORTNAME}-htmldocs-${PORTVERSION}${EXTRACT_SUFX} \
+ ${DISTDIR}/${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX} \
${EXTRACT_AFTER_ARGS}
.endif
Modified: head/devel/git/distinfo
==============================================================================
--- head/devel/git/distinfo Wed Sep 30 18:58:04 2015 (r398231)
+++ head/devel/git/distinfo Wed Sep 30 18:58:23 2015 (r398232)
@@ -1,6 +1,6 @@
-SHA256 (git-2.5.3.tar.xz) = 124d29d857a1282fd2111cf4a021f156e8bae917f455b4551b2aea87f0453a1a
-SIZE (git-2.5.3.tar.xz) = 3745096
-SHA256 (git-manpages-2.5.3.tar.xz) = c5d8e9036be741924cf2614f0178a10f0c7d7b1d3efef96c1a08c751596cae3a
-SIZE (git-manpages-2.5.3.tar.xz) = 378000
-SHA256 (git-htmldocs-2.5.3.tar.xz) = f87465b5f6d01ceccb314b3e0a3749d642bea1007b0bc78afba868d75413d85e
-SIZE (git-htmldocs-2.5.3.tar.xz) = 1009248
+SHA256 (git-2.6.0.tar.xz) = 211beb96ff41a83727e39704431ac388ecb1cebb5219cda067999bce4e1e15a6
+SIZE (git-2.6.0.tar.xz) = 3808872
+SHA256 (git-manpages-2.6.0.tar.xz) = 94c45cf2353f8e1bbb6b56b6f54289203319db4cc38d94f53fcfb8dc3b669615
+SIZE (git-manpages-2.6.0.tar.xz) = 380940
+SHA256 (git-htmldocs-2.6.0.tar.xz) = 0ba5d5d630e3235b74bcfb4ea2e9bbda8a3e619aaaf9e1f56e12dec5d8dc1d87
+SIZE (git-htmldocs-2.6.0.tar.xz) = 1016192
Modified: head/devel/git/files/patch-Makefile
==============================================================================
--- head/devel/git/files/patch-Makefile Wed Sep 30 18:58:04 2015 (r398231)
+++ head/devel/git/files/patch-Makefile Wed Sep 30 18:58:23 2015 (r398232)
@@ -86,7 +86,7 @@
mv $@+ $@
else # NO_PERL
-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
-+$(SCRIPT_PERL_GEN) git-instaweb git-submodule git-am git-request-pull: % : unimplemented.sh
++$(SCRIPT_PERL_GEN) git-instaweb git-submodule git-request-pull: % : unimplemented.sh
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
Modified: head/devel/git/pkg-plist
==============================================================================
--- head/devel/git/pkg-plist Wed Sep 30 18:58:04 2015 (r398231)
+++ head/devel/git/pkg-plist Wed Sep 30 18:58:23 2015 (r398232)
@@ -798,8 +798,6 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt
-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.html
-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.html
@@ -824,6 +822,8 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-submodule-config.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-submodule-config.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-trace.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-trace.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.html
@@ -1247,6 +1247,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.2.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.0.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -1290,6 +1291,7 @@ share/git-core/templates/info/exclude
%%CONTRIB%%share/git-core/contrib/emacs/git.el
%%CONTRIB%%share/git-core/contrib/examples/README
%%CONTRIB%%share/git-core/contrib/examples/builtin-fetch--tool.c
+%%CONTRIB%%share/git-core/contrib/examples/git-am.sh
%%CONTRIB%%share/git-core/contrib/examples/git-checkout.sh
%%CONTRIB%%share/git-core/contrib/examples/git-clean.sh
%%CONTRIB%%share/git-core/contrib/examples/git-clone.sh
@@ -1301,6 +1303,7 @@ share/git-core/templates/info/exclude
%%CONTRIB%%share/git-core/contrib/examples/git-merge-ours.sh
%%CONTRIB%%share/git-core/contrib/examples/git-merge.sh
%%CONTRIB%%share/git-core/contrib/examples/git-notes.sh
+%%CONTRIB%%share/git-core/contrib/examples/git-pull.sh
%%CONTRIB%%share/git-core/contrib/examples/git-remote.perl
%%CONTRIB%%share/git-core/contrib/examples/git-repack.sh
%%CONTRIB%%share/git-core/contrib/examples/git-rerere.perl
More information about the svn-ports-head
mailing list