From 4087da0126582269d286e4a1bcc2ae36fc6755c3 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 15 Oct 2013 11:53:54 +0200 Subject: [PATCH] Adjust git to use vendor directories. * Add new package git_remote_helpers, which provides a python module. * Add requires for vendor_perl, as providing a vendor perl module requires a specific perl version. * Declare settings directory. --- dev-vcs/git/git-1.8.3.4.recipe | 21 ++++++++++++++++++--- dev-vcs/git/patches/git-1.8.3.4.patchset | 5 ++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index 2d0f6e0a3..29cdc9ed1 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -24,11 +24,10 @@ CHECKSUM_MD5_2="86fd812754d25201fd72c7476045dfec" SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.8.3.4.tar.gz" CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" - PROVIDES=" git = $portVersion compat >= 1.8 cmd:git = $portVersion compat >= 1.8 @@ -53,6 +52,9 @@ PROVIDES_email=" git_email = $portVersion compat >= 1.8 cmd:git_send_email = $portVersion compat >= 1.8 " +PROVIDES_remote_helpers=" + git_remote_helpers = $portVersion compat >= 1.8 + " PROVIDES_source=" git_source = $portVersion compat >= 1.8 " @@ -65,7 +67,7 @@ REQUIRES=" haiku >= $haikuVersion cmd:man cmd:nano - cmd:perl + cmd:perl >= 5 cmd:python lib:libcurl lib:libexpat @@ -74,6 +76,7 @@ REQUIRES=" lib:libpcre lib:libssl lib:libz + vendor_perl " REQUIRES_arch=" haiku >= $haikuVersion @@ -91,6 +94,10 @@ REQUIRES_email=" haiku >= $haikuVersion git == $portVersion base " +REQUIRES_remote_helpers=" + haiku >= $haikuVersion + git == $portVersion base + " REQUIRES_svn=" haiku >= $haikuVersion git == $portVersion base @@ -122,6 +129,10 @@ BUILD_PREREQUIRES=" cmd:tar " +USER_SETTINGS_FILES=" + settings/git directory + " + makeGit() { make prefix=$prefix \ @@ -224,6 +235,10 @@ INSTALL() documentation/man/man1/git-send-email.1 \ lib/git-core/git-send-email + pythonDir=python$(python -c 'import sys; print("%i.%i" % sys.version_info[:2])') + packageEntries remote_helpers \ + lib/$pythonDir + packageEntries svn \ documentation/packages/git/html/git-svn.html \ documentation/man/man1/git-svn.1 \ diff --git a/dev-vcs/git/patches/git-1.8.3.4.patchset b/dev-vcs/git/patches/git-1.8.3.4.patchset index 696703282..bf8e01dda 100644 --- a/dev-vcs/git/patches/git-1.8.3.4.patchset +++ b/dev-vcs/git/patches/git-1.8.3.4.patchset @@ -1,4 +1,4 @@ -From c35cdc07a85b42e2c90b12dc6b824133ad2b6452 Mon Sep 17 00:00:00 2001 +From 8ad851dd7da047374242cc025bf16852f8829da0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku @@ -23,7 +23,7 @@ index 1d72ec7..e3f254c 100755 1.8.3.4 -From 4627da2e350c3bc0dcff780db2c8fdce1aedf52e Mon Sep 17 00:00:00 2001 +From 8f777b37b553698d5497b2742a01bfc4139c6b63 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 21:03:59 +0200 Subject: On Haiku use the user settings directory instead of HOME @@ -75,4 +75,3 @@ index 04ff148..8668534 100644 char *git_path_submodule(const char *path, const char *fmt, ...) -- 1.8.3.4 -