Date: Tue, 3 Apr 2018 12:51:28 +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: r466347 - in head/devel/git: . files Message-ID: <201804031251.w33CpSfd024433@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Tue Apr 3 12:51:28 2018 New Revision: 466347 URL: https://svnweb.freebsd.org/changeset/ports/466347 Log: Update devel/git to 2.17.0 Sponsored by: Rubicon Communications, LLC (Netgate) Modified: head/devel/git/Makefile head/devel/git/distinfo head/devel/git/files/patch-Documentation__Makefile head/devel/git/files/patch-Makefile head/devel/git/files/patch-configure.ac head/devel/git/pkg-plist Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Tue Apr 3 12:50:30 2018 (r466346) +++ head/devel/git/Makefile Tue Apr 3 12:51:28 2018 (r466347) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.16.3 +DISTVERSION= 2.17.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -25,7 +25,7 @@ GROUPS= git_daemon SUB_FILES= pkg-message GNU_CONFIGURE= yes -USES= autoreconf gmake shebangfix ssl tar:xz +USES= autoreconf gmake iconv shebangfix ssl tar:xz CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS+= DEVELOPER_CFLAGS= @@ -154,7 +154,7 @@ post-patch: .for FILE in ${RMMAN7} @${RM} ${WRKDIR}/man7/${FILE} .endfor - @${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL + @${REINPLACE_CMD} -e "s,%%SITE_PERL%%,${SITE_PERL},g" ${WRKSRC}/Makefile post-patch-CONTRIB-on: @${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," \ Modified: head/devel/git/distinfo ============================================================================== --- head/devel/git/distinfo Tue Apr 3 12:50:30 2018 (r466346) +++ head/devel/git/distinfo Tue Apr 3 12:51:28 2018 (r466347) @@ -1,7 +1,7 @@ -TIMESTAMP = 1521808423 -SHA256 (git-2.16.3.tar.xz) = d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48 -SIZE (git-2.16.3.tar.xz) = 4966248 -SHA256 (git-manpages-2.16.3.tar.xz) = 5f61897e681d5144bd70babf760345637e879a8b6e40ca6f0b76b53554649395 -SIZE (git-manpages-2.16.3.tar.xz) = 417152 -SHA256 (git-htmldocs-2.16.3.tar.xz) = c52f2609425d0f38a69d83556ad512c5fed2e97cc300e2e343afd14f9d35c606 -SIZE (git-htmldocs-2.16.3.tar.xz) = 1164252 +TIMESTAMP = 1522750622 +SHA256 (git-2.17.0.tar.xz) = e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7 +SIZE (git-2.17.0.tar.xz) = 5011556 +SHA256 (git-manpages-2.17.0.tar.xz) = 4bdab1aed88ad7a12a766de8e03047eba5afbba9874c7effa5059e5481943727 +SIZE (git-manpages-2.17.0.tar.xz) = 419316 +SHA256 (git-htmldocs-2.17.0.tar.xz) = 66d055e15c2f0034379b4a8c5280762a5dff5b4fc99daefa43404dab2f8fc308 +SIZE (git-htmldocs-2.17.0.tar.xz) = 1172652 Modified: head/devel/git/files/patch-Documentation__Makefile ============================================================================== --- head/devel/git/files/patch-Documentation__Makefile Tue Apr 3 12:50:30 2018 (r466346) +++ head/devel/git/files/patch-Documentation__Makefile Tue Apr 3 12:51:28 2018 (r466347) @@ -1,6 +1,6 @@ ---- Documentation/Makefile.orig 2016-10-03 22:19:09 UTC +--- Documentation/Makefile.orig 2018-04-02 17:44:04 UTC +++ Documentation/Makefile -@@ -87,11 +87,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_T +@@ -92,11 +92,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT)) 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 -@@ -214,7 +214,7 @@ ifndef V +@@ -231,7 +231,7 @@ ifndef V endif endif Modified: head/devel/git/files/patch-Makefile ============================================================================== --- head/devel/git/files/patch-Makefile Tue Apr 3 12:50:30 2018 (r466346) +++ head/devel/git/files/patch-Makefile Tue Apr 3 12:51:28 2018 (r466347) @@ -1,6 +1,6 @@ ---- Makefile.orig 2016-10-03 22:19:09 UTC +--- Makefile.orig 2018-04-02 17:44:04 UTC +++ Makefile -@@ -426,15 +426,15 @@ ARFLAGS = rcs +@@ -476,16 +476,16 @@ ARFLAGS = rcs prefix = $(HOME) bindir_relative = bin bindir = $(prefix)/$(bindir_relative) @@ -12,7 +12,9 @@ mergetoolsdir = $(gitexecdir)/mergetools sharedir = $(prefix)/share -gitwebdir = $(sharedir)/gitweb +-perllibdir = $(sharedir)/perl5 +gitwebdir = $(sharedir)/examples/git/gitweb ++perllibdir = %%SITE_PERL%% localedir = $(sharedir)/locale template_dir = share/git-core/templates -htmldir = $(prefix)/share/doc/git-doc @@ -20,7 +22,7 @@ ETC_GITCONFIG = $(sysconfdir)/gitconfig ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes lib = lib -@@ -1146,9 +1146,9 @@ EXTLIBS += -lz +@@ -1267,9 +1267,9 @@ EXTLIBS += -lz ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl @@ -33,7 +35,7 @@ else OPENSSL_LINK = endif -@@ -1873,7 +1873,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT +@@ -2012,7 +2012,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES chmod +x $@+ && \ mv $@+ $@ else # NO_PERL Modified: head/devel/git/files/patch-configure.ac ============================================================================== --- head/devel/git/files/patch-configure.ac Tue Apr 3 12:50:30 2018 (r466346) +++ head/devel/git/files/patch-configure.ac Tue Apr 3 12:51:28 2018 (r466347) @@ -1,9 +1,9 @@ # Specify 'allow-without' to allow --without-perl to be used # TODO: Upstream ---- configure.ac.orig 2016-12-04 08:23:08 UTC +--- configure.ac.orig 2018-04-02 17:44:04 UTC +++ configure.ac -@@ -373,7 +373,7 @@ GIT_PARSE_WITH_SET_MAKE_VAR(editor, DEFA +@@ -414,7 +414,7 @@ GIT_PARSE_WITH_SET_MAKE_VAR(editor, DEFAULT_EDITOR, GIT_ARG_SET_PATH(shell) # # Define PERL_PATH to provide path to Perl. Modified: head/devel/git/pkg-plist ============================================================================== --- head/devel/git/pkg-plist Tue Apr 3 12:50:30 2018 (r466346) +++ head/devel/git/pkg-plist Tue Apr 3 12:51:28 2018 (r466347) @@ -7,9 +7,14 @@ bin/git-upload-archive bin/git-upload-pack %%GUI%%bin/gitk etc/bash_completion.d/git.sh +%%PERL%%%%SITE_PERL%%/FromCPAN/Error.pm +%%PERL%%%%SITE_PERL%%/FromCPAN/Mail/Address.pm %%PERL%%%%SITE_PERL%%/Git.pm %%PERL%%%%SITE_PERL%%/Git/I18N.pm %%PERL%%%%SITE_PERL%%/Git/IndexInfo.pm +%%PERL%%%%SITE_PERL%%/Git/LoadCPAN.pm +%%PERL%%%%SITE_PERL%%/Git/LoadCPAN/Error.pm +%%PERL%%%%SITE_PERL%%/Git/LoadCPAN/Mail/Address.pm %%PERL%%%%SITE_PERL%%/Git/Packet.pm %%PERL%%%%SITE_PERL%%/Git/SVN.pm %%PERL%%%%SITE_PERL%%/Git/SVN/Editor.pm @@ -365,14 +370,6 @@ man/man1/git.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 @@ -659,6 +656,7 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.16.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.16.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.16.3.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.17.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -1199,6 +1197,8 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/index-format.html %%HTMLDOCS%%%%DOCSDIR%%/technical/index-format.txt +%%HTMLDOCS%%%%DOCSDIR%%/technical/long-running-process-protocol.html +%%HTMLDOCS%%%%DOCSDIR%%/technical/long-running-process-protocol.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/pack-format.html %%HTMLDOCS%%%%DOCSDIR%%/technical/pack-format.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/pack-heuristics.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804031251.w33CpSfd024433>