openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38718 Commits
1 Branch
2 Tags
596 MiB
 
 
 
 
 
 
Tree: ec2c39cf03
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ec2c39cf03'
${ noResults }
openpkg-packages/git/git.patch

180 lines
6.2 KiB
Raw Blame History

Index: cogito-0.18.2/Makefile
--- cogito-0.18.2/Makefile.orig 2006-11-17 01:37:24 +0100
+++ cogito-0.18.2/Makefile 2009-11-23 08:51:14 +0100
@@ -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 2009-11-23 08:51:14 +0100
@@ -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.7.0.4/Documentation/Makefile
--- git-1.7.0.4/Documentation/Makefile.orig 2009-11-16 23:14:46 +0100
+++ git-1.7.0.4/Documentation/Makefile 2009-11-23 08:51:14 +0100
@@ -51,10 +51,10 @@
infodir?=$(prefix)/share/info
MAKEINFO=makeinfo
INSTALL_INFO=install-info
-DOCBOOK2X_TEXI=docbook2x-texi
+DOCBOOK2X_TEXI=docbook2texi
DBLATEX=dblatex
ifndef PERL_PATH
- PERL_PATH = /usr/bin/perl
+ PERL_PATH = perl
endif
-include ../config.mak.autogen
Index: git-1.7.0.4/Makefile
--- git-1.7.0.4/Makefile.orig 2009-11-16 23:14:46 +0100
+++ git-1.7.0.4/Makefile 2009-11-23 08:51:14 +0100
@@ -241,9 +241,9 @@
bindir = $(prefix)/$(bindir_relative)
mandir = share/man
infodir = share/info
-gitexecdir = libexec/git-core
+gitexecdir = libexec/git
sharedir = $(prefix)/share
-template_dir = share/git-core/templates
+template_dir = share/git/templates
htmldir = share/doc/git-doc
ifeq ($(prefix),/usr)
sysconfdir = /etc
@@ -1050,10 +1050,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
PROGRAMS += git-remote-curl$X git-http-fetch$X
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
@@ -1091,7 +1091,7 @@
OPENSSL_LINK =
endif
ifdef NEEDS_CRYPTO_WITH_SSL
- OPENSSL_LINK += -lcrypto
+ OPENSSL_LIBSSL += -lcrypto
endif
else
BASIC_CFLAGS += -DNO_OPENSSL
Index: git-1.7.0.4/config.mak.in
--- git-1.7.0.4/config.mak.in.orig 2009-11-16 23:14:46 +0100
+++ git-1.7.0.4/config.mak.in 2009-11-23 08:51:14 +0100
@@ -13,9 +13,9 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-gitexecdir = @libexecdir@/git-core
+gitexecdir = @libexecdir@/git
datarootdir = @datarootdir@
-template_dir = @datadir@/git-core/templates
+template_dir = @datadir@/git/templates
mandir=@mandir@
Index: git-1.7.0.4/perl/Makefile.PL
--- git-1.7.0.4/perl/Makefile.PL.orig 2009-11-16 23:14:46 +0100
+++ git-1.7.0.4/perl/Makefile.PL 2009-11-23 08:51:14 +0100
@@ -34,5 +34,6 @@
VERSION_FROM => 'Git.pm',
PM => \%pm,
MAKEFILE => 'perl.mak',
- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
+ INSTALLDIRS => 'vendor',
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
);
Index: git-1.7.0.4/templates/Makefile
--- git-1.7.0.4/templates/Makefile.orig 2009-11-16 23:14:46 +0100
+++ git-1.7.0.4/templates/Makefile 2009-11-23 08:51:14 +0100
@@ -8,7 +8,7 @@
TAR ?= tar
RM ?= rm -f
prefix ?= $(HOME)
-template_instdir ?= $(prefix)/share/git-core/templates
+template_instdir ?= $(prefix)/share/git/templates
# DESTDIR=
# Shell quote (do not use $(call) to accommodate ancient setups);
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 2009-11-23 08:51:14 +0100
@@ -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 2009-11-23 08:51:14 +0100
@@ -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')]
Index: tig-0.15/tig.c
--- tig-0.15/tig.c.orig 2009-11-20 14:05:27 +0100
+++ tig-0.15/tig.c 2009-11-23 08:56:35 +0100
@@ -4015,7 +4015,7 @@
if (add_title && help_open_keymap_title(view, keymap))
return;
- add_title = false;
+ add_title = FALSE;
if (group) {
add_line_text(view, group, LINE_HELP_GROUP);