aboutsummaryrefslogtreecommitdiff
path: root/devel/git/files/patch-Makefile
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2021-10-08 11:48:52 +0000
committerRenato Botelho <garga@FreeBSD.org>2021-10-12 15:18:54 +0000
commitff5ded75bcda28c580623504e01f5db8eb6be9cf (patch)
tree0af5322eeab97f2efffabf4008c252a0bd8eb28e /devel/git/files/patch-Makefile
parentae22a7846afe2f4c0ac5bc88c5a63001c5eeafb1 (diff)
downloadports-ff5ded75bcda28c580623504e01f5db8eb6be9cf.tar.gz
ports-ff5ded75bcda28c580623504e01f5db8eb6be9cf.zip
devel/git: Split into subpackages
Removed CVS, GUI, PERFORCE and SUBVERSION options and also gui and svn FLAVORS, and create 4 new subports: devel/git-cvs devel/git-gui devel/git-p4 devel/git-svn All these packages depend of devel/git and install only additional files and manpages. This work is based on initial patch submitted by grembo@i at review D30238. PR: 251090 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D32369
Diffstat (limited to 'devel/git/files/patch-Makefile')
-rw-r--r--devel/git/files/patch-Makefile21
1 files changed, 16 insertions, 5 deletions
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 5f41fcb8a69c..17768fe05551 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2019-02-24 16:31:46 UTC
+--- Makefile.orig 2021-06-06 12:13:45 UTC
+++ Makefile
-@@ -535,16 +535,16 @@ ARFLAGS = rcs
+@@ -520,16 +520,16 @@ GIT-VERSION-FILE: FORCE
prefix = $(HOME)
bindir = $(prefix)/bin
@@ -22,7 +22,18 @@
ETC_GITCONFIG = $(sysconfdir)/gitconfig
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
lib = lib
-@@ -1383,9 +1383,9 @@ EXTLIBS += -lz
+@@ -554,8 +554,8 @@ DIFF = diff
+ TAR = tar
+ FIND = find
+ INSTALL = install
+-TCL_PATH = tclsh
+-TCLTK_PATH = wish
++TCL_PATH ?= tclsh
++TCLTK_PATH ?= wish
+ XGETTEXT = xgettext
+ MSGFMT = msgfmt
+ CURL_CONFIG = curl-config
+@@ -1468,9 +1468,9 @@ EXTLIBS += -lz
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
@@ -35,7 +46,7 @@
else
OPENSSL_LINK =
endif
-@@ -2234,7 +2234,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+@@ -2358,7 +2358,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
chmod +x $@+ && \
mv $@+ $@
else # NO_PERL
@@ -44,7 +55,7 @@
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
-@@ -2250,7 +2250,7 @@ ifndef NO_PYTHON
+@@ -2374,7 +2374,7 @@ ifndef NO_PYTHON
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
$(SCRIPT_PYTHON_GEN): % : %.py
$(QUIET_GEN)$(RM) $@ $@+ && \