Date: Wed, 17 Mar 2021 12:02:59 +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: r568648 - head/devel/git Message-ID: <202103171202.12HC2xKs012808@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Wed Mar 17 12:02:59 2021 New Revision: 568648 URL: https://svnweb.freebsd.org/changeset/ports/568648 Log: devel/git: Update to 2.31.0 and other fixes - Update to 2.31.0 https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.31.0.txt - Removed PCRE option since support for pcre 1.x was dropped - Sort OPTIONS_DEFINE and OPTIONS_DEFAULT - Move installation of bash completion to common post-install target and always copy it to final destination to deduplicate code PR: 254170 Submitted by: Yasuhiro Kimura <yasu@utahime.org> Sponsored by: Rubicon Communications, LLC ("Netgate") Modified: head/devel/git/Makefile head/devel/git/distinfo head/devel/git/pkg-plist Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Wed Mar 17 11:56:41 2021 (r568647) +++ head/devel/git/Makefile Wed Mar 17 12:02:59 2021 (r568648) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.30.1 +DISTVERSION= 2.31.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -64,18 +64,16 @@ TEST_TARGET= test CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no -OPTIONS_RADIO= PCRE_VERSION -OPTIONS_RADIO_PCRE_VERSION= PCRE PCRE2 -OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \ - SEND_EMAIL NLS SUBTREE -OPTIONS_DEFAULT= CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \ - SUBTREE SVN +OPTIONS_DEFINE= CONTRIB CURL CVS GITWEB GUI HTMLDOCS ICONV NLS P4 PCRE2 PERL \ + SEND_EMAIL SUBTREE SVN +OPTIONS_DEFAULT=CONTRIB CURL CVS GITWEB ICONV P4 PCRE2 PERL SEND_EMAIL \ + SUBTREE SVN .if ${FLAVOR:U} == gui OPTIONS_SLAVE+= GUI .elif ${FLAVOR:U} == lite OPTIONS_EXCLUDE= GUI SVN GITWEB CONTRIB P4 CVS PERL .elif ${FLAVOR:U} == tiny -OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NCURL} ${OPTIONS_RADIO_PCRE_VERSION} +OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NCURL} OPTIONS_SLAVE= CURL .endif @@ -107,9 +105,6 @@ PERL_MAKE_ARGS_OFF= NO_PERL=1 GITWEB_IMPLIES= PERL GITWEB_RUN_DEPENDS= p5-CGI>=0:www/p5-CGI -PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -PCRE_CONFIGURE_WITH= libpcre1 - PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE2_CONFIGURE_WITH= libpcre @@ -206,7 +201,7 @@ post-patch-SVN-off: post-patch-GITWEB-off: @${REINPLACE_CMD} -e '/$$(MAKE) -C gitweb install/d' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/t/gitweb-lib.sh + @${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/t/lib-gitweb.sh post-patch-P4-off: @${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile @@ -229,6 +224,9 @@ post-install: ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/ ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git-blame.el \ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/ + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \ + ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ post-install-HTMLDOCS-on: # Manually remove the index.html symlink before installing, and then @@ -248,17 +246,6 @@ post-install-CONTRIB-on: @${ECHO_MSG} "===> Installing contributed scripts" ${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib ${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib - # Symlink the completions from the contrib directory to where they - # will be useful - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d - @${LN} -s ../../share/git-core/contrib/completion/git-completion.bash \ - ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ - -post-install-CONTRIB-off: - # Install the contrib completions anyway - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \ - ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ post-install-P4-on: ${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/ Modified: head/devel/git/distinfo ============================================================================== --- head/devel/git/distinfo Wed Mar 17 11:56:41 2021 (r568647) +++ head/devel/git/distinfo Wed Mar 17 12:02:59 2021 (r568648) @@ -1,7 +1,7 @@ -TIMESTAMP = 1612868706 -SHA256 (git-2.30.1.tar.xz) = f988a8a095089978dab2932af4edb22b4d7d67d67b81aaa1986fa29ef45d9467 -SIZE (git-2.30.1.tar.xz) = 6327976 -SHA256 (git-manpages-2.30.1.tar.xz) = 30fc7ecbd964bb19a2ca1a695fe7af430740e09bd1c134cd3730783abec5b904 -SIZE (git-manpages-2.30.1.tar.xz) = 482128 -SHA256 (git-htmldocs-2.30.1.tar.xz) = e826d9dd63bef455f80cd785c69c9ee74ab4f8793e25477470474ef96db66315 -SIZE (git-htmldocs-2.30.1.tar.xz) = 1341796 +TIMESTAMP = 1615841998 +SHA256 (git-2.31.0.tar.xz) = e8f162cbdb3283e13cd7388d864ed23485f1b046a19e969f12ed2685fb789a40 +SIZE (git-2.31.0.tar.xz) = 6414252 +SHA256 (git-manpages-2.31.0.tar.xz) = 185ddcbc31ae6b8d33c3ab78f6022ee6cc79dd867c1b2e5c3767821124e780ec +SIZE (git-manpages-2.31.0.tar.xz) = 487764 +SHA256 (git-htmldocs-2.31.0.tar.xz) = 2ff3c0403870c3f02cdd46af1cd749b0c5d7826bfe00bee09ba1d0c2f19f554b +SIZE (git-htmldocs-2.31.0.tar.xz) = 1357332 Modified: head/devel/git/pkg-plist ============================================================================== --- head/devel/git/pkg-plist Wed Mar 17 11:56:41 2021 (r568647) +++ head/devel/git/pkg-plist Wed Mar 17 12:02:59 2021 (r568648) @@ -382,6 +382,7 @@ man/man1/gitweb.1.gz man/man5/gitattributes.5.gz man/man5/githooks.5.gz man/man5/gitignore.5.gz +man/man5/gitmailmap.5.gz man/man5/gitmodules.5.gz man/man5/gitrepository-layout.5.gz man/man5/gitweb.conf.5.gz @@ -712,6 +713,8 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.29.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.30.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.30.1.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.30.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.31.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -1175,7 +1178,6 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/i18n.txt %%HTMLDOCS%%%%DOCSDIR%%/index.html %%HTMLDOCS%%%%DOCSDIR%%/line-range-format.txt -%%HTMLDOCS%%%%DOCSDIR%%/mailmap.txt %%HTMLDOCS%%%%DOCSDIR%%/merge-options.txt %%HTMLDOCS%%%%DOCSDIR%%/merge-strategies.txt %%HTMLDOCS%%%%DOCSDIR%%/mergetools-diff.txt @@ -1435,6 +1437,7 @@ share/git-core/templates/info/exclude %%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/id/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103171202.12HC2xKs012808>