Attachment #227256 for bug #257894

View | Details | Raw Unified | Return to bug 257894
Collapse All | Expand All




# Created by: Eric Anholt

PORTNAME=	git
DISTVERSION=	2.33.0
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	KERNEL_ORG/software/scm/git
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \

		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 \

Lines 1-7 Link Here

(-)b/devel/git/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1624378171	1	TIMESTAMP = 1629152705
2	SHA256 (git-2.32.0.tar.xz) = 68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623	2	SHA256 (git-2.33.0.tar.xz) = bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
3	SIZE (git-2.32.0.tar.xz) = 6551348	3	SIZE (git-2.33.0.tar.xz) = 6548308
4	SHA256 (git-manpages-2.32.0.tar.xz) = 19e3cb0425c94d4ad82984f41522e77c8e35093e15a891f8e7195617201f6ac1	4	SHA256 (git-manpages-2.33.0.tar.xz) = d6d38abe3fe45b74359e65d53e51db3aa92d7f551240b7f7a779746f24c4bc31
5	SIZE (git-manpages-2.32.0.tar.xz) = 491868	5	SIZE (git-manpages-2.33.0.tar.xz) = 492900
6	SHA256 (git-htmldocs-2.32.0.tar.xz) = 821bd3b5dfd31040bf9ed38ef02df3dcf063546127f07d59ec9669274e8b8818	6	SHA256 (git-htmldocs-2.33.0.tar.xz) = 309c5d3cdd9a115f693c0e035298cc867a3b8ba8ce235fa1ac950a48cb4b0447
7	SIZE (git-htmldocs-2.32.0.tar.xz) = 1381664	7	SIZE (git-htmldocs-2.33.0.tar.xz) = 1393260




--- Makefile.orig	2021-08-11 20:06:58 UTC
+++ Makefile
@@ -524,16 +524,16 @@ GIT-VERSION-FILE: FORCE
 
 prefix = $(HOME)
 bindir = $(prefix)/bin

 ETC_GITCONFIG = $(sysconfdir)/gitconfig
 ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
 lib = lib
@@ -1477,9 +1477,9 @@ EXTLIBS += -lz
 
 ifndef NO_OPENSSL
 	OPENSSL_LIBSSL = -lssl

 	else
 		OPENSSL_LINK =
 	endif
@@ -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) \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
@@ -2392,7 +2392,7 @@ ifndef NO_PYTHON
 $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
 $(SCRIPT_PYTHON_GEN): % : %.py
 	$(QUIET_GEN) \
-	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
+	sed -e '1s|#!.*python.*|#!$(PYTHON_PATH_SQ)|' \
 	    $< >$@+ && \




%%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
- 

Return to bug 257894

Lines 1277-1294 share/emacs/site-lisp/git/git.el Link Here

(-)b/devel/git/pkg-plist (-12 lines)
1277	%%CONTRIB%%share/git-core/contrib/git-shell-commands/list	1277	%%CONTRIB%%share/git-core/contrib/git-shell-commands/list
1278	%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py	1278	%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
1279	%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt	1279	%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
1280	%%CONTRIB%%share/git-core/contrib/hooks/multimail/CHANGES
1281	%%CONTRIB%%share/git-core/contrib/hooks/multimail/CONTRIBUTING.rst
1282	%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git	1280	%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
1283	%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.migrate-from-post-receive-email
1284	%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.rst
1285	%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/customizing-emails.rst
1286	%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gerrit.rst
1287	%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gitolite.rst
1288	%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/troubleshooting.rst
1289	%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
1290	%%CONTRIB%%share/git-core/contrib/hooks/multimail/migrate-mailhook-config
1291	%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive.example
1292	%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email	1281	%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
1293	%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery	1282	%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
1294	%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl	1283	%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl
1295	-

Lines 1-8 Link Here

