Date: Mon, 25 Feb 2019 13:22:19 +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: r493857 - in head/devel/git: . files Message-ID: <201902251322.x1PDMJH8053927@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Mon Feb 25 13:22:19 2019 New Revision: 493857 URL: https://svnweb.freebsd.org/changeset/ports/493857 Log: - Update devel/git to 2.21.0 [1] - Fix git-p4 shebang [2] PR: 236020 [1] (based on), 235045 [2] Submitted by: Yasuhiro KIMURA <yasu@utahime.org> [1] John Hein <jcfyecrayz@liamekaens.com> [2] Sponsored by: Rubicon Communications, LLC (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 Mon Feb 25 13:01:06 2019 (r493856) +++ head/devel/git/Makefile Mon Feb 25 13:22:19 2019 (r493857) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.20.1 +DISTVERSION= 2.21.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ Modified: head/devel/git/distinfo ============================================================================== --- head/devel/git/distinfo Mon Feb 25 13:01:06 2019 (r493856) +++ head/devel/git/distinfo Mon Feb 25 13:22:19 2019 (r493857) @@ -1,7 +1,7 @@ -TIMESTAMP = 1545044408 -SHA256 (git-2.20.1.tar.xz) = 9d2e91e2faa2ea61ba0a70201d023b36f54d846314591a002c610ea2ab81c3e9 -SIZE (git-2.20.1.tar.xz) = 5359872 -SHA256 (git-manpages-2.20.1.tar.xz) = 060acce347cfb712d0c7dfe7578c5291fde2d3d807917b2828c8aae3c90876ba -SIZE (git-manpages-2.20.1.tar.xz) = 439172 -SHA256 (git-htmldocs-2.20.1.tar.xz) = 18a00408437c6816e7c5396c8b96b38bf022f924852492a73dd3888ad2572ad7 -SIZE (git-htmldocs-2.20.1.tar.xz) = 1227884 +TIMESTAMP = 1551062552 +SHA256 (git-2.21.0.tar.xz) = 8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28 +SIZE (git-2.21.0.tar.xz) = 5491296 +SHA256 (git-manpages-2.21.0.tar.xz) = 2f68dc24931c0d05f70167d9ffe6c33ef6b0b6c75b92301ddcda55b9b0f5ec51 +SIZE (git-manpages-2.21.0.tar.xz) = 440096 +SHA256 (git-htmldocs-2.21.0.tar.xz) = b1758e9903b21bad5cb5694617df22b2aa23c093541fb282bf11862df4962ca1 +SIZE (git-htmldocs-2.21.0.tar.xz) = 1234956 Modified: head/devel/git/files/patch-Makefile ============================================================================== --- head/devel/git/files/patch-Makefile Mon Feb 25 13:01:06 2019 (r493856) +++ head/devel/git/files/patch-Makefile Mon Feb 25 13:22:19 2019 (r493857) @@ -1,6 +1,6 @@ ---- Makefile.orig 2018-06-21 17:18:50 UTC +--- Makefile.orig 2019-02-24 16:31:46 UTC +++ Makefile -@@ -518,16 +518,16 @@ ARFLAGS = rcs +@@ -535,16 +535,16 @@ ARFLAGS = rcs prefix = $(HOME) bindir = $(prefix)/bin @@ -22,7 +22,7 @@ ETC_GITCONFIG = $(sysconfdir)/gitconfig ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes lib = lib -@@ -1326,9 +1326,9 @@ EXTLIBS += -lz +@@ -1383,9 +1383,9 @@ EXTLIBS += -lz ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl @@ -35,7 +35,7 @@ else OPENSSL_LINK = endif -@@ -2151,7 +2151,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES +@@ -2234,7 +2234,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES chmod +x $@+ && \ mv $@+ $@ else # NO_PERL @@ -44,3 +44,12 @@ $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ +@@ -2250,7 +2250,7 @@ ifndef NO_PYTHON + $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS + $(SCRIPT_PYTHON_GEN): % : %.py + $(QUIET_GEN)$(RM) $@ $@+ && \ +- sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \ ++ sed -e '1s|#!.*python.*|#!$(PYTHON_PATH_SQ)|' \ + $< >$@+ && \ + chmod +x $@+ && \ + mv $@+ $@ Modified: head/devel/git/pkg-plist ============================================================================== --- head/devel/git/pkg-plist Mon Feb 25 13:01:06 2019 (r493856) +++ head/devel/git/pkg-plist Mon Feb 25 13:22:19 2019 (r493857) @@ -141,7 +141,6 @@ libexec/git-core/git-rebase libexec/git-core/git-rebase--am libexec/git-core/git-rebase--common libexec/git-core/git-rebase--interactive -libexec/git-core/git-rebase--merge libexec/git-core/git-rebase--preserve-merges libexec/git-core/git-receive-pack libexec/git-core/git-reflog @@ -682,6 +681,7 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.19.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.20.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.20.1.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.21.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -1277,6 +1277,7 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/coccinelle/qsort.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/strbuf.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/swap.cocci +%%CONTRIB%%share/git-core/contrib/coccinelle/the_repository.pending.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/xstrdup_or_null.cocci %%CONTRIB%%share/git-core/contrib/completion/git-completion.bash %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh @@ -1304,11 +1305,11 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/git-credential-osxkeychain.c %%CONTRIB%%share/git-core/contrib/credential/wincred/Makefile %%CONTRIB%%share/git-core/contrib/credential/wincred/git-credential-wincred.c +%%CONTRIB%%share/git-core/contrib/diff-highlight/DiffHighlight.pm %%CONTRIB%%share/git-core/contrib/diff-highlight/Makefile %%CONTRIB%%share/git-core/contrib/diff-highlight/README -%%CONTRIB%%share/git-core/contrib/diff-highlight/DiffHighlight.pm -%%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight.perl %%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight +%%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight.perl %%CONTRIB%%share/git-core/contrib/diff-highlight/t/Makefile %%CONTRIB%%share/git-core/contrib/diff-highlight/t/t9400-diff-highlight.sh %%CONTRIB%%share/git-core/contrib/emacs/README @@ -1331,9 +1332,9 @@ share/emacs/site-lisp/git/git.el %%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/README.rst %%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 @@ -1493,6 +1494,7 @@ share/git-core/templates/info/exclude %%NLS%%share/locale/bg/LC_MESSAGES/git.mo %%NLS%%share/locale/ca/LC_MESSAGES/git.mo %%NLS%%share/locale/de/LC_MESSAGES/git.mo +%%NLS%%share/locale/el/LC_MESSAGES/git.mo %%NLS%%share/locale/es/LC_MESSAGES/git.mo %%NLS%%share/locale/fr/LC_MESSAGES/git.mo %%NLS%%share/locale/is/LC_MESSAGES/git.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902251322.x1PDMJH8053927>