[Midnightbsd-cvs] mports [20906] trunk/devel/git: git 2.7.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jan 10 16:04:41 EST 2016
Revision: 20906
http://svnweb.midnightbsd.org/mports/?rev=20906
Author: laffer1
Date: 2016-01-10 16:04:41 -0500 (Sun, 10 Jan 2016)
Log Message:
-----------
git 2.7.0
Modified Paths:
--------------
trunk/devel/git/Makefile
trunk/devel/git/distinfo
trunk/devel/git/files/git_daemon.in
trunk/devel/git/files/patch-Documentation__Makefile
trunk/devel/git/files/patch-Makefile
trunk/devel/git/pkg-plist
Property Changed:
----------------
trunk/devel/git/files/git_daemon.in
Modified: trunk/devel/git/Makefile
===================================================================
--- trunk/devel/git/Makefile 2016-01-06 18:45:52 UTC (rev 20905)
+++ trunk/devel/git/Makefile 2016-01-10 21:04:41 UTC (rev 20906)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= git
-PORTVERSION= 2.4.6
+PORTVERSION= 2.7.0
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
Modified: trunk/devel/git/distinfo
===================================================================
--- trunk/devel/git/distinfo 2016-01-06 18:45:52 UTC (rev 20905)
+++ trunk/devel/git/distinfo 2016-01-10 21:04:41 UTC (rev 20906)
@@ -1,6 +1,6 @@
-SHA256 (git-2.4.6.tar.xz) = bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6
-SIZE (git-2.4.6.tar.xz) = 3690432
-SHA256 (git-manpages-2.4.6.tar.xz) = f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e
-SIZE (git-manpages-2.4.6.tar.xz) = 373408
-SHA256 (git-htmldocs-2.4.6.tar.xz) = 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88
-SIZE (git-htmldocs-2.4.6.tar.xz) = 994712
+SHA256 (git-2.7.0.tar.xz) = fa9fb34efce9c80527152a40fbae138e83bd04a15ef9111726252259345a7b0d
+SIZE (git-2.7.0.tar.xz) = 3861524
+SHA256 (git-manpages-2.7.0.tar.xz) = b7f255aa17a5d06b9b71f6e3957f65e8f15789b2d31f09b1c2bf697a21458a0d
+SIZE (git-manpages-2.7.0.tar.xz) = 384248
+SHA256 (git-htmldocs-2.7.0.tar.xz) = a9d30a744eb07392ba3ffe389cca7e57a2bdd718c9ffccdf2d525eeafac548a9
+SIZE (git-htmldocs-2.7.0.tar.xz) = 1028748
Modified: trunk/devel/git/files/git_daemon.in
===================================================================
--- trunk/devel/git/files/git_daemon.in 2016-01-06 18:45:52 UTC (rev 20905)
+++ trunk/devel/git/files/git_daemon.in 2016-01-10 21:04:41 UTC (rev 20906)
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/devel/git/files/git_daemon.in 307344 2012-11-12 20:32:17Z wxs $
#
# PROVIDE: git_daemon
Property changes on: trunk/devel/git/files/git_daemon.in
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/devel/git/files/patch-Documentation__Makefile
===================================================================
--- trunk/devel/git/files/patch-Documentation__Makefile 2016-01-06 18:45:52 UTC (rev 20905)
+++ trunk/devel/git/files/patch-Documentation__Makefile 2016-01-10 21:04:41 UTC (rev 20906)
@@ -1,6 +1,6 @@
---- ./Documentation/Makefile.orig 2013-08-27 12:08:25.000000000 -0400
-+++ ./Documentation/Makefile 2013-08-27 12:09:18.000000000 -0400
-@@ -83,11 +83,11 @@
+--- Documentation/Makefile.orig 2015-11-05 21:31:55 UTC
++++ Documentation/Makefile
+@@ -86,11 +86,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_T
DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
@@ -15,7 +15,7 @@
mandir ?= $(prefix)/share/man
man1dir = $(mandir)/man1
man5dir = $(mandir)/man5
-@@ -202,7 +202,7 @@
+@@ -212,7 +212,7 @@ ifndef V
endif
endif
Modified: trunk/devel/git/files/patch-Makefile
===================================================================
--- trunk/devel/git/files/patch-Makefile 2016-01-06 18:45:52 UTC (rev 20905)
+++ trunk/devel/git/files/patch-Makefile 2016-01-10 21:04:41 UTC (rev 20906)
@@ -1,6 +1,6 @@
---- Makefile.orig 2013-06-12 14:17:51.000000000 -0400
-+++ Makefile 2013-06-12 14:24:27.000000000 -0400
-@@ -349,8 +349,8 @@
+--- Makefile.orig 2015-11-05 21:31:55 UTC
++++ Makefile
+@@ -372,8 +372,8 @@ GIT-VERSION-FILE: FORCE
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -11,7 +11,7 @@
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
-@@ -372,15 +372,15 @@
+@@ -398,15 +398,15 @@ ARFLAGS = rcs
prefix = $(HOME)
bindir_relative = bin
bindir = $(prefix)/$(bindir_relative)
@@ -31,7 +31,7 @@
ETC_GITCONFIG = $(sysconfdir)/gitconfig
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
lib = lib
-@@ -393,21 +393,21 @@
+@@ -419,22 +419,22 @@ htmldir_relative = $(patsubst $(prefix)/
export prefix bindir sharedir sysconfdir gitwebdir localedir
@@ -47,6 +47,7 @@
-TCLTK_PATH = wish
-XGETTEXT = xgettext
-MSGFMT = msgfmt
+-CURL_CONFIG = curl-config
-PTHREAD_LIBS = -lpthread
-PTHREAD_CFLAGS =
-GCOV = gcov
@@ -62,6 +63,7 @@
+TCLTK_PATH ?= wish
+XGETTEXT ?= xgettext
+MSGFMT ?= msgfmt
++CURL_CONFIG ?= curl-config
+PTHREAD_LIBS ?= -lpthread
+PTHREAD_CFLAGS ?=
+GCOV ?= gcov
@@ -68,7 +70,7 @@
export TCL_PATH TCLTK_PATH
-@@ -1154,9 +1154,9 @@
+@@ -1107,9 +1107,9 @@ EXTLIBS += -lz
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
@@ -81,3 +83,12 @@
else
OPENSSL_LINK =
endif
+@@ -1803,7 +1803,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT
+ chmod +x $@+ && \
+ mv $@+ $@
+ else # NO_PERL
+-$(SCRIPT_PERL_GEN) git-instaweb: % : 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: trunk/devel/git/pkg-plist
===================================================================
--- trunk/devel/git/pkg-plist 2016-01-06 18:45:52 UTC (rev 20905)
+++ trunk/devel/git/pkg-plist 2016-01-10 21:04:41 UTC (rev 20906)
@@ -154,9 +154,18 @@
man/man1/git-web--browse.1.gz
man/man1/git-whatchanged.1.gz
man/man1/git-write-tree.1.gz
+man/man1/git-worktree.1.gz
%%GUI%%man/man1/gitk.1.gz
man/man1/gitremote-helpers.1.gz
man/man1/gitweb.1.gz
+%%PERL%%man/man3/Git.3.gz
+%%PERL%%man/man3/Git::I18N.3.gz
+%%PERL%%man/man3/Git::SVN::Editor.3.gz
+%%PERL%%man/man3/Git::SVN::Fetcher.3.gz
+%%PERL%%man/man3/Git::SVN::Memoize::YAML.3.gz
+%%PERL%%man/man3/Git::SVN::Prompt.3.gz
+%%PERL%%man/man3/Git::SVN::Ra.3.gz
+%%PERL%%man/man3/Git::SVN::Utils.3.gz
man/man5/gitattributes.5.gz
man/man5/githooks.5.gz
man/man5/gitignore.5.gz
@@ -322,6 +331,7 @@
libexec/git-core/git-status
libexec/git-core/git-stripspace
libexec/git-core/git-submodule
+libexec/git-core/git-submodule--helper
%%CONTRIB%%libexec/git-core/git-subtree
%%SVN%%libexec/git-core/git-svn
libexec/git-core/git-symbolic-ref
@@ -339,6 +349,7 @@
libexec/git-core/git-verify-tag
libexec/git-core/git-web--browse
libexec/git-core/git-whatchanged
+libexec/git-core/git-worktree
libexec/git-core/git-write-tree
libexec/git-core/mergetools/codecompare
libexec/git-core/mergetools/deltawalker
@@ -363,6 +374,7 @@
libexec/git-core/mergetools/opendiff
libexec/git-core/mergetools/emerge
libexec/git-core/mergetools/araxis
+libexec/git-core/mergetools/winmerge
%%GUI%%bin/gitk
%%PERL%%%%SITE_PERL%%/Git.pm
%%PERL%%%%SITE_PERL%%/Git/I18N.pm
@@ -514,6 +526,7 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-fetch.html
%%HTMLDOCS%%%%DOCSDIR%%/git-filter-branch.html
%%HTMLDOCS%%%%DOCSDIR%%/git-fmt-merge-msg.html
+%%HTMLDOCS%%%%DOCSDIR%%/fmt-merge-msg-config.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-for-each-ref.html
%%HTMLDOCS%%%%DOCSDIR%%/git-format-patch.html
%%HTMLDOCS%%%%DOCSDIR%%/git-fsck-objects.html
@@ -749,6 +762,8 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-stage.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-status.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-worktree.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-worktree.txt
%%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
%%HTMLDOCS%%%%DOCSDIR%%/diff-config.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
@@ -782,8 +797,6 @@
%%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
@@ -808,6 +821,8 @@
%%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
@@ -831,6 +846,7 @@
%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-common.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/repository-version.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.html
@@ -1206,6 +1222,7 @@
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.3.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.2.txt
@@ -1214,6 +1231,9 @@
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.6.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.9.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.10.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.2.txt
@@ -1221,6 +1241,22 @@
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.9.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.10.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.0.txt
+%%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.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.0.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -1264,6 +1300,7 @@
%%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
@@ -1275,6 +1312,7 @@
%%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
@@ -1303,12 +1341,15 @@
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
%%CONTRIB%%share/git-core/contrib/hooks/multimail/CHANGES
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/CONTRIBUTING.rst
%%CONTRIB%%share/git-core/contrib/hooks/multimail/README
%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.migrate-from-post-receive-email
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gerrit.rst
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gitolite.rst
%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
%%CONTRIB%%share/git-core/contrib/hooks/multimail/migrate-mailhook-config
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive.example
%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl
More information about the Midnightbsd-cvs
mailing list