freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devel/git: Update to 2.33.0

Browse Source 
PR:		257894
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Yasuhiro Kimura
2021-10-12 09:05:29 -03:00
committed by Renato Botelho
parent ff5ded75bc
commit 6583166679
5 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devel/git/Makefile
View File

@@ -1,8 +1,7 @@
# Created by: Eric Anholt
PORTNAME= git
DISTVERSION= 2.32.0
PORTREVISION= 1
DISTVERSION= 2.33.0
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -62,9 +61,6 @@ SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
git-p4.py \
contrib/hg-to-git/hg-to-git.py \
contrib/hooks/update-paranoid \
contrib/hooks/multimail/post-receive.example \
contrib/hooks/multimail/git_multimail.py \
contrib/hooks/multimail/migrate-mailhook-config \
contrib/fast-import/import-zips.py \
contrib/remote-helpers/git-remote-bzr \
contrib/remote-helpers/git-remote-hg \

14
devel/git/distinfo
View File

@@ -1,7 +1,7 @@
TIMESTAMP = 1624378171
SHA256 (git-2.32.0.tar.xz) = 68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
SIZE (git-2.32.0.tar.xz) = 6551348
SHA256 (git-manpages-2.32.0.tar.xz) = 19e3cb0425c94d4ad82984f41522e77c8e35093e15a891f8e7195617201f6ac1
SIZE (git-manpages-2.32.0.tar.xz) = 491868
SHA256 (git-htmldocs-2.32.0.tar.xz) = 821bd3b5dfd31040bf9ed38ef02df3dcf063546127f07d59ec9669274e8b8818
SIZE (git-htmldocs-2.32.0.tar.xz) = 1381664
TIMESTAMP = 1633959175
SHA256 (git-2.33.0.tar.xz) = bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
SIZE (git-2.33.0.tar.xz) = 6548308
SHA256 (git-manpages-2.33.0.tar.xz) = d6d38abe3fe45b74359e65d53e51db3aa92d7f551240b7f7a779746f24c4bc31
SIZE (git-manpages-2.33.0.tar.xz) = 492900
SHA256 (git-htmldocs-2.33.0.tar.xz) = 309c5d3cdd9a115f693c0e035298cc867a3b8ba8ce235fa1ac950a48cb4b0447
SIZE (git-htmldocs-2.33.0.tar.xz) = 1393260

10
devel/git/files/patch-Documentation__Makefile
View File

@@ -1,8 +1,8 @@
--- Documentation/Makefile.orig 2018-06-21 17:18:50 UTC
--- Documentation/Makefile.orig 2021-08-16 21:18:43 UTC
+++ Documentation/Makefile
@@ -93,11 +93,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
@@ -120,11 +120,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(filter $(MAN_FILTER)
DOC_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
-prefix ?= $(HOME)
+prefix ?= $(PREFIX)
@@ -15,7 +15,7 @@
mandir ?= $(prefix)/share/man
man1dir = $(mandir)/man1
man5dir = $(mandir)/man5
@@ -232,7 +232,7 @@ ifndef V
@@ -241,7 +241,7 @@ ifndef V
endif
endif

16
devel/git/files/patch-Makefile
View File

@@ -1,6 +1,6 @@
--- Makefile.orig 2021-06-06 12:13:45 UTC
--- Makefile.orig 2021-08-16 21:18:43 UTC
+++ Makefile
@@ -520,16 +520,16 @@ GIT-VERSION-FILE: FORCE
@@ -524,16 +524,16 @@ GIT-VERSION-FILE: FORCE
prefix = $(HOME)
bindir = $(prefix)/bin
@@ -22,7 +22,7 @@
ETC_GITCONFIG = $(sysconfdir)/gitconfig
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
lib = lib
@@ -554,8 +554,8 @@ DIFF = diff
@@ -558,8 +558,8 @@ DIFF = diff
TAR = tar
FIND = find
INSTALL = install
@@ -33,7 +33,7 @@
XGETTEXT = xgettext
MSGFMT = msgfmt
CURL_CONFIG = curl-config
@@ -1468,9 +1468,9 @@ EXTLIBS += -lz
@@ -1477,9 +1477,9 @@ EXTLIBS += -lz
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
@@ -46,19 +46,19 @@
else
OPENSSL_LINK =
endif
@@ -2358,7 +2358,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
@@ -2376,7 +2376,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
chmod +x $@+ && \
mv $@+ $@
else # NO_PERL
-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
+$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh
$(QUIET_GEN)$(RM) $@ $@+ && \
$(QUIET_GEN) \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
@@ -2374,7 +2374,7 @@ ifndef NO_PYTHON
@@ -2392,7 +2392,7 @@ ifndef NO_PYTHON
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
$(SCRIPT_PYTHON_GEN): % : %.py
$(QUIET_GEN)$(RM) $@ $@+ && \
$(QUIET_GEN) \
- sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
+ sed -e '1s|#!.*python.*|#!$(PYTHON_PATH_SQ)|' \
$< >$@+ && \

12
devel/git/pkg-plist
View File

@@ -698,6 +698,7 @@ man/man7/gitworkflows.7.gz
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.31.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.31.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.32.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.33.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -1257,18 +1258,7 @@ share/emacs/site-lisp/git/git.el
%%CONTRIB%%share/git-core/contrib/git-shell-commands/list
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
%%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.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
%%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
%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl