aboutsummaryrefslogtreecommitdiffstats
path: root/devel/git
diff options
context:
space:
mode:
authoralexbl <alexbl@FreeBSD.org>2007-05-27 15:26:46 +0800
committeralexbl <alexbl@FreeBSD.org>2007-05-27 15:26:46 +0800
commit80faaa74fdea028effbeb64734195ea7152fe0c0 (patch)
treee3c6f3efe32c902bffd3170b265c3c2482a146eb /devel/git
parentdf1d8f82e9baaa9e67b9b1d101511106728db2cc (diff)
downloadfreebsd-ports-gnome-80faaa74fdea028effbeb64734195ea7152fe0c0.tar.gz
freebsd-ports-gnome-80faaa74fdea028effbeb64734195ea7152fe0c0.tar.zst
freebsd-ports-gnome-80faaa74fdea028effbeb64734195ea7152fe0c0.zip
- remove patch I forgot to remove in 1.5.2 update
Diffstat (limited to 'devel/git')
-rw-r--r--devel/git/files/patch-Makefile118
1 files changed, 0 insertions, 118 deletions
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
deleted file mode 100644
index 58ee7bbc75b2..000000000000
--- a/devel/git/files/patch-Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
---- Makefile.orig Mon Mar 5 05:15:33 2007
-+++ Makefile Thu Mar 15 08:16:45 2007
-@@ -108,6 +108,10 @@
- # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
- # MakeMaker (e.g. using ActiveState under Cygwin).
- #
-+# Define NO_GUI if you do not want Tcl/Tk GUI.
-+#
-+# Define WITH_P4IMPORT to build and install Python git-p4import script.
-+#
-
- GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
- @$(SHELL_PATH) ./GIT-VERSION-GEN
-@@ -193,9 +197,19 @@
- git-svnimport.perl git-cvsexportcommit.perl \
- git-send-email.perl git-svn.perl
-
-+SCRIPT_PYTHON = \
-+ git-p4import.py
-+
-+ifdef WITH_P4IMPORT
-+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
-+ $(patsubst %.perl,%,$(SCRIPT_PERL)) \
-+ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
-+ git-cherry-pick git-status git-instaweb
-+else
- SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
- $(patsubst %.perl,%,$(SCRIPT_PERL)) \
- git-cherry-pick git-status git-instaweb
-+endif
-
- # ... and all the rest that could be moved out of bindir to gitexecdir
- PROGRAMS = \
-@@ -238,6 +252,9 @@
- ifndef PERL_PATH
- PERL_PATH = /usr/bin/perl
- endif
-+ifndef PYTHON_PATH
-+ PYTHON_PATH = /usr/local/bin/python
-+endif
-
- export PERL_PATH
-
-@@ -612,6 +629,7 @@
-
- SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
- PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
-+PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
-
- LIBS = $(GITLIBS) $(EXTLIBS)
-
-@@ -632,7 +650,9 @@
- endif
-
- all::
-+ifndef NO_GUI
- $(MAKE) -C git-gui all
-+endif
- $(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
- $(MAKE) -C templates
-
-@@ -665,6 +685,15 @@
-
- $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
-
-+$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
-+ rm -f $@ $@+
-+ sed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \
-+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-+ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
-+ $@.py >$@+
-+ chmod +x $@+
-+ mv $@+ $@
-+
- perl/perl.mak: GIT-CFLAGS
- $(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
-
-@@ -863,7 +892,9 @@
- $(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
- $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
- $(MAKE) -C perl prefix='$(prefix_SQ)' install
-+ifndef NO_GUI
- $(MAKE) -C git-gui install
-+endif
- if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
- then \
- ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
-@@ -897,12 +928,20 @@
- @mkdir -p $(GIT_TARNAME)
- @cp git.spec $(GIT_TARNAME)
- @echo $(GIT_VERSION) > $(GIT_TARNAME)/version
-+ifndef NO_GUI
- @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
-+endif
-+ifndef NO_GUI
- $(TAR) rf $(GIT_TARNAME).tar \
- $(GIT_TARNAME)/git.spec \
- $(GIT_TARNAME)/version \
- $(GIT_TARNAME)/git-gui/version \
- $(GIT_TARNAME)/git-gui/credits
-+else
-+ $(TAR) rf $(GIT_TARNAME).tar \
-+ $(GIT_TARNAME)/git.spec \
-+ $(GIT_TARNAME)/version
-+endif
- @rm -rf $(GIT_TARNAME)
- gzip -f -9 $(GIT_TARNAME).tar
-
-@@ -943,7 +982,9 @@
- rm -f gitweb/gitweb.cgi
- $(MAKE) -C Documentation/ clean
- $(MAKE) -C perl clean
-+ifndef NO_GUI
- $(MAKE) -C git-gui clean
-+endif
- $(MAKE) -C templates/ clean
- $(MAKE) -C t/ clean
- rm -f GIT-VERSION-FILE GIT-CFLAGS