Attachment #229518 for bug #259858

Lines 1-7 Link Here

(-)b/devel/git/Makefile (-1 / +1 lines)
1	# Created by: Eric Anholt	1	# Created by: Eric Anholt
2		2
3	PORTNAME= git	3	PORTNAME= git
4	DISTVERSION= 2.33.1	4	DISTVERSION= 2.34.0
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= KERNEL_ORG/software/scm/git	6	MASTER_SITES= KERNEL_ORG/software/scm/git
7	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	7	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \

Lines 1-7 Link Here

(-)b/devel/git/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1634082307	1	TIMESTAMP = 1636995969
2	SHA256 (git-2.33.1.tar.xz) = e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f	2	SHA256 (git-2.34.0.tar.xz) = fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f
3	SIZE (git-2.33.1.tar.xz) = 6558636	3	SIZE (git-2.34.0.tar.xz) = 6623924
4	SHA256 (git-manpages-2.33.1.tar.xz) = c75219f1c9f56caad4f8eb17915e4fe34ca5e1b453773df279a2cec98205ab87	4	SHA256 (git-manpages-2.34.0.tar.xz) = 47eafa3517ef5fc7a6e914ad2ee6a6e4d830a4bb6830dba13175850860492c72
5	SIZE (git-manpages-2.33.1.tar.xz) = 494288	5	SIZE (git-manpages-2.34.0.tar.xz) = 497252
6	SHA256 (git-htmldocs-2.33.1.tar.xz) = 6a6b8a0f064c78e0033aa4fce0520325496de019b09fff99fa82eeb472038f5c	6	SHA256 (git-htmldocs-2.34.0.tar.xz) = c95d838dbd4b8c28d9f00beca776c06d94031be05fa39cf33fb08ae5f0aee250
7	SIZE (git-htmldocs-2.33.1.tar.xz) = 1396744	7	SIZE (git-htmldocs-2.34.0.tar.xz) = 1406204




--- Makefile.orig	2021-10-29 22:46:52 UTC
+++ Makefile
@@ -517,16 +517,16 @@ GIT-VERSION-FILE: FORCE
 
 prefix = $(HOME)
 bindir = $(prefix)/bin

 ETC_GITCONFIG = $(sysconfdir)/gitconfig
 ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
 lib = lib
@@ -551,8 +551,8 @@ DIFF = diff
 TAR = tar
 FIND = find
 INSTALL = install

 XGETTEXT = xgettext
 MSGFMT = msgfmt
 CURL_CONFIG = curl-config
@@ -1465,9 +1465,9 @@ EXTLIBS += -lz
 
 ifndef NO_OPENSSL
 	OPENSSL_LIBSSL = -lssl

 	else
 		OPENSSL_LINK =
 	endif
@@ -2371,7 +2371,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
 	chmod +x $@+ && \
 	mv $@+ $@
 else # NO_PERL

 	$(QUIET_GEN) \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
@@ -2387,7 +2387,7 @@ ifndef NO_PYTHON
 $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
 $(SCRIPT_PYTHON_GEN): % : %.py
 	$(QUIET_GEN) \

 	    $< >$@+ && \
 	chmod +x $@+ && \
 	mv $@+ $@
@@ -3015,7 +3015,7 @@ install: all
 	$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 	$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 	$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'
-	$(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'
+	if [ $(BINDIR_PROGRAMS_NO_X) ]; then  $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'; fi
 
 ifdef MSVC
 	# We DO NOT install the individual foo.o.pdb files because they

Lines 131-137 libexec/git-core/git-quiltimport Link Here

(-)b/devel/git/pkg-plist (-2 / +1 lines)
131	libexec/git-core/git-range-diff	131	libexec/git-core/git-range-diff
132	libexec/git-core/git-read-tree	132	libexec/git-core/git-read-tree
133	libexec/git-core/git-rebase	133	libexec/git-core/git-rebase
134	libexec/git-core/git-rebase--preserve-merges
135	libexec/git-core/git-receive-pack	134	libexec/git-core/git-receive-pack
136	libexec/git-core/git-reflog	135	libexec/git-core/git-reflog
137	libexec/git-core/git-remote	136	libexec/git-core/git-remote
Lines 701-706 man/man7/gitworkflows.7.gz Link Here
701	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.32.0.txt	700	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.32.0.txt
702	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.33.0.txt	701	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.33.0.txt
703	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.33.1.txt	702	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.33.1.txt
		703	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.34.0.txt
704	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt	704	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
705	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt	705	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
706	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt	706	%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
707	-

Return to bug 259858

Lines 1-6 Link Here

(-)b/devel/git/files/patch-Makefile (-6 / +15 lines)
1	--- Makefile.orig 2021-08-16 21:18:43 UTC	1	--- Makefile.orig 2021-10-29 22:46:52 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -524,16 +524,16 @@ GIT-VERSION-FILE: FORCE	3	@@ -517,16 +517,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	@@ -558,8 +558,8 @@ DIFF = diff	25	@@ -551,8 +551,8 @@ DIFF = diff
26	TAR = tar	26	TAR = tar
27	FIND = find	27	FIND = find
28	INSTALL = install	28	INSTALL = install
Lines 33-39 Link Here
33	XGETTEXT = xgettext	33	XGETTEXT = xgettext
34	MSGFMT = msgfmt	34	MSGFMT = msgfmt
35	CURL_CONFIG = curl-config	35	CURL_CONFIG = curl-config
36	@@ -1477,9 +1477,9 @@ EXTLIBS += -lz	36	@@ -1465,9 +1465,9 @@ EXTLIBS += -lz
37		37
38	ifndef NO_OPENSSL	38	ifndef NO_OPENSSL
39	OPENSSL_LIBSSL = -lssl	39	OPENSSL_LIBSSL = -lssl
Lines 46-52 Link Here
46	else	46	else
47	OPENSSL_LINK =	47	OPENSSL_LINK =
48	endif	48	endif
49	@@ -2376,7 +2376,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES	49	@@ -2371,7 +2371,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
50	chmod +x $@+ && \	50	chmod +x $@+ && \
51	mv $@+ $@	51	mv $@+ $@
52	else # NO_PERL	52	else # NO_PERL
Lines 55-61 Link Here
55	$(QUIET_GEN) \	55	$(QUIET_GEN) \
56	sed -e '1s\|#!.*/sh\|#!$(SHELL_PATH_SQ)\|' \	56	sed -e '1s\|#!.*/sh\|#!$(SHELL_PATH_SQ)\|' \
57	-e 's\|@@REASON@@\|NO_PERL=$(NO_PERL)\|g' \	57	-e 's\|@@REASON@@\|NO_PERL=$(NO_PERL)\|g' \
58	@@ -2392,7 +2392,7 @@ ifndef NO_PYTHON	58	@@ -2387,7 +2387,7 @@ ifndef NO_PYTHON
59	$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS	59	$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
60	$(SCRIPT_PYTHON_GEN): % : %.py	60	$(SCRIPT_PYTHON_GEN): % : %.py
61	$(QUIET_GEN) \	61	$(QUIET_GEN) \
Lines 64-66 Link Here
64	$< >$@+ && \	64	$< >$@+ && \
65	chmod +x $@+ && \	65	chmod +x $@+ && \
66	mv $@+ $@	66	mv $@+ $@
		67	@@ -3015,7 +3015,7 @@ install: all
		68	$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
		69	$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
		70	$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'
		71	- $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'
		72	+ if [ $(BINDIR_PROGRAMS_NO_X) ]; then $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'; fi
		73
		74	ifdef MSVC
		75	# We DO NOT install the individual foo.o.pdb files because they