git/git.patch@e5f1af644b30
git/git.patch
Tue, 28 Aug 2012 18:29:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:29:00 +0200
- changeset 532
- e5f1af644b30
- permissions
- -rw-r--r--
Massively update modules from Drupal 6.x to 7.x, and add diverse OpenID modules.
Unfortunately many modules available to Drupal 6.x installations have not been
since maintained or ported to 7.x causing this package to diminish in both size
and utility.
1 Index: cogito-0.18.2/Makefile
2 --- cogito-0.18.2/Makefile.orig 2006-11-17 01:37:24.000000000 +0100
3 +++ cogito-0.18.2/Makefile 2012-06-18 16:02:16.000000000 +0200
4 @@ -2,8 +2,8 @@
5 prefix="$(HOME)"
7 bindir=$(prefix)/bin
8 -libdir=$(prefix)/lib/cogito
9 -sharedir=$(prefix)/share/cogito
10 +libdir=$(prefix)/lib/git/cogito
11 +sharedir=$(prefix)/share/git/cogito
13 INSTALL?=install
15 Index: gc-utils/doc/Makefile
16 --- gc-utils/doc/Makefile.orig 2008-08-01 17:39:15.000000000 +0200
17 +++ gc-utils/doc/Makefile 2012-06-18 16:02:16.000000000 +0200
18 @@ -29,17 +29,17 @@
20 .PHONY: gen install clean uninstall
22 -gen:: $(manpagesgz)
23 +gen:: $(manpages)
25 $(manpagesgz):
26 $(QUIET_GEN) cat $(@:../build/%.1.gz=%.1) | sed -e 's,\$$VERSION\$$,$(VERSION_SQ),' | gzip -9 > $@
28 -install: $(manpagesgz)
29 +install: $(manpages)
30 @$(MKINSTALLDIRS) $(DESTDIR)$(man1dir)
31 ifndef V
32 - @$(foreach f, $(manpagesgz), $(QUIET_INSTALL) $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
33 + @$(foreach f, $(manpages), $(QUIET_INSTALL) $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
34 else
35 - $(foreach f, $(manpagesgz), $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
36 + $(foreach f, $(manpages), $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
37 endif
39 uninstall:
40 Index: git-1.7.11.4/Documentation/Makefile
41 --- git-1.7.11.4/Documentation/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
42 +++ git-1.7.11.4/Documentation/Makefile 2012-06-18 16:02:16.000000000 +0200
43 @@ -56,10 +56,10 @@
44 infodir?=$(prefix)/share/info
45 MAKEINFO=makeinfo
46 INSTALL_INFO=install-info
47 -DOCBOOK2X_TEXI=docbook2x-texi
48 +DOCBOOK2X_TEXI=docbook2texi
49 DBLATEX=dblatex
50 ifndef PERL_PATH
51 - PERL_PATH = /usr/bin/perl
52 + PERL_PATH = perl
53 endif
55 -include ../config.mak.autogen
56 Index: git-1.7.11.4/Makefile
57 --- git-1.7.11.4/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
58 +++ git-1.7.11.4/Makefile 2012-06-18 16:02:16.000000000 +0200
59 @@ -339,12 +339,12 @@
60 bindir = $(prefix)/$(bindir_relative)
61 mandir = share/man
62 infodir = share/info
63 -gitexecdir = libexec/git-core
64 +gitexecdir = libexec/git
65 mergetoolsdir = $(gitexecdir)/mergetools
66 sharedir = $(prefix)/share
67 gitwebdir = $(sharedir)/gitweb
68 localedir = $(sharedir)/locale
69 -template_dir = share/git-core/templates
70 +template_dir = share/git/templates
71 htmldir = share/doc/git-doc
72 ETC_GITCONFIG = $(sysconfdir)/gitconfig
73 ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
74 @@ -1455,10 +1455,10 @@
75 else
76 ifdef CURLDIR
77 # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
78 - BASIC_CFLAGS += -I$(CURLDIR)/include
79 - CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
80 + BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags`
81 + CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs`
82 else
83 - CURL_LIBCURL = -lcurl
84 + CURL_LIBCURL = -lcurl -lssl -lcrypto
85 endif
86 ifdef NEEDS_SSL_WITH_CURL
87 CURL_LIBCURL += -lssl
88 @@ -2553,6 +2553,12 @@
89 $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
90 $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
91 $(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
92 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/lib'
93 + $(INSTALL) -m 644 $(LIB_FILE) '$(DESTDIR_SQ)$(prefix)/lib/libgit.a'
94 + $(INSTALL) -m 644 $(XDIFF_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-xdiff.a'
95 + $(INSTALL) -m 644 $(VCSSVN_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-vcssvn.a'
96 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/include/git'
97 + 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
98 $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
99 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
100 $(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
101 Index: git-1.7.11.4/config.mak.in
102 --- git-1.7.11.4/config.mak.in.orig 2012-06-18 00:01:30.000000000 +0200
103 +++ git-1.7.11.4/config.mak.in 2012-06-18 16:02:16.000000000 +0200
104 @@ -15,9 +15,9 @@
105 prefix = @prefix@
106 exec_prefix = @exec_prefix@
107 bindir = @bindir@
108 -gitexecdir = @libexecdir@/git-core
109 +gitexecdir = @libexecdir@/git
110 datarootdir = @datarootdir@
111 -template_dir = @datadir@/git-core/templates
112 +template_dir = @datadir@/git/templates
113 sysconfdir = @sysconfdir@
115 mandir=@mandir@
116 Index: git-1.7.11.4/perl/Makefile.PL
117 --- git-1.7.11.4/perl/Makefile.PL.orig 2012-06-18 00:01:30.000000000 +0200
118 +++ git-1.7.11.4/perl/Makefile.PL 2012-06-18 16:02:16.000000000 +0200
119 @@ -55,5 +55,6 @@
120 PM => \%pm,
121 PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"],
122 MAKEFILE => 'perl.mak',
123 - INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
124 + INSTALLDIRS => 'vendor',
125 + INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
126 );
127 Index: git-1.7.11.4/sha1_file.c
128 --- git-1.7.11.4/sha1_file.c.orig 2012-06-18 00:01:30.000000000 +0200
129 +++ git-1.7.11.4/sha1_file.c 2012-06-18 16:32:16.000000000 +0200
130 @@ -20,6 +20,7 @@
131 #include "sha1-lookup.h"
132 #include "bulk-checkin.h"
133 #include "streaming.h"
134 +#include <sys/resource.h>
136 #ifndef O_NOATIME
137 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
138 Index: git-1.7.11.4/templates/Makefile
139 --- git-1.7.11.4/templates/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
140 +++ git-1.7.11.4/templates/Makefile 2012-06-18 16:02:16.000000000 +0200
141 @@ -8,7 +8,7 @@
142 TAR ?= tar
143 RM ?= rm -f
144 prefix ?= $(HOME)
145 -template_instdir ?= $(prefix)/share/git-core/templates
146 +template_instdir ?= $(prefix)/share/git/templates
147 # DESTDIR=
149 ifndef SHELL_PATH
150 Index: stgit-0.14.3/setup.py
151 --- stgit-0.14.3/setup.py.orig 2008-06-09 00:26:03.000000000 +0200
152 +++ stgit-0.14.3/setup.py 2012-06-18 16:02:16.000000000 +0200
153 @@ -61,10 +61,10 @@
154 long_description = 'Push/pop utility on top of GIT',
155 scripts = ['stg'],
156 packages = ['stgit', 'stgit.commands'],
157 - data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
158 - ('share/stgit/examples', glob.glob('examples/*.tmpl')),
159 - ('share/stgit/examples', ['examples/gitconfig']),
160 - ('share/stgit/contrib', ['contrib/diffcol.sh',
161 + data_files = [('share/git/stgit/templates', glob.glob('templates/*.tmpl')),
162 + ('share/git/stgit/examples', glob.glob('examples/*.tmpl')),
163 + ('share/git/stgit/examples', ['examples/gitconfig']),
164 + ('share/git/stgit/contrib', ['contrib/diffcol.sh',
165 'contrib/stgbashprompt.sh',
166 'contrib/stgit-completion.bash']),
167 ('share/doc/stgit', glob.glob('doc/*.txt'))]
168 Index: stgit-0.14.3/stg
169 --- stgit-0.14.3/stg.orig 2006-04-07 23:38:54.000000000 +0200
170 +++ stgit-0.14.3/stg 2012-06-18 16:02:16.000000000 +0200
171 @@ -26,12 +26,13 @@
172 # It is assumed that the user installed StGIT using the --prefix= option
173 prefix, bin = os.path.split(sys.path[0])
175 -if bin == 'bin' and prefix != sys.prefix:
176 +if bin == 'bin':
177 sys.prefix = prefix
178 sys.exec_prefix = prefix
180 major, minor = sys.version_info[0:2]
181 - local_path = [os.path.join(prefix, 'lib', 'python'),
182 + local_path = [os.path.join(prefix, 'lib', 'git'),
183 + os.path.join(prefix, 'lib', 'python'),
184 os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)),
185 os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor),
186 'site-packages')]
