Date: Tue, 14 Jun 2016 14:52:40 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416890 - in head/devel/git: . files Message-ID: <201606141452.u5EEqeUV077916@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Tue Jun 14 14:52:40 2016 New Revision: 416890 URL: https://svnweb.freebsd.org/changeset/ports/416890 Log: Update devel/git to 2.9.0 Sponsored by: Rubicon Communications (Netgate) 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 Tue Jun 14 14:03:19 2016 (r416889) +++ head/devel/git/Makefile Tue Jun 14 14:52:40 2016 (r416890) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.8.4 +DISTVERSION= 2.9.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -62,7 +62,7 @@ PERL_RUN_DEPENDS= p5-Error>=0:lang/p5-Er PERL_MAKE_ARGS_OFF= NO_PERL=1 SEND_EMAIL_IMPLIES= PERL -SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:mail/p5-Net-SMTP-SSL \ +SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:mail/p5-Net-SMTP-SSL \ p5-Authen-SASL>=0:security/p5-Authen-SASL ICONV_USES= iconv Modified: head/devel/git/distinfo ============================================================================== --- head/devel/git/distinfo Tue Jun 14 14:03:19 2016 (r416889) +++ head/devel/git/distinfo Tue Jun 14 14:52:40 2016 (r416890) @@ -1,7 +1,7 @@ -TIMESTAMP = 1465658011 -SHA256 (git-2.8.4.tar.xz) = 120e9a32a1858871dea34165622ec7a63f27887b93093c8d72a18bcf89fe1657 -SIZE (git-2.8.4.tar.xz) = 3982836 -SHA256 (git-manpages-2.8.4.tar.xz) = d2ddfc302e5b3c0ad182916b27c28d95bc667ea8b9db8dc099bf3d8d62b8b7f5 -SIZE (git-manpages-2.8.4.tar.xz) = 387168 -SHA256 (git-htmldocs-2.8.4.tar.xz) = 78135be591e3a68d1030a76e343d59622e5e40f6990667f4385a01d9dafe9bbd -SIZE (git-htmldocs-2.8.4.tar.xz) = 1042260 +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: head/devel/git/files/patch-Makefile ============================================================================== --- head/devel/git/files/patch-Makefile Tue Jun 14 14:03:19 2016 (r416889) +++ head/devel/git/files/patch-Makefile Tue Jun 14 14:52:40 2016 (r416890) @@ -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: head/devel/git/pkg-plist ============================================================================== --- head/devel/git/pkg-plist Tue Jun 14 14:03:19 2016 (r416889) +++ head/devel/git/pkg-plist Tue Jun 14 14:52:40 2016 (r416890) @@ -351,30 +351,31 @@ 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/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 @@ -1270,6 +1271,7 @@ share/git-core/templates/info/exclude %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606141452.u5EEqeUV077916>