(-)b/devel/git/Makefile (-5 / +1 lines)
1	# Created by: Eric Anholt	1	# Created by: Eric Anholt
2		2
3	PORTNAME= git	3	PORTNAME= git
4	DISTVERSION= 2.32.0	4	DISTVERSION= 2.33.0
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	MASTER_SITES= KERNEL_ORG/software/scm/git	6	MASTER_SITES= KERNEL_ORG/software/scm/git
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	7	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
Lines 55-63 SHEBANG_FILES= .perl /.perl //.perl /.pl //.pl ///*.pl \ Link Here
55	git-p4.py \	54	git-p4.py \
56	contrib/hg-to-git/hg-to-git.py \	55	contrib/hg-to-git/hg-to-git.py \
57	contrib/hooks/update-paranoid \	56	contrib/hooks/update-paranoid \
58	contrib/hooks/multimail/post-receive.example \
59	contrib/hooks/multimail/git_multimail.py \
60	contrib/hooks/multimail/migrate-mailhook-config \
61	contrib/fast-import/import-zips.py \	57	contrib/fast-import/import-zips.py \
62	contrib/remote-helpers/git-remote-bzr \	58	contrib/remote-helpers/git-remote-bzr \
63	contrib/remote-helpers/git-remote-hg \	59	contrib/remote-helpers/git-remote-hg \

Lines 1-6 Link Here

(-)b/devel/git/files/patch-Makefile (-7 / +7 lines)
1	--- Makefile.orig 2019-02-24 16:31:46 UTC	1	--- Makefile.orig 2021-08-11 20:06:58 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -535,16 +535,16 @@ ARFLAGS = rcs	3	@@ -524,16 +524,16 @@ GIT-VERSION-FILE: FORCE
4		4
5	prefix = $(HOME)	5	prefix = $(HOME)
6	bindir = $(prefix)/bin	6	bindir = $(prefix)/bin
Lines 22-28 Link Here
22	ETC_GITCONFIG = $(sysconfdir)/gitconfig	22	ETC_GITCONFIG = $(sysconfdir)/gitconfig
23	ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes	23	ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
24	lib = lib	24	lib = lib
25	@@ -1383,9 +1383,9 @@ EXTLIBS += -lz	25	@@ -1477,9 +1477,9 @@ EXTLIBS += -lz
26		26
27	ifndef NO_OPENSSL	27	ifndef NO_OPENSSL
28	OPENSSL_LIBSSL = -lssl	28	OPENSSL_LIBSSL = -lssl
Lines 35-53 Link Here
35	else	35	else
36	OPENSSL_LINK =	36	OPENSSL_LINK =
37	endif	37	endif
38	@@ -2234,7 +2234,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES	38	@@ -2376,7 +2376,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
39	chmod +x $@+ && \	39	chmod +x $@+ && \
40	mv $@+ $@	40	mv $@+ $@
41	else # NO_PERL	41	else # NO_PERL
42	-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh	42	-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
43	+$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh	43	+$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh
44	$(QUIET_GEN)$(RM) $@ $@+ && \	44	$(QUIET_GEN) \
45	sed -e '1s\|#!.*/sh\|#!$(SHELL_PATH_SQ)\|' \	45	sed -e '1s\|#!.*/sh\|#!$(SHELL_PATH_SQ)\|' \
46	-e 's\|@@REASON@@\|NO_PERL=$(NO_PERL)\|g' \	46	-e 's\|@@REASON@@\|NO_PERL=$(NO_PERL)\|g' \
47	@@ -2250,7 +2250,7 @@ ifndef NO_PYTHON	47	@@ -2392,7 +2392,7 @@ ifndef NO_PYTHON
48	$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS	48	$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
49	$(SCRIPT_PYTHON_GEN): % : %.py	49	$(SCRIPT_PYTHON_GEN): % : %.py
50	$(QUIET_GEN)$(RM) $@ $@+ && \	50	$(QUIET_GEN) \
51	- sed -e '1s\|#!.*python\|#!$(PYTHON_PATH_SQ)\|' \	51	- sed -e '1s\|#!.*python\|#!$(PYTHON_PATH_SQ)\|' \
52	+ sed -e '1s\|#!.python.\|#!$(PYTHON_PATH_SQ)\|' \	52	+ sed -e '1s\|#!.python.\|#!$(PYTHON_PATH_SQ)\|' \
53	$< >$@+ && \	53	$< >$@+ && \