Index: cogito-0.18.2/Makefile
--- cogito-0.18.2/Makefile.orig	2006-11-17 01:37:24 +0100
+++ cogito-0.18.2/Makefile	2008-08-01 21:05:21 +0200
@@ -2,8 +2,8 @@
 prefix="$(HOME)"
 
 bindir=$(prefix)/bin
-libdir=$(prefix)/lib/cogito
-sharedir=$(prefix)/share/cogito
+libdir=$(prefix)/lib/git/cogito
+sharedir=$(prefix)/share/git/cogito
 
 INSTALL?=install
 
Index: gc-utils/doc/Makefile
--- gc-utils/doc/Makefile.orig	2008-08-01 17:39:15 +0200
+++ gc-utils/doc/Makefile	2008-08-01 21:05:37 +0200
@@ -29,17 +29,17 @@
 
 .PHONY: gen install clean uninstall
 
-gen:: $(manpagesgz)
+gen:: $(manpages)
 
 $(manpagesgz):
 	$(QUIET_GEN) cat $(@:../build/%.1.gz=%.1) | sed -e 's,\$$VERSION\$$,$(VERSION_SQ),' | gzip -9 > $@
 
-install: $(manpagesgz)
+install: $(manpages)
 	@$(MKINSTALLDIRS) $(DESTDIR)$(man1dir)
 ifndef V
-	@$(foreach f, $(manpagesgz), $(QUIET_INSTALL) $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
+	@$(foreach f, $(manpages), $(QUIET_INSTALL) $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
 else
-	$(foreach f, $(manpagesgz), $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
+	$(foreach f, $(manpages), $(INSTALL) -m644 $f "$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
 endif
 
 uninstall:
Index: git-1.6.1.2/Documentation/Makefile
--- git-1.6.1.2/Documentation/Makefile.orig	2008-07-20 02:23:11 +0200
+++ git-1.6.1.2/Documentation/Makefile	2008-08-01 21:05:21 +0200
@@ -48,9 +48,9 @@
 infodir?=$(prefix)/share/info
 MAKEINFO=makeinfo
 INSTALL_INFO=install-info
-DOCBOOK2X_TEXI=docbook2x-texi
+DOCBOOK2X_TEXI=docbook2texi
 ifndef PERL_PATH
-	PERL_PATH = /usr/bin/perl
+	PERL_PATH = perl
 endif
 
 -include ../config.mak.autogen
Index: git-1.6.1.2/Makefile
--- git-1.6.1.2/Makefile.orig	2008-07-20 02:23:11 +0200
+++ git-1.6.1.2/Makefile	2008-08-01 21:05:21 +0200
@@ -176,7 +176,7 @@
 infodir = $(prefix)/share/info
 gitexecdir = $(bindir)
 sharedir = $(prefix)/share
-template_dir = $(sharedir)/git-core/templates
+template_dir = $(sharedir)/git/core/templates
 htmldir=$(sharedir)/doc/git-doc
 ifeq ($(prefix),/usr)
 sysconfdir = /etc
@@ -748,10 +748,10 @@
 else
 	ifdef CURLDIR
 		# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
-		BASIC_CFLAGS += -I$(CURLDIR)/include
-		CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
+ 		BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags`
+ 		CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs`
 	else
-		CURL_LIBCURL = -lcurl
+		CURL_LIBCURL = -lcurl -lssl -lcrypto
 	endif
 	BUILTIN_OBJS += builtin-http-fetch.o
 	EXTLIBS += $(CURL_LIBCURL)
Index: git-1.6.1.2/perl/Makefile.PL
--- git-1.6.1.2/perl/Makefile.PL.orig	2008-07-20 02:23:11 +0200
+++ git-1.6.1.2/perl/Makefile.PL	2008-08-01 21:05:21 +0200
@@ -26,5 +26,6 @@
 	VERSION_FROM    => 'Git.pm',
 	PM		=> \%pm,
 	MAKEFILE	=> 'perl.mak',
-	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
+	INSTALLDIRS	=> 'vendor',
+	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
 );
Index: stgit-0.14.3/setup.py
--- stgit-0.14.3/setup.py.orig	2008-06-09 00:26:03 +0200
+++ stgit-0.14.3/setup.py	2008-08-01 21:05:21 +0200
@@ -61,10 +61,10 @@
       long_description = 'Push/pop utility on top of GIT',
       scripts = ['stg'],
       packages = ['stgit', 'stgit.commands'],
-      data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
-                    ('share/stgit/examples', glob.glob('examples/*.tmpl')),
-                    ('share/stgit/examples', ['examples/gitconfig']),
-                    ('share/stgit/contrib', ['contrib/diffcol.sh',
+      data_files = [('share/git/stgit/templates', glob.glob('templates/*.tmpl')),
+                    ('share/git/stgit/examples', glob.glob('examples/*.tmpl')),
+                    ('share/git/stgit/examples', ['examples/gitconfig']),
+                    ('share/git/stgit/contrib', ['contrib/diffcol.sh',
                                              'contrib/stgbashprompt.sh',
                                              'contrib/stgit-completion.bash']),
                     ('share/doc/stgit', glob.glob('doc/*.txt'))]
Index: stgit-0.14.3/stg
--- stgit-0.14.3/stg.orig	2006-04-07 23:38:54 +0200
+++ stgit-0.14.3/stg	2008-08-01 21:05:21 +0200
@@ -26,12 +26,13 @@
 # It is assumed that the user installed StGIT using the --prefix= option
 prefix, bin = os.path.split(sys.path[0])
 
-if bin == 'bin' and prefix != sys.prefix:
+if bin == 'bin':
     sys.prefix = prefix
     sys.exec_prefix = prefix
 
     major, minor = sys.version_info[0:2]
-    local_path = [os.path.join(prefix, 'lib', 'python'),
+    local_path = [os.path.join(prefix, 'lib', 'git'),
+                  os.path.join(prefix, 'lib', 'python'),
                   os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)),
                   os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor),
                                'site-packages')]