1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/git/git.patch Fri Aug 10 14:40:03 2012 +0200
1.3 @@ -0,0 +1,186 @@
1.4 +Index: cogito-0.18.2/Makefile
1.5 +--- cogito-0.18.2/Makefile.orig 2006-11-17 01:37:24.000000000 +0100
1.6 ++++ cogito-0.18.2/Makefile 2012-06-18 16:02:16.000000000 +0200
1.7 +@@ -2,8 +2,8 @@
1.8 + prefix="$(HOME)"
1.9 +
1.10 + bindir=$(prefix)/bin
1.11 +-libdir=$(prefix)/lib/cogito
1.12 +-sharedir=$(prefix)/share/cogito
1.13 ++libdir=$(prefix)/lib/git/cogito
1.14 ++sharedir=$(prefix)/share/git/cogito
1.15 +
1.16 + INSTALL?=install
1.17 +
1.18 +Index: gc-utils/doc/Makefile
1.19 +--- gc-utils/doc/Makefile.orig 2008-08-01 17:39:15.000000000 +0200
1.20 ++++ gc-utils/doc/Makefile 2012-06-18 16:02:16.000000000 +0200
1.21 +@@ -29,17 +29,17 @@
1.22 +
1.23 + .PHONY: gen install clean uninstall
1.24 +
1.25 +-gen:: $(manpagesgz)
1.26 ++gen:: $(manpages)
1.27 +
1.28 + $(manpagesgz):
1.29 + $(QUIET_GEN) cat $(@:../build/%.1.gz=%.1) | sed -e 's,\$$VERSION\$$,$(VERSION_SQ),' | gzip -9 > $@
1.30 +
1.31 +-install: $(manpagesgz)
1.32 ++install: $(manpages)
1.33 + @$(MKINSTALLDIRS) $(DESTDIR)$(man1dir)
1.34 + ifndef V
1.35 +- @$(foreach f, $(manpagesgz), $(QUIET_INSTALL) $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
1.36 ++ @$(foreach f, $(manpages), $(QUIET_INSTALL) $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
1.37 + else
1.38 +- $(foreach f, $(manpagesgz), $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
1.39 ++ $(foreach f, $(manpages), $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
1.40 + endif
1.41 +
1.42 + uninstall:
1.43 +Index: git-1.7.11.4/Documentation/Makefile
1.44 +--- git-1.7.11.4/Documentation/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
1.45 ++++ git-1.7.11.4/Documentation/Makefile 2012-06-18 16:02:16.000000000 +0200
1.46 +@@ -56,10 +56,10 @@
1.47 + infodir?=$(prefix)/share/info
1.48 + MAKEINFO=makeinfo
1.49 + INSTALL_INFO=install-info
1.50 +-DOCBOOK2X_TEXI=docbook2x-texi
1.51 ++DOCBOOK2X_TEXI=docbook2texi
1.52 + DBLATEX=dblatex
1.53 + ifndef PERL_PATH
1.54 +- PERL_PATH = /usr/bin/perl
1.55 ++ PERL_PATH = perl
1.56 + endif
1.57 +
1.58 + -include ../config.mak.autogen
1.59 +Index: git-1.7.11.4/Makefile
1.60 +--- git-1.7.11.4/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
1.61 ++++ git-1.7.11.4/Makefile 2012-06-18 16:02:16.000000000 +0200
1.62 +@@ -339,12 +339,12 @@
1.63 + bindir = $(prefix)/$(bindir_relative)
1.64 + mandir = share/man
1.65 + infodir = share/info
1.66 +-gitexecdir = libexec/git-core
1.67 ++gitexecdir = libexec/git
1.68 + mergetoolsdir = $(gitexecdir)/mergetools
1.69 + sharedir = $(prefix)/share
1.70 + gitwebdir = $(sharedir)/gitweb
1.71 + localedir = $(sharedir)/locale
1.72 +-template_dir = share/git-core/templates
1.73 ++template_dir = share/git/templates
1.74 + htmldir = share/doc/git-doc
1.75 + ETC_GITCONFIG = $(sysconfdir)/gitconfig
1.76 + ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
1.77 +@@ -1455,10 +1455,10 @@
1.78 + else
1.79 + ifdef CURLDIR
1.80 + # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
1.81 +- BASIC_CFLAGS += -I$(CURLDIR)/include
1.82 +- CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
1.83 ++ BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags`
1.84 ++ CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs`
1.85 + else
1.86 +- CURL_LIBCURL = -lcurl
1.87 ++ CURL_LIBCURL = -lcurl -lssl -lcrypto
1.88 + endif
1.89 + ifdef NEEDS_SSL_WITH_CURL
1.90 + CURL_LIBCURL += -lssl
1.91 +@@ -2553,6 +2553,12 @@
1.92 + $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
1.93 + $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
1.94 + $(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
1.95 ++ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/lib'
1.96 ++ $(INSTALL) -m 644 $(LIB_FILE) '$(DESTDIR_SQ)$(prefix)/lib/libgit.a'
1.97 ++ $(INSTALL) -m 644 $(XDIFF_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-xdiff.a'
1.98 ++ $(INSTALL) -m 644 $(VCSSVN_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-vcssvn.a'
1.99 ++ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/include/git'
1.100 ++ for h in $(LIB_H); do b=`echo $$h | sed -e 's;/*[^/][^/]*$$;;'`; $(INSTALL) -d -m 755 $(DESTDIR_SQ)$(prefix)/include/git/$$b; $(INSTALL) -m 644 $$h $(DESTDIR_SQ)$(prefix)/include/git/$$h; done
1.101 + $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
1.102 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
1.103 + $(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
1.104 +Index: git-1.7.11.4/config.mak.in
1.105 +--- git-1.7.11.4/config.mak.in.orig 2012-06-18 00:01:30.000000000 +0200
1.106 ++++ git-1.7.11.4/config.mak.in 2012-06-18 16:02:16.000000000 +0200
1.107 +@@ -15,9 +15,9 @@
1.108 + prefix = @prefix@
1.109 + exec_prefix = @exec_prefix@
1.110 + bindir = @bindir@
1.111 +-gitexecdir = @libexecdir@/git-core
1.112 ++gitexecdir = @libexecdir@/git
1.113 + datarootdir = @datarootdir@
1.114 +-template_dir = @datadir@/git-core/templates
1.115 ++template_dir = @datadir@/git/templates
1.116 + sysconfdir = @sysconfdir@
1.117 +
1.118 + mandir=@mandir@
1.119 +Index: git-1.7.11.4/perl/Makefile.PL
1.120 +--- git-1.7.11.4/perl/Makefile.PL.orig 2012-06-18 00:01:30.000000000 +0200
1.121 ++++ git-1.7.11.4/perl/Makefile.PL 2012-06-18 16:02:16.000000000 +0200
1.122 +@@ -55,5 +55,6 @@
1.123 + PM => \%pm,
1.124 + PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"],
1.125 + MAKEFILE => 'perl.mak',
1.126 +- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
1.127 ++ INSTALLDIRS => 'vendor',
1.128 ++ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
1.129 + );
1.130 +Index: git-1.7.11.4/sha1_file.c
1.131 +--- git-1.7.11.4/sha1_file.c.orig 2012-06-18 00:01:30.000000000 +0200
1.132 ++++ git-1.7.11.4/sha1_file.c 2012-06-18 16:32:16.000000000 +0200
1.133 +@@ -20,6 +20,7 @@
1.134 + #include "sha1-lookup.h"
1.135 + #include "bulk-checkin.h"
1.136 + #include "streaming.h"
1.137 ++#include <sys/resource.h>
1.138 +
1.139 + #ifndef O_NOATIME
1.140 + #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
1.141 +Index: git-1.7.11.4/templates/Makefile
1.142 +--- git-1.7.11.4/templates/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
1.143 ++++ git-1.7.11.4/templates/Makefile 2012-06-18 16:02:16.000000000 +0200
1.144 +@@ -8,7 +8,7 @@
1.145 + TAR ?= tar
1.146 + RM ?= rm -f
1.147 + prefix ?= $(HOME)
1.148 +-template_instdir ?= $(prefix)/share/git-core/templates
1.149 ++template_instdir ?= $(prefix)/share/git/templates
1.150 + # DESTDIR=
1.151 +
1.152 + ifndef SHELL_PATH
1.153 +Index: stgit-0.14.3/setup.py
1.154 +--- stgit-0.14.3/setup.py.orig 2008-06-09 00:26:03.000000000 +0200
1.155 ++++ stgit-0.14.3/setup.py 2012-06-18 16:02:16.000000000 +0200
1.156 +@@ -61,10 +61,10 @@
1.157 + long_description = 'Push/pop utility on top of GIT',
1.158 + scripts = ['stg'],
1.159 + packages = ['stgit', 'stgit.commands'],
1.160 +- data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
1.161 +- ('share/stgit/examples', glob.glob('examples/*.tmpl')),
1.162 +- ('share/stgit/examples', ['examples/gitconfig']),
1.163 +- ('share/stgit/contrib', ['contrib/diffcol.sh',
1.164 ++ data_files = [('share/git/stgit/templates', glob.glob('templates/*.tmpl')),
1.165 ++ ('share/git/stgit/examples', glob.glob('examples/*.tmpl')),
1.166 ++ ('share/git/stgit/examples', ['examples/gitconfig']),
1.167 ++ ('share/git/stgit/contrib', ['contrib/diffcol.sh',
1.168 + 'contrib/stgbashprompt.sh',
1.169 + 'contrib/stgit-completion.bash']),
1.170 + ('share/doc/stgit', glob.glob('doc/*.txt'))]
1.171 +Index: stgit-0.14.3/stg
1.172 +--- stgit-0.14.3/stg.orig 2006-04-07 23:38:54.000000000 +0200
1.173 ++++ stgit-0.14.3/stg 2012-06-18 16:02:16.000000000 +0200
1.174 +@@ -26,12 +26,13 @@
1.175 + # It is assumed that the user installed StGIT using the --prefix= option
1.176 + prefix, bin = os.path.split(sys.path[0])
1.177 +
1.178 +-if bin == 'bin' and prefix != sys.prefix:
1.179 ++if bin == 'bin':
1.180 + sys.prefix = prefix
1.181 + sys.exec_prefix = prefix
1.182 +
1.183 + major, minor = sys.version_info[0:2]
1.184 +- local_path = [os.path.join(prefix, 'lib', 'python'),
1.185 ++ local_path = [os.path.join(prefix, 'lib', 'git'),
1.186 ++ os.path.join(prefix, 'lib', 'python'),
1.187 + os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)),
1.188 + os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor),
1.189 + 'site-packages')]
