[Midnightbsd-cvs] mports [21474] trunk/devel/git: git 2.9.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 14 15:11:22 EDT 2016 

Revision: 21474
          http://svnweb.midnightbsd.org/mports/?rev=21474
Author:   laffer1
Date:     2016-06-14 15:11:21 -0400 (Tue, 14 Jun 2016)
Log Message:
-----------
git 2.9.0

Modified Paths:
--------------
    trunk/devel/git/Makefile
    trunk/devel/git/distinfo
    trunk/devel/git/files/patch-Makefile
    trunk/devel/git/files/pkg-message.in
    trunk/devel/git/pkg-plist

Modified: trunk/devel/git/Makefile
===================================================================
--- trunk/devel/git/Makefile	2016-06-14 18:51:09 UTC (rev 21473)
+++ trunk/devel/git/Makefile	2016-06-14 19:11:21 UTC (rev 21474)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	git
-PORTVERSION=	2.7.2
+DISTVERSION=	2.9.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \

Modified: trunk/devel/git/distinfo
===================================================================
--- trunk/devel/git/distinfo	2016-06-14 18:51:09 UTC (rev 21473)
+++ trunk/devel/git/distinfo	2016-06-14 19:11:21 UTC (rev 21474)
@@ -1,6 +1,7 @@
-SHA256 (git-2.7.2.tar.xz) = b20479ce523031c37581b763b4442b25b9d606f2f416049aea4e463dc150cf20
-SIZE (git-2.7.2.tar.xz) = 3907296
-SHA256 (git-manpages-2.7.2.tar.xz) = 19a6254a34da516e1ec67bfcbc6da7a1483440a2e8416b30e736f96c3404ff4b
-SIZE (git-manpages-2.7.2.tar.xz) = 384440
-SHA256 (git-htmldocs-2.7.2.tar.xz) = fabf3afa674931c70d6bb2e37497b46046f554c8d5520f0ccb126ce5e748f724
-SIZE (git-htmldocs-2.7.2.tar.xz) = 1031152
+TIMESTAMP = 1465914317
+SHA256 (git-2.9.0.tar.xz) = f41fa97949948fbf49af94a43d779e072a5452c6b5039d86ffa41ebab747b409
+SIZE (git-2.9.0.tar.xz) = 4014000
+SHA256 (git-manpages-2.9.0.tar.xz) = dc85c1afa923fd709d651a49d0a720d50a3c248cb16c6c09517cceae88fe8445
+SIZE (git-manpages-2.9.0.tar.xz) = 392440
+SHA256 (git-htmldocs-2.9.0.tar.xz) = 664dc1aa20966a91cf6b90d282bb5f93b4e4c831a32a0791f43218389ce3b955
+SIZE (git-htmldocs-2.9.0.tar.xz) = 1049236

Modified: trunk/devel/git/files/patch-Makefile
===================================================================
--- trunk/devel/git/files/patch-Makefile	2016-06-14 18:51:09 UTC (rev 21473)
+++ trunk/devel/git/files/patch-Makefile	2016-06-14 19:11:21 UTC (rev 21474)
@@ -1,16 +1,5 @@
 --- 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.
- 
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
-+CFLAGS ?= -g -O2 -Wall
-+LDFLAGS ?=
- ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
 @@ -398,15 +398,15 @@ ARFLAGS = rcs
  prefix = $(HOME)
  bindir_relative = bin
@@ -31,45 +20,6 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -419,22 +419,22 @@ htmldir_relative = $(patsubst $(prefix)/
- 
- export prefix bindir sharedir sysconfdir gitwebdir localedir
- 
--CC = cc
--AR = ar
--RM = rm -f
--DIFF = diff
--TAR = tar
--FIND = find
--INSTALL = install
--RPMBUILD = rpmbuild
--TCL_PATH = tclsh
--TCLTK_PATH = wish
--XGETTEXT = xgettext
--MSGFMT = msgfmt
--CURL_CONFIG = curl-config
--PTHREAD_LIBS = -lpthread
--PTHREAD_CFLAGS =
--GCOV = gcov
-+CC ?= cc
-+AR ?= ar
-+RM ?= rm -f
-+DIFF ?= diff
-+TAR ?= tar
-+FIND ?= find
-+INSTALL ?= install
-+RPMBUILD ?= rpmbuild
-+TCL_PATH ?= tclsh
-+TCLTK_PATH ?= wish
-+XGETTEXT ?= xgettext
-+MSGFMT ?= msgfmt
-+CURL_CONFIG ?= curl-config
-+PTHREAD_LIBS ?= -lpthread
-+PTHREAD_CFLAGS ?=
-+GCOV ?= gcov
- 
- export TCL_PATH TCLTK_PATH
- 
 @@ -1107,9 +1107,9 @@ EXTLIBS += -lz
  
  ifndef NO_OPENSSL
@@ -88,7 +38,7 @@
  	mv $@+ $@
  else # NO_PERL
 -$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
-+$(SCRIPT_PERL_GEN) git-instaweb git-submodule git-request-pull: % : unimplemented.sh
++$(SCRIPT_PERL_GEN) git-instaweb 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/files/pkg-message.in
===================================================================
--- trunk/devel/git/files/pkg-message.in	2016-06-14 18:51:09 UTC (rev 21473)
+++ trunk/devel/git/files/pkg-message.in	2016-06-14 19:11:21 UTC (rev 21474)
@@ -19,7 +19,7 @@
 If you installed the CONTRIB option please note that the scripts are
 installed in %%PREFIX%%/share/git-core/contrib. Some of them require
 other ports to be installed (perl, python, etc), which you may need to
-install manually. 
+install manually.
 *************************** CONTRIB ************************************
 ------------------------------------------------------------------------
 

Modified: trunk/devel/git/pkg-plist
===================================================================
--- trunk/devel/git/pkg-plist	2016-06-14 18:51:09 UTC (rev 21473)
+++ trunk/devel/git/pkg-plist	2016-06-14 19:11:21 UTC (rev 21474)
@@ -351,30 +351,31 @@
 libexec/git-core/git-whatchanged
 libexec/git-core/git-worktree
 libexec/git-core/git-write-tree
+libexec/git-core/mergetools/araxis
+libexec/git-core/mergetools/bc
+libexec/git-core/mergetools/bc3
 libexec/git-core/mergetools/codecompare
 libexec/git-core/mergetools/deltawalker
 libexec/git-core/mergetools/diffmerge
-libexec/git-core/mergetools/xxdiff
-libexec/git-core/mergetools/tortoisemerge
-libexec/git-core/mergetools/tkdiff
-libexec/git-core/mergetools/bc
-libexec/git-core/mergetools/bc3
-libexec/git-core/mergetools/kdiff3
+libexec/git-core/mergetools/diffuse
+libexec/git-core/mergetools/ecmerge
+libexec/git-core/mergetools/emerge
+libexec/git-core/mergetools/examdiff
 libexec/git-core/mergetools/gvimdiff
 libexec/git-core/mergetools/gvimdiff2
 libexec/git-core/mergetools/gvimdiff3
+libexec/git-core/mergetools/kdiff3
+libexec/git-core/mergetools/kompare
+libexec/git-core/mergetools/meld
+libexec/git-core/mergetools/opendiff
+libexec/git-core/mergetools/p4merge
+libexec/git-core/mergetools/tkdiff
+libexec/git-core/mergetools/tortoisemerge
 libexec/git-core/mergetools/vimdiff
 libexec/git-core/mergetools/vimdiff2
 libexec/git-core/mergetools/vimdiff3
-libexec/git-core/mergetools/meld
-libexec/git-core/mergetools/ecmerge
-libexec/git-core/mergetools/diffuse
-libexec/git-core/mergetools/p4merge
-libexec/git-core/mergetools/kompare
-libexec/git-core/mergetools/opendiff
-libexec/git-core/mergetools/emerge
-libexec/git-core/mergetools/araxis
 libexec/git-core/mergetools/winmerge
+libexec/git-core/mergetools/xxdiff
 %%GUI%%bin/gitk
 %%PERL%%%%SITE_PERL%%/Git.pm
 %%PERL%%%%SITE_PERL%%/Git/I18N.pm
@@ -397,6 +398,7 @@
 %%NLS%%share/locale/fr/LC_MESSAGES/git.mo
 %%NLS%%share/locale/is/LC_MESSAGES/git.mo
 %%NLS%%share/locale/it/LC_MESSAGES/git.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/git.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/git.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/git.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/git.mo
@@ -1245,11 +1247,13 @@
 %%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.4.11.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.5.5.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.2.txt
@@ -1256,9 +1260,18 @@
 %%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.6.6.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.0.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -1347,8 +1360,10 @@
 %%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/customizing-emails.rst
 %%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/doc/troubleshooting.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.example

More information about the Midnightbsd-cvs mailing list