mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
git: add alien_svn dependency to the latest version
... and remove some old recipes.
This commit is contained in:
Adrien Destugues
@@ -1,246 +0,0 @@
|
||||
SUMMARY="Fast, scalable, distributed revision control system"
|
||||
DESCRIPTION="
|
||||
Git is a free and open source distributed version control system designed to \
|
||||
handle everything from small to very large projects with speed and efficiency.
|
||||
Git is easy to learn and has a tiny footprint with lightning fast performance. \
|
||||
It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \
|
||||
features like cheap local branching, convenient staging areas, and multiple \
|
||||
workflows.
|
||||
"
|
||||
HOMEPAGE="http://git-scm.com/"
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
|
||||
|
||||
SOURCE_URI="http://git-core.googlecode.com/files/git-1.8.3.4.tar.gz"
|
||||
CHECKSUM_SHA256="dfa2cdf2df92b4abe956b1e7586030381c4e39e89161ab789a660d8d1f24d9d9"
|
||||
PATCHES="git-1.8.3.4.patchset"
|
||||
|
||||
SOURCE_URI_2="http://git-core.googlecode.com/files/git-manpages-1.8.3.4.tar.gz"
|
||||
CHECKSUM_SHA256_2="6943c3b2362c107ab32d8ed81b8f4811c6e5a2eddd91b8e4188ccf6b4be2b740"
|
||||
|
||||
SOURCE_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.8.3.4.tar.gz"
|
||||
CHECKSUM_SHA256_3="da13f9453489145d5aaefeb6535ce43621fdb7ff426c50304acf2c2e4430005c"
|
||||
|
||||
|
||||
REVISION="4"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PROVIDES="
|
||||
git = $portVersion compat >= 1.8
|
||||
cmd:git = $portVersion compat >= 1.8
|
||||
cmd:git_receive_pack = $portVersion compat >= 1.8
|
||||
cmd:git_shell = $portVersion compat >= 1.8
|
||||
cmd:git_upload_archive = $portVersion compat >= 1.8
|
||||
cmd:git_upload_pack = $portVersion compat >= 1.8
|
||||
"
|
||||
PROVIDES_arch="
|
||||
git_arch = $portVersion compat >= 1.8
|
||||
cmd:git_archimport = $portVersion compat >= 1.8
|
||||
"
|
||||
PROVIDES_cvs="
|
||||
git_cvs = $portVersion compat >= 1.8
|
||||
cmd:git_cvsserver = $portVersion compat >= 1.8
|
||||
"
|
||||
PROVIDES_daemon="
|
||||
git_daemon = $portVersion compat >= 1.8
|
||||
cmd:git_daemon = $portVersion compat >= 1.8
|
||||
"
|
||||
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
|
||||
"
|
||||
PROVIDES_svn="
|
||||
git_svn = $portVersion compat >= 1.8
|
||||
cmd:git_svn = $portVersion compat >= 1.8
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl >= 5
|
||||
cmd:python
|
||||
lib:libcurl
|
||||
lib:libexpat
|
||||
lib:libiconv
|
||||
lib:libintl
|
||||
lib:libpcre
|
||||
lib:libssl
|
||||
lib:libz
|
||||
vendor_perl
|
||||
"
|
||||
REQUIRES_arch="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_cvs="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
cmd:cvsps
|
||||
"
|
||||
REQUIRES_daemon="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_email="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_remote_helpers="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_svn="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl
|
||||
cmd:python
|
||||
devel:libcurl
|
||||
devel:libexpat
|
||||
devel:libiconv
|
||||
devel:libintl
|
||||
devel:libpcre
|
||||
devel:libssl
|
||||
devel:libz
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel
|
||||
cmd:autoconf
|
||||
cmd:find
|
||||
cmd:gcc
|
||||
cmd:gettext
|
||||
cmd:ld
|
||||
cmd:make
|
||||
cmd:msgfmt
|
||||
cmd:sed
|
||||
cmd:tar
|
||||
"
|
||||
|
||||
USER_SETTINGS_FILES="
|
||||
settings/git directory
|
||||
"
|
||||
|
||||
makeGit()
|
||||
{
|
||||
make prefix=$prefix \
|
||||
bindir_relative=$relativeBinDir \
|
||||
mandir=$manDir \
|
||||
infodir=$infoDir \
|
||||
gitexecdir=$libDir/git-core \
|
||||
sharedir=$dataDir \
|
||||
template_dir=$dataDir/git-core/templates \
|
||||
htmldir=$docDir \
|
||||
sysconfdir=$sysconfDir \
|
||||
PTHREAD_LIBS= \
|
||||
USE_LIBPCRE=YesPlease \
|
||||
NO_D_TYPE_IN_DIRENT=YesPlease \
|
||||
NO_MEMMEM=YesPlease \
|
||||
NO_MKSTEMPS=YesPlease \
|
||||
NEEDS_LIBICONV=YesPlease \
|
||||
NO_R_TO_GCC_LINKER=YesPlease \
|
||||
GNU_ROFF=YesPlease \
|
||||
PERL_PATH=$portPackageLinksDir/cmd~perl/bin/perl \
|
||||
PYTHON_PATH=$portPackageLinksDir/cmd~python/bin/python \
|
||||
NO_TCLTK=YesPlease \
|
||||
OBJECT_CREATION_USES_RENAMES=YesPlease \
|
||||
NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \
|
||||
NO_INSTALL_HARDLINKS=YesPlease \
|
||||
HAVE_DEV_TTY=YesPlease \
|
||||
DEFAULT_EDITOR=nano \
|
||||
BASIC_LDFLAGS="-lnetwork -lbsd" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
|
||||
BUILD()
|
||||
{
|
||||
makeGit $jobArgs
|
||||
makeGit strip
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
makeGit install
|
||||
|
||||
# replace copies of git binaries with symlinks
|
||||
cd $binDir
|
||||
for program in git*; do
|
||||
ln -sfn "../lib/git-core/$program" "$program"
|
||||
done
|
||||
|
||||
# copy manpages
|
||||
mkdir -p $manDir
|
||||
cp -rd $sourceDir2/* $manDir/
|
||||
|
||||
# copy html documentation
|
||||
htmlDir=$docDir/html
|
||||
mkdir -p $htmlDir
|
||||
cp -rd $sourceDir3/*.html $htmlDir/
|
||||
rm $htmlDir/git-gui.html
|
||||
|
||||
# copy asciidoc documentation for which there isn't any corresponding html
|
||||
asciidocDir=$docDir/asciidoc
|
||||
mkdir -p $asciidocDir
|
||||
for f in $sourceDir3/*.txt; do
|
||||
html=$sourceDir3/$(basename $f .txt).html
|
||||
if ! [ -e $html ]; then
|
||||
cp -d $f $asciidocDir/
|
||||
fi
|
||||
done
|
||||
|
||||
packageEntries arch \
|
||||
documentation/packages/git/html/git-archimport.html \
|
||||
documentation/man/man1/git-archimport.1 \
|
||||
lib/git-core/git-archimport
|
||||
|
||||
packageEntries cvs \
|
||||
bin/git-cvsserver \
|
||||
documentation/packages/git/html/git-cvsexportcommit.html \
|
||||
documentation/packages/git/html/git-cvsimport.html \
|
||||
documentation/packages/git/html/git-cvsserver.html \
|
||||
documentation/man/man1/git-cvsexportcommit.1 \
|
||||
documentation/man/man1/git-cvsimport.1 \
|
||||
documentation/man/man1/git-cvsserver.1 \
|
||||
documentation/man/man7/gitcvs-migration.7 \
|
||||
lib/git-core/git-cvsexportcommit \
|
||||
lib/git-core/git-cvsimport \
|
||||
lib/git-core/git-cvsserver
|
||||
|
||||
packageEntries daemon \
|
||||
documentation/packages/git/html/git-credential-cache--daemon.html \
|
||||
documentation/packages/git/html/git-credential-cache.html \
|
||||
documentation/packages/git/html/git-daemon.html \
|
||||
documentation/man/man1/git-credential-cache--daemon.1 \
|
||||
documentation/man/man1/git-credential-cache.1 \
|
||||
documentation/man/man1/git-daemon.1 \
|
||||
lib/git-core/git-credential-cache--daemon \
|
||||
lib/git-core/git-credential-cache \
|
||||
lib/git-core/git-daemon
|
||||
|
||||
packageEntries email \
|
||||
documentation/packages/git/html/git-send-email.html \
|
||||
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 \
|
||||
lib/git-core/git-svn
|
||||
}
|
||||
@@ -10,7 +10,7 @@ workflows."
|
||||
HOMEPAGE="https://git-scm.com/"
|
||||
COPYRIGHT="2005-2018 Git Authors (see git web site for list)"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
|
||||
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="5560578bd21468d98637f41515c165d32f69caff0838b8989dee5ce10022c717"
|
||||
@@ -97,6 +97,7 @@ REQUIRES_email="
|
||||
"
|
||||
REQUIRES_svn="
|
||||
haiku
|
||||
alien_svn
|
||||
git == $portVersion base
|
||||
"
|
||||
|
||||
|
||||
@@ -1,222 +0,0 @@
|
||||
SUMMARY="Fast, scalable, distributed revision control system"
|
||||
DESCRIPTION="Git is a free and open source distributed version control system \
|
||||
designed to handle everything from small to very large projects with speed \
|
||||
and efficiency.
|
||||
|
||||
Git is easy to learn and has a tiny footprint with lightning fast performance. \
|
||||
It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \
|
||||
features like cheap local branching, convenient staging areas, and multiple \
|
||||
workflows."
|
||||
HOMEPAGE="http://git-scm.com/"
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2015 Git Authors (see git web site for list)"
|
||||
|
||||
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="e9e50d0d382183a9327d39334eb65db92852208e1438aab2a9bf8d06ef17b653"
|
||||
PATCHES="git-$portVersion.patchset"
|
||||
|
||||
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256_2="c9340fad1f521f3782abca4839d66bfee237f3e931856413561cf1b55fc9d550"
|
||||
|
||||
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256_3="7f5eb11cf3dd5abb4705fb91f52c78ff4265b2e2eb15948cef311b3e04896d1c"
|
||||
|
||||
REVISION="3"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PROVIDES="
|
||||
git = $portVersion compat >= 2.2
|
||||
cmd:git = $portVersion compat >= 2.2
|
||||
cmd:git_receive_pack = $portVersion compat >= 2.2
|
||||
cmd:git_shell = $portVersion compat >= 2.2
|
||||
cmd:git_upload_archive = $portVersion compat >= 2.2
|
||||
cmd:git_upload_pack = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_arch="
|
||||
git_arch = $portVersion compat >= 2.2
|
||||
cmd:git_archimport = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_cvs="
|
||||
git_cvs = $portVersion compat >= 2.2
|
||||
cmd:git_cvsimport = $portVersion compat >= 2.2
|
||||
cmd:git_cvsserver = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_daemon="
|
||||
git_daemon = $portVersion compat >= 2.2
|
||||
cmd:git_daemon = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_email="
|
||||
git_email = $portVersion compat >= 2.2
|
||||
cmd:git_send_email = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_source="
|
||||
git_source = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_svn="
|
||||
git_svn = $portVersion compat >= 2.2
|
||||
cmd:git_svn = $portVersion compat >= 2.2
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl >= 5
|
||||
cmd:python
|
||||
lib:libcurl
|
||||
lib:libexpat
|
||||
lib:libiconv
|
||||
lib:libintl
|
||||
lib:libpcre
|
||||
lib:libssl
|
||||
lib:libz
|
||||
vendor_perl
|
||||
"
|
||||
REQUIRES_arch="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_cvs="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
cmd:cvsps
|
||||
"
|
||||
REQUIRES_daemon="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_email="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_svn="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl
|
||||
devel:libcurl
|
||||
devel:libexpat
|
||||
devel:libiconv
|
||||
devel:libintl
|
||||
devel:libpcre
|
||||
devel:libssl
|
||||
devel:libz
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel
|
||||
cmd:find
|
||||
cmd:gcc
|
||||
cmd:gettext
|
||||
cmd:ld
|
||||
cmd:make
|
||||
cmd:msgfmt
|
||||
cmd:sed
|
||||
cmd:tar
|
||||
"
|
||||
|
||||
USER_SETTINGS_FILES="
|
||||
settings/git directory
|
||||
"
|
||||
|
||||
makeGit()
|
||||
{
|
||||
make prefix=$prefix \
|
||||
bindir_relative=$relativeBinDir \
|
||||
mandir=$manDir \
|
||||
infodir=$infoDir \
|
||||
gitexecdir=$libDir/git-core \
|
||||
sharedir=$dataDir \
|
||||
template_dir=$dataDir/git-core/templates \
|
||||
htmldir=$docDir \
|
||||
sysconfdir=$sysconfDir \
|
||||
PTHREAD_LIBS= \
|
||||
USE_LIBPCRE=YesPlease \
|
||||
NO_D_TYPE_IN_DIRENT=YesPlease \
|
||||
NO_MEMMEM=YesPlease \
|
||||
NO_MKSTEMPS=YesPlease \
|
||||
NEEDS_LIBICONV=YesPlease \
|
||||
NO_R_TO_GCC_LINKER=YesPlease \
|
||||
GNU_ROFF=YesPlease \
|
||||
PERL_PATH=$portPackageLinksDir/cmd~perl/bin/perl \
|
||||
NO_PYTHON=YesPlease \
|
||||
NO_TCLTK=YesPlease \
|
||||
OBJECT_CREATION_USES_RENAMES=YesPlease \
|
||||
NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \
|
||||
NO_INSTALL_HARDLINKS=YesPlease \
|
||||
HAVE_DEV_TTY=YesPlease \
|
||||
DEFAULT_EDITOR=nano \
|
||||
BASIC_LDFLAGS="-lnetwork -lbsd" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
makeGit $jobArgs
|
||||
makeGit strip
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
makeGit install
|
||||
|
||||
# copy manpages
|
||||
mkdir -p $manDir
|
||||
cp -rd $sourceDir2/* $manDir/
|
||||
|
||||
# copy html documentation
|
||||
htmlDir=$docDir/html
|
||||
mkdir -p $htmlDir
|
||||
cp -rd $sourceDir3/*.html $htmlDir/
|
||||
rm $htmlDir/git-gui.html
|
||||
|
||||
# replace copies of git binaries with symlinks
|
||||
cd $binDir
|
||||
for program in git*; do
|
||||
ln -sfn "../lib/git-core/$program" "$program"
|
||||
done
|
||||
|
||||
packageEntries arch \
|
||||
documentation/packages/git/html/git-archimport.html \
|
||||
documentation/man/man1/git-archimport.1 \
|
||||
lib/git-core/git-archimport
|
||||
|
||||
packageEntries cvs \
|
||||
bin/git-cvsserver \
|
||||
documentation/packages/git/html/git-cvsexportcommit.html \
|
||||
documentation/packages/git/html/git-cvsimport.html \
|
||||
documentation/packages/git/html/git-cvsserver.html \
|
||||
documentation/man/man1/git-cvsexportcommit.1 \
|
||||
documentation/man/man1/git-cvsimport.1 \
|
||||
documentation/man/man1/git-cvsserver.1 \
|
||||
documentation/man/man7/gitcvs-migration.7 \
|
||||
lib/git-core/git-cvsexportcommit \
|
||||
lib/git-core/git-cvsimport \
|
||||
lib/git-core/git-cvsserver
|
||||
|
||||
packageEntries daemon \
|
||||
documentation/packages/git/html/git-credential-cache--daemon.html \
|
||||
documentation/packages/git/html/git-credential-cache.html \
|
||||
documentation/packages/git/html/git-daemon.html \
|
||||
documentation/man/man1/git-credential-cache--daemon.1 \
|
||||
documentation/man/man1/git-credential-cache.1 \
|
||||
documentation/man/man1/git-daemon.1 \
|
||||
lib/git-core/git-credential-cache--daemon \
|
||||
lib/git-core/git-credential-cache \
|
||||
lib/git-core/git-daemon
|
||||
|
||||
packageEntries email \
|
||||
documentation/packages/git/html/git-send-email.html \
|
||||
documentation/man/man1/git-send-email.1 \
|
||||
lib/git-core/git-send-email
|
||||
|
||||
packageEntries svn \
|
||||
documentation/packages/git/html/git-svn.html \
|
||||
documentation/man/man1/git-svn.1 \
|
||||
lib/git-core/git-svn
|
||||
}
|
||||
@@ -1,223 +0,0 @@
|
||||
SUMMARY="Fast, scalable, distributed revision control system"
|
||||
DESCRIPTION="Git is a free and open source distributed version control system \
|
||||
designed to handle everything from small to very large projects with speed \
|
||||
and efficiency.
|
||||
|
||||
Git is easy to learn and has a tiny footprint with lightning fast performance. \
|
||||
It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \
|
||||
features like cheap local branching, convenient staging areas, and multiple \
|
||||
workflows."
|
||||
HOMEPAGE="http://git-scm.com/"
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2016 Git Authors (see git web site for list)"
|
||||
|
||||
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b"
|
||||
PATCHES="git-$portVersion.patchset"
|
||||
|
||||
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_2="d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25"
|
||||
|
||||
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_3="3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad"
|
||||
|
||||
REVISION="1"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PROVIDES="
|
||||
git = $portVersion compat >= 2.2
|
||||
cmd:git = $portVersion compat >= 2.2
|
||||
cmd:git_receive_pack = $portVersion compat >= 2.2
|
||||
cmd:git_shell = $portVersion compat >= 2.2
|
||||
cmd:git_upload_archive = $portVersion compat >= 2.2
|
||||
cmd:git_upload_pack = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_arch="
|
||||
git_arch = $portVersion compat >= 2.2
|
||||
cmd:git_archimport = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_cvs="
|
||||
git_cvs = $portVersion compat >= 2.2
|
||||
cmd:git_cvsimport = $portVersion compat >= 2.2
|
||||
cmd:git_cvsserver = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_daemon="
|
||||
git_daemon = $portVersion compat >= 2.2
|
||||
cmd:git_daemon = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_email="
|
||||
git_email = $portVersion compat >= 2.2
|
||||
cmd:git_send_email = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_source="
|
||||
git_source = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_svn="
|
||||
git_svn = $portVersion compat >= 2.2
|
||||
cmd:git_svn = $portVersion compat >= 2.2
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl >= 5
|
||||
cmd:python
|
||||
lib:libcurl
|
||||
lib:libexpat
|
||||
lib:libiconv
|
||||
lib:libintl
|
||||
lib:libpcre
|
||||
lib:libssl
|
||||
lib:libz
|
||||
vendor_perl
|
||||
"
|
||||
REQUIRES_arch="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_cvs="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
cmd:cvsps
|
||||
"
|
||||
REQUIRES_daemon="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_email="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_svn="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl
|
||||
devel:libcurl
|
||||
devel:libexpat
|
||||
devel:libiconv
|
||||
devel:libintl
|
||||
devel:libpcre
|
||||
devel:libssl
|
||||
devel:libz
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel
|
||||
cmd:find
|
||||
cmd:gcc
|
||||
cmd:gettext
|
||||
cmd:ld
|
||||
cmd:make
|
||||
cmd:msgfmt
|
||||
cmd:sed
|
||||
cmd:tar
|
||||
"
|
||||
|
||||
USER_SETTINGS_FILES="
|
||||
settings/git directory
|
||||
"
|
||||
|
||||
makeGit()
|
||||
{
|
||||
make prefix=$prefix \
|
||||
bindir_relative=$relativeBinDir \
|
||||
mandir=$manDir \
|
||||
infodir=$infoDir \
|
||||
gitexecdir=$libDir/git-core \
|
||||
sharedir=$dataDir \
|
||||
template_dir=$dataDir/git-core/templates \
|
||||
htmldir=$docDir \
|
||||
sysconfdir=$sysconfDir \
|
||||
PTHREAD_LIBS= \
|
||||
USE_LIBPCRE=YesPlease \
|
||||
NO_D_TYPE_IN_DIRENT=YesPlease \
|
||||
NO_MEMMEM=YesPlease \
|
||||
NO_MKSTEMPS=YesPlease \
|
||||
NEEDS_LIBICONV=YesPlease \
|
||||
NO_R_TO_GCC_LINKER=YesPlease \
|
||||
GNU_ROFF=YesPlease \
|
||||
PERL_PATH=$portPackageLinksDir/cmd~perl/bin/perl \
|
||||
NO_PYTHON=YesPlease \
|
||||
NO_TCLTK=YesPlease \
|
||||
OBJECT_CREATION_USES_RENAMES=YesPlease \
|
||||
NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \
|
||||
NO_INSTALL_HARDLINKS=YesPlease \
|
||||
HAVE_DEV_TTY=YesPlease \
|
||||
DEFAULT_EDITOR=nano \
|
||||
DEFAULT_HELP_FORMAT=web \
|
||||
BASIC_LDFLAGS="-lnetwork -lbsd" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
makeGit $jobArgs
|
||||
makeGit strip
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
makeGit install
|
||||
|
||||
# copy manpages
|
||||
mkdir -p $manDir
|
||||
cp -rd $sourceDir2/* $manDir/
|
||||
|
||||
# copy html documentation
|
||||
htmlDir=$docDir
|
||||
mkdir -p $htmlDir
|
||||
cp -rd $sourceDir3/*.html $htmlDir/
|
||||
rm $htmlDir/git-gui.html
|
||||
|
||||
# replace copies of git binaries with symlinks
|
||||
cd $binDir
|
||||
for program in git*; do
|
||||
ln -sfn "../lib/git-core/$program" "$program"
|
||||
done
|
||||
|
||||
packageEntries arch \
|
||||
documentation/packages/git/git-archimport.html \
|
||||
documentation/man/man1/git-archimport.1 \
|
||||
lib/git-core/git-archimport
|
||||
|
||||
packageEntries cvs \
|
||||
bin/git-cvsserver \
|
||||
documentation/packages/git/git-cvsexportcommit.html \
|
||||
documentation/packages/git/git-cvsimport.html \
|
||||
documentation/packages/git/git-cvsserver.html \
|
||||
documentation/man/man1/git-cvsexportcommit.1 \
|
||||
documentation/man/man1/git-cvsimport.1 \
|
||||
documentation/man/man1/git-cvsserver.1 \
|
||||
documentation/man/man7/gitcvs-migration.7 \
|
||||
lib/git-core/git-cvsexportcommit \
|
||||
lib/git-core/git-cvsimport \
|
||||
lib/git-core/git-cvsserver
|
||||
|
||||
packageEntries daemon \
|
||||
documentation/packages/git/git-credential-cache--daemon.html \
|
||||
documentation/packages/git/git-credential-cache.html \
|
||||
documentation/packages/git/git-daemon.html \
|
||||
documentation/man/man1/git-credential-cache--daemon.1 \
|
||||
documentation/man/man1/git-credential-cache.1 \
|
||||
documentation/man/man1/git-daemon.1 \
|
||||
lib/git-core/git-credential-cache--daemon \
|
||||
lib/git-core/git-credential-cache \
|
||||
lib/git-core/git-daemon
|
||||
|
||||
packageEntries email \
|
||||
documentation/packages/git/git-send-email.html \
|
||||
documentation/man/man1/git-send-email.1 \
|
||||
lib/git-core/git-send-email
|
||||
|
||||
packageEntries svn \
|
||||
documentation/packages/git/git-svn.html \
|
||||
documentation/man/man1/git-svn.1 \
|
||||
lib/git-core/git-svn
|
||||
}
|
||||
@@ -1,242 +0,0 @@
|
||||
SUMMARY="Fast, scalable, distributed revision control system"
|
||||
DESCRIPTION="Git is a free and open source distributed version control system \
|
||||
designed to handle everything from small to very large projects with speed \
|
||||
and efficiency.
|
||||
|
||||
Git is easy to learn and has a tiny footprint with lightning fast performance. \
|
||||
It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \
|
||||
features like cheap local branching, convenient staging areas, and multiple \
|
||||
workflows."
|
||||
HOMEPAGE="https://git-scm.com/"
|
||||
COPYRIGHT="2005-2016 Git Authors (see git web site for list)"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
|
||||
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="9f1473350c1792310b51af03a9cb5cce841f68202f835b20d46312a30232fa63"
|
||||
|
||||
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_2="14e0e84af19b8d6b4f0b006b6e33486a0c40bca01e604e77f004efe564d54b4d"
|
||||
|
||||
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_3="abfa0e160c062a36956beaa5e8bf4d6e2db93f235c892f94681bd6f1feb71865"
|
||||
|
||||
PATCHES="git-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PROVIDES="
|
||||
git = $portVersion compat >= 2.2
|
||||
cmd:git = $portVersion compat >= 2.2
|
||||
cmd:git_receive_pack = $portVersion compat >= 2.2
|
||||
cmd:git_shell = $portVersion compat >= 2.2
|
||||
cmd:git_upload_archive = $portVersion compat >= 2.2
|
||||
cmd:git_upload_pack = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_arch="
|
||||
git_arch = $portVersion compat >= 2.2
|
||||
cmd:git_archimport = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_cvs="
|
||||
git_cvs = $portVersion compat >= 2.2
|
||||
cmd:git_cvsimport = $portVersion compat >= 2.2
|
||||
cmd:git_cvsserver = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_daemon="
|
||||
git_daemon = $portVersion compat >= 2.2
|
||||
cmd:git_daemon = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_email="
|
||||
git_email = $portVersion compat >= 2.2
|
||||
cmd:git_send_email = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_source="
|
||||
git_source = $portVersion compat >= 2.2
|
||||
"
|
||||
PROVIDES_svn="
|
||||
git_svn = $portVersion compat >= 2.2
|
||||
cmd:git_svn = $portVersion compat >= 2.2
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl >= 5
|
||||
cmd:python
|
||||
lib:libcurl
|
||||
lib:libexpat
|
||||
lib:libiconv
|
||||
lib:libintl
|
||||
lib:libpcre
|
||||
lib:libssl
|
||||
lib:libz
|
||||
vendor_perl
|
||||
"
|
||||
REQUIRES_arch="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_cvs="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
cmd:cvsps
|
||||
"
|
||||
REQUIRES_daemon="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_email="
|
||||
haiku
|
||||
git == $portVersion base
|
||||
"
|
||||
REQUIRES_svn="
|
||||
haiku
|
||||
alien_svn
|
||||
git == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl
|
||||
devel:libcurl
|
||||
devel:libexpat
|
||||
devel:libiconv
|
||||
devel:libintl
|
||||
devel:libpcre
|
||||
devel:libssl
|
||||
devel:libz
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel
|
||||
cmd:find
|
||||
cmd:gcc
|
||||
cmd:gettext
|
||||
cmd:ld
|
||||
cmd:make
|
||||
cmd:msgfmt
|
||||
cmd:sed
|
||||
cmd:tar
|
||||
"
|
||||
|
||||
USER_SETTINGS_FILES="
|
||||
settings/git directory
|
||||
"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
settings/gitconfig keep-old
|
||||
"
|
||||
|
||||
makeGit()
|
||||
{
|
||||
make prefix=$prefix \
|
||||
bindir_relative=$relativeBinDir \
|
||||
mandir=$manDir \
|
||||
infodir=$infoDir \
|
||||
gitexecdir=$libDir/git-core \
|
||||
sharedir=$dataDir \
|
||||
template_dir=$dataDir/git-core/templates \
|
||||
htmldir=$docDir \
|
||||
sysconfdir=$sysconfDir \
|
||||
PTHREAD_LIBS= \
|
||||
USE_LIBPCRE=YesPlease \
|
||||
NO_D_TYPE_IN_DIRENT=YesPlease \
|
||||
NO_MEMMEM=YesPlease \
|
||||
NO_MKSTEMPS=YesPlease \
|
||||
NEEDS_LIBICONV=YesPlease \
|
||||
NO_R_TO_GCC_LINKER=YesPlease \
|
||||
GNU_ROFF=YesPlease \
|
||||
PERL_PATH=/bin/perl \
|
||||
NO_PYTHON=YesPlease \
|
||||
NO_TCLTK=YesPlease \
|
||||
OBJECT_CREATION_USES_RENAMES=YesPlease \
|
||||
NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \
|
||||
NO_INSTALL_HARDLINKS=YesPlease \
|
||||
HAVE_DEV_TTY=YesPlease \
|
||||
DEFAULT_EDITOR=nano \
|
||||
DEFAULT_HELP_FORMAT=web \
|
||||
BASIC_LDFLAGS="-lnetwork -lbsd" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
makeGit $jobArgs
|
||||
makeGit strip
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
makeGit install
|
||||
|
||||
# copy manpages
|
||||
mkdir -p $manDir
|
||||
cp -rd $sourceDir2/* $manDir/
|
||||
|
||||
# copy html documentation
|
||||
htmlDir=$docDir
|
||||
mkdir -p $htmlDir
|
||||
cp -rd $sourceDir3/*.html $htmlDir/
|
||||
rm $htmlDir/git-gui.html
|
||||
|
||||
# Default system-wide gitconfig. Settings in this file are only used
|
||||
# if they are unset both for the repository and globally (global options
|
||||
# are saved in the user settings file).
|
||||
# core.untrackedCache caches enumeration of untracked files and uses an
|
||||
# efficient method of determining whether the cache is out of date. This
|
||||
# is filesystem-dependent, but supported on BeFS.
|
||||
mkdir -p $sysconfDir
|
||||
printf "[core]\n untrackedCache = true" > $sysconfDir/gitconfig
|
||||
|
||||
# replace copies of git binaries with symlinks
|
||||
cd $binDir
|
||||
for program in git*; do
|
||||
ln -sfn "../lib/git-core/$program" "$program"
|
||||
done
|
||||
|
||||
packageEntries arch \
|
||||
documentation/packages/git/git-archimport.html \
|
||||
documentation/man/man1/git-archimport.1 \
|
||||
lib/git-core/git-archimport
|
||||
|
||||
packageEntries cvs \
|
||||
bin/git-cvsserver \
|
||||
documentation/packages/git/git-cvsexportcommit.html \
|
||||
documentation/packages/git/git-cvsimport.html \
|
||||
documentation/packages/git/git-cvsserver.html \
|
||||
documentation/man/man1/git-cvsexportcommit.1 \
|
||||
documentation/man/man1/git-cvsimport.1 \
|
||||
documentation/man/man1/git-cvsserver.1 \
|
||||
documentation/man/man7/gitcvs-migration.7 \
|
||||
lib/git-core/git-cvsexportcommit \
|
||||
lib/git-core/git-cvsimport \
|
||||
lib/git-core/git-cvsserver
|
||||
|
||||
packageEntries daemon \
|
||||
documentation/packages/git/git-credential-cache--daemon.html \
|
||||
documentation/packages/git/git-credential-cache.html \
|
||||
documentation/packages/git/git-daemon.html \
|
||||
documentation/man/man1/git-credential-cache--daemon.1 \
|
||||
documentation/man/man1/git-credential-cache.1 \
|
||||
documentation/man/man1/git-daemon.1 \
|
||||
lib/git-core/git-credential-cache--daemon \
|
||||
lib/git-core/git-credential-cache \
|
||||
lib/git-core/git-daemon
|
||||
|
||||
packageEntries email \
|
||||
documentation/packages/git/git-send-email.html \
|
||||
documentation/man/man1/git-send-email.1 \
|
||||
lib/git-core/git-send-email
|
||||
|
||||
packageEntries svn \
|
||||
documentation/packages/git/git-svn.html \
|
||||
documentation/man/man1/git-svn.1 \
|
||||
lib/git-core/git-svn
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
makeGit test
|
||||
}
|
||||
@@ -1,136 +0,0 @@
|
||||
From f7163c64a9dfa46d22a81945486c0199d90b015f Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Tue, 13 Aug 2013 08:07:25 +0200
|
||||
Subject: git-web--browse.sh: use "open" on Haiku
|
||||
|
||||
|
||||
diff --git a/git-web--browse.sh b/git-web--browse.sh
|
||||
index 1d72ec7..e3f254c 100755
|
||||
--- a/git-web--browse.sh
|
||||
+++ b/git-web--browse.sh
|
||||
@@ -132,6 +132,10 @@ if test -z "$browser" ; then
|
||||
if test -x /usr/bin/cygstart; then
|
||||
browser_candidates="cygstart $browser_candidates"
|
||||
fi
|
||||
+ # /boot/system/haiku_loader indicates Haiku
|
||||
+ if test -f /boot/system/haiku_loader; then
|
||||
+ browser_candidates="open $browser_candidates"
|
||||
+ fi
|
||||
|
||||
for i in $browser_candidates; do
|
||||
init_browser_path $i
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From b88713702e6a551f36a85afae6eba95e84976392 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Tue, 13 Aug 2013 21:03:59 +0200
|
||||
Subject: On Haiku use the user settings directory instead of HOME
|
||||
|
||||
|
||||
diff --git a/path.c b/path.c
|
||||
index 04ff148..8668534 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -5,6 +5,11 @@
|
||||
#include "strbuf.h"
|
||||
#include "string-list.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+# include <FindDirectory.h>
|
||||
+# include <StorageDefs.h>
|
||||
+#endif
|
||||
+
|
||||
#ifndef get_st_mode_bits
|
||||
/*
|
||||
* The replacement lstat(2) we use on Cygwin is incomplete and
|
||||
@@ -139,6 +144,19 @@ char *git_path(const char *fmt, ...)
|
||||
|
||||
void home_config_paths(char **global, char **xdg, char *file)
|
||||
{
|
||||
+#ifdef __HAIKU__
|
||||
+ char settingsPath[B_PATH_NAME_LENGTH];
|
||||
+
|
||||
+ *xdg = NULL;
|
||||
+
|
||||
+ if (global) {
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
|
||||
+ sizeof(settingsPath)) == B_OK) {
|
||||
+ *global = mkpathdup("%s/git/%s", settingsPath, file);
|
||||
+ } else
|
||||
+ *global = NULL;
|
||||
+ }
|
||||
+#else
|
||||
char *xdg_home = getenv("XDG_CONFIG_HOME");
|
||||
char *home = getenv("HOME");
|
||||
char *to_free = NULL;
|
||||
@@ -161,6 +179,7 @@ void home_config_paths(char **global, char **xdg, char *file)
|
||||
*xdg = mkpathdup("%s/git/%s", xdg_home, file);
|
||||
|
||||
free(to_free);
|
||||
+#endif
|
||||
}
|
||||
|
||||
char *git_path_submodule(const char *path, const char *fmt, ...)
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 5f5ff9533c6ef8729088056c0399269e939cb248 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Tue, 15 Oct 2013 21:34:09 +0200
|
||||
Subject: Ensure config-directory exists before using it.
|
||||
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 7a85ebd..10be1af 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -1343,6 +1343,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
|
||||
int ret;
|
||||
struct lock_file *lock = NULL;
|
||||
char *filename_buf = NULL;
|
||||
+ char *config_dir = NULL;
|
||||
|
||||
/* parse-key returns negative; flip the sign to feed exit(3) */
|
||||
ret = 0 - git_config_parse_key(key, &store.key, &store.baselen);
|
||||
@@ -1354,6 +1355,12 @@ int git_config_set_multivar_in_file(const char *config_filename,
|
||||
if (!config_filename)
|
||||
config_filename = filename_buf = git_pathdup("config");
|
||||
|
||||
+ config_dir = xstrdup(config_filename);
|
||||
+ * find_last_dir_sep(config_dir) = '\0';
|
||||
+ if (access(config_dir, F_OK) != 0)
|
||||
+ mkdir(config_dir, 0755);
|
||||
+ free(config_dir);
|
||||
+
|
||||
/*
|
||||
* The lock serves a purpose in addition to locking: the new
|
||||
* contents of .git/config will be written into it.
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 38c0f4ef61601e810a1060861ce5d6b281c44656 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@gmail.com>
|
||||
Date: Wed, 17 Sep 2014 09:35:49 +0200
|
||||
Subject: strings.h fix.
|
||||
|
||||
|
||||
diff --git a/mailmap.c b/mailmap.c
|
||||
index 2a7b366..feaf37a 100644
|
||||
--- a/mailmap.c
|
||||
+++ b/mailmap.c
|
||||
@@ -2,6 +2,8 @@
|
||||
#include "string-list.h"
|
||||
#include "mailmap.h"
|
||||
|
||||
+#include <strings.h>
|
||||
+
|
||||
#define DEBUG_MAILMAP 0
|
||||
#if DEBUG_MAILMAP
|
||||
#define debug_mm(...) fprintf(stderr, __VA_ARGS__)
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
@@ -1,147 +0,0 @@
|
||||
From ee8b7c8ecc7ea2cd35a3e1c298c7afaf8823e048 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Tue, 13 Aug 2013 08:07:25 +0200
|
||||
Subject: [PATCH 1/5] git-web--browse.sh: use "open" on Haiku
|
||||
|
||||
---
|
||||
git-web--browse.sh | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/git-web--browse.sh b/git-web--browse.sh
|
||||
index ae15253..1f6e306 100755
|
||||
--- a/git-web--browse.sh
|
||||
+++ b/git-web--browse.sh
|
||||
@@ -132,6 +132,10 @@ if test -z "$browser" ; then
|
||||
if test -x /usr/bin/cygstart; then
|
||||
browser_candidates="cygstart $browser_candidates"
|
||||
fi
|
||||
+ # /boot/system/haiku_loader indicates Haiku
|
||||
+ if test -f /boot/system/haiku_loader; then
|
||||
+ browser_candidates="open $browser_candidates"
|
||||
+ fi
|
||||
|
||||
for i in $browser_candidates; do
|
||||
init_browser_path $i
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From a7f24c225e8b75abf52d07f73625ea404503b475 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Mon, 19 Jan 2015 15:37:16 -0500
|
||||
Subject: [PATCH 2/5] On Haiku use the user settings directory instead of HOME
|
||||
|
||||
---
|
||||
path.c | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/path.c b/path.c
|
||||
index e608993..ee5831c 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -5,6 +5,11 @@
|
||||
#include "strbuf.h"
|
||||
#include "string-list.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+# include <FindDirectory.h>
|
||||
+# include <StorageDefs.h>
|
||||
+#endif
|
||||
+
|
||||
static int get_st_mode_bits(const char *path, int *mode)
|
||||
{
|
||||
struct stat st;
|
||||
@@ -132,6 +137,19 @@ char *git_path(const char *fmt, ...)
|
||||
|
||||
void home_config_paths(char **global, char **xdg, char *file)
|
||||
{
|
||||
+#ifdef __HAIKU__
|
||||
+ char settingsPath[B_PATH_NAME_LENGTH];
|
||||
+
|
||||
+ *xdg = NULL;
|
||||
+
|
||||
+ if (global) {
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
|
||||
+ sizeof(settingsPath)) == B_OK) {
|
||||
+ *global = mkpathdup("%s/git/%s", settingsPath, file);
|
||||
+ } else
|
||||
+ *global = NULL;
|
||||
+ }
|
||||
+#else
|
||||
char *xdg_home = getenv("XDG_CONFIG_HOME");
|
||||
char *home = getenv("HOME");
|
||||
char *to_free = NULL;
|
||||
@@ -156,6 +174,7 @@ void home_config_paths(char **global, char **xdg, char *file)
|
||||
}
|
||||
|
||||
free(to_free);
|
||||
+#endif
|
||||
}
|
||||
|
||||
char *git_path_submodule(const char *path, const char *fmt, ...)
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From b2890c33ea7dff56b4060394673d36746ad4e448 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Mon, 19 Jan 2015 15:50:09 -0500
|
||||
Subject: [PATCH 3/5] Ensure config-directory exists before using it.
|
||||
|
||||
---
|
||||
config.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 752e2e2..1e07f5c 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -1934,6 +1934,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
|
||||
int ret;
|
||||
struct lock_file *lock = NULL;
|
||||
char *filename_buf = NULL;
|
||||
+ char *config_dir = NULL;
|
||||
|
||||
/* parse-key returns negative; flip the sign to feed exit(3) */
|
||||
ret = 0 - git_config_parse_key(key, &store.key, &store.baselen);
|
||||
@@ -1945,6 +1946,12 @@ int git_config_set_multivar_in_file(const char *config_filename,
|
||||
if (!config_filename)
|
||||
config_filename = filename_buf = git_pathdup("config");
|
||||
|
||||
+ config_dir = xstrdup(config_filename);
|
||||
+ * find_last_dir_sep(config_dir) = '\0';
|
||||
+ if (access(config_dir, F_OK) != 0)
|
||||
+ mkdir(config_dir, 0755);
|
||||
+ free(config_dir);
|
||||
+
|
||||
/*
|
||||
* The lock serves a purpose in addition to locking: the new
|
||||
* contents of .git/config will be written into it.
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 089d55aa7d52ac66b9639b47b0be062851bfbda2 Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Mon, 19 Jan 2015 16:40:30 -0500
|
||||
Subject: [PATCH 4/5] Don't use __builtin_ctzll on GCC2.
|
||||
|
||||
---
|
||||
ewah/ewok.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ewah/ewok.h b/ewah/ewok.h
|
||||
index f6ad190..ca059c9 100644
|
||||
--- a/ewah/ewok.h
|
||||
+++ b/ewah/ewok.h
|
||||
@@ -47,7 +47,7 @@ static inline uint32_t ewah_bit_popcount64(uint64_t x)
|
||||
return (x * 0x0101010101010101ULL) >> 56;
|
||||
}
|
||||
|
||||
-#ifdef __GNUC__
|
||||
+#if defined(__GNUC__) && __GNUC__ >= 3
|
||||
#define ewah_bit_ctz64(x) __builtin_ctzll(x)
|
||||
#else
|
||||
static inline int ewah_bit_ctz64(uint64_t x)
|
||||
--
|
||||
1.8.3.4
|
||||
@@ -1,128 +0,0 @@
|
||||
From fc9ad1e70a926bf499369ffdb4423acb15eeb8a4 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Tue, 13 Aug 2013 08:07:25 +0200
|
||||
Subject: git-web--browse.sh: use "open" on Haiku
|
||||
|
||||
|
||||
diff --git a/git-web--browse.sh b/git-web--browse.sh
|
||||
index ae15253..1f6e306 100755
|
||||
--- a/git-web--browse.sh
|
||||
+++ b/git-web--browse.sh
|
||||
@@ -132,6 +132,10 @@ if test -z "$browser" ; then
|
||||
if test -x /usr/bin/cygstart; then
|
||||
browser_candidates="cygstart $browser_candidates"
|
||||
fi
|
||||
+ # /boot/system/haiku_loader indicates Haiku
|
||||
+ if test -f /boot/system/haiku_loader; then
|
||||
+ browser_candidates="open $browser_candidates"
|
||||
+ fi
|
||||
|
||||
for i in $browser_candidates; do
|
||||
init_browser_path $i
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From 5fcb76ee57c563a202ba82baabf45b98254ac4ea Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Mon, 19 Jan 2015 15:37:16 -0500
|
||||
Subject: On Haiku use the user settings directory instead of HOME
|
||||
|
||||
|
||||
diff --git a/path.c b/path.c
|
||||
index 3cd155e..a258488 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -6,6 +6,11 @@
|
||||
#include "string-list.h"
|
||||
#include "dir.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
+#include <StorageDefs.h>
|
||||
+#endif
|
||||
+
|
||||
static int get_st_mode_bits(const char *path, int *mode)
|
||||
{
|
||||
struct stat st;
|
||||
@@ -1186,10 +1191,18 @@ char *xdg_config_home(const char *filename)
|
||||
{
|
||||
const char *home, *config_home;
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ char settingsPath[B_PATH_NAME_LENGTH];
|
||||
assert(filename);
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
|
||||
+ sizeof(settingsPath)) == B_OK)
|
||||
+ return mkpathdup("%s/git/%s", settingsPath, filename);
|
||||
+#else
|
||||
config_home = getenv("XDG_CONFIG_HOME");
|
||||
+ assert(filename);
|
||||
if (config_home && *config_home)
|
||||
return mkpathdup("%s/git/%s", config_home, filename);
|
||||
+#endif
|
||||
|
||||
home = getenv("HOME");
|
||||
if (home)
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From b5c943af488c6432f4cafda86b2cf36cbb1397a4 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Mon, 19 Jan 2015 15:50:09 -0500
|
||||
Subject: Ensure config-directory exists before using it.
|
||||
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 86a5eb2..fee1d81 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -1958,6 +1958,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
|
||||
int ret;
|
||||
struct lock_file *lock = NULL;
|
||||
char *filename_buf = NULL;
|
||||
+ char *config_dir = NULL;
|
||||
char *contents = NULL;
|
||||
size_t contents_sz;
|
||||
|
||||
@@ -1971,6 +1972,12 @@ int git_config_set_multivar_in_file(const char *config_filename,
|
||||
if (!config_filename)
|
||||
config_filename = filename_buf = git_pathdup("config");
|
||||
|
||||
+ config_dir = xstrdup(config_filename);
|
||||
+ * find_last_dir_sep(config_dir) = '\0';
|
||||
+ if (access(config_dir, F_OK) != 0)
|
||||
+ mkdir(config_dir, 0755);
|
||||
+ free(config_dir);
|
||||
+
|
||||
/*
|
||||
* The lock serves a purpose in addition to locking: the new
|
||||
* contents of .git/config will be written into it.
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From 381c60e6253fdd4df55e32df25f470e0fa58efec Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 14 Feb 2016 10:32:12 +0100
|
||||
Subject: Move credential cache to the config directory.
|
||||
|
||||
Do not clutter the home dir.
|
||||
|
||||
diff --git a/credential-cache.c b/credential-cache.c
|
||||
index f4afdc6..19a150e 100644
|
||||
--- a/credential-cache.c
|
||||
+++ b/credential-cache.c
|
||||
@@ -105,7 +105,7 @@ int main(int argc, const char **argv)
|
||||
op = argv[0];
|
||||
|
||||
if (!socket_path)
|
||||
- socket_path = expand_user_path("~/.git-credential-cache/socket");
|
||||
+ socket_path = xdg_config_home("credential-cache/socket");
|
||||
if (!socket_path)
|
||||
die("unable to find a suitable socket path; use --socket");
|
||||
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -1,128 +0,0 @@
|
||||
From fc9ad1e70a926bf499369ffdb4423acb15eeb8a4 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Tue, 13 Aug 2013 08:07:25 +0200
|
||||
Subject: git-web--browse.sh: use "open" on Haiku
|
||||
|
||||
|
||||
diff --git a/git-web--browse.sh b/git-web--browse.sh
|
||||
index ae15253..1f6e306 100755
|
||||
--- a/git-web--browse.sh
|
||||
+++ b/git-web--browse.sh
|
||||
@@ -132,6 +132,10 @@ if test -z "$browser" ; then
|
||||
if test -x /usr/bin/cygstart; then
|
||||
browser_candidates="cygstart $browser_candidates"
|
||||
fi
|
||||
+ # /boot/system/haiku_loader indicates Haiku
|
||||
+ if test -f /boot/system/haiku_loader; then
|
||||
+ browser_candidates="open $browser_candidates"
|
||||
+ fi
|
||||
|
||||
for i in $browser_candidates; do
|
||||
init_browser_path $i
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From 5fcb76ee57c563a202ba82baabf45b98254ac4ea Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Mon, 19 Jan 2015 15:37:16 -0500
|
||||
Subject: On Haiku use the user settings directory instead of HOME
|
||||
|
||||
|
||||
diff --git a/path.c b/path.c
|
||||
index 17551c4..6d093db 100644
|
||||
--- a/path.c
|
||||
+++ b/path.c
|
||||
@@ -7,6 +7,11 @@
|
||||
#include "dir.h"
|
||||
#include "worktree.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
+#include <StorageDefs.h>
|
||||
+#endif
|
||||
+
|
||||
static int get_st_mode_bits(const char *path, int *mode)
|
||||
{
|
||||
struct stat st;
|
||||
@@ -1226,10 +1231,18 @@ char *xdg_config_home(const char *filename)
|
||||
{
|
||||
const char *home, *config_home;
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ char settingsPath[B_PATH_NAME_LENGTH];
|
||||
assert(filename);
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath,
|
||||
+ sizeof(settingsPath)) == B_OK)
|
||||
+ return mkpathdup("%s/git/%s", settingsPath, filename);
|
||||
+#else
|
||||
config_home = getenv("XDG_CONFIG_HOME");
|
||||
+ assert(filename);
|
||||
if (config_home && *config_home)
|
||||
return mkpathdup("%s/git/%s", config_home, filename);
|
||||
+#endif
|
||||
|
||||
home = getenv("HOME");
|
||||
if (home)
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From b5c943af488c6432f4cafda86b2cf36cbb1397a4 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Tappe <zooey@hirschkaefer.de>
|
||||
Date: Mon, 19 Jan 2015 15:50:09 -0500
|
||||
Subject: Ensure config-directory exists before using it.
|
||||
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index d7ce34b..a6bd74c 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -1996,6 +1996,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
int ret;
|
||||
struct lock_file *lock = NULL;
|
||||
char *filename_buf = NULL;
|
||||
+ char *config_dir = NULL;
|
||||
char *contents = NULL;
|
||||
size_t contents_sz;
|
||||
|
||||
@@ -2009,6 +2010,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
|
||||
if (!config_filename)
|
||||
config_filename = filename_buf = git_pathdup("config");
|
||||
|
||||
+ config_dir = xstrdup(config_filename);
|
||||
+ * find_last_dir_sep(config_dir) = '\0';
|
||||
+ if (access(config_dir, F_OK) != 0)
|
||||
+ mkdir(config_dir, 0755);
|
||||
+ free(config_dir);
|
||||
+
|
||||
/*
|
||||
* The lock serves a purpose in addition to locking: the new
|
||||
* contents of .git/config will be written into it.
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From 381c60e6253fdd4df55e32df25f470e0fa58efec Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 14 Feb 2016 10:32:12 +0100
|
||||
Subject: Move credential cache to the config directory.
|
||||
|
||||
Do not clutter the home dir.
|
||||
|
||||
diff --git a/credential-cache.c b/credential-cache.c
|
||||
index 86e21de..bde0ae2 100644
|
||||
--- a/credential-cache.c
|
||||
+++ b/credential-cache.c
|
||||
@@ -106,7 +106,7 @@ int main(int argc, const char **argv)
|
||||
op = argv[0];
|
||||
|
||||
if (!socket_path)
|
||||
- socket_path = expand_user_path("~/.git-credential-cache/socket");
|
||||
+ socket_path = xdg_config_home("credential-cache/socket");
|
||||
if (!socket_path)
|
||||
die("unable to find a suitable socket path; use --socket");
|
||||
|
||||
--
|
||||
2.7.0
|
||||
|
||||
Reference in New Issue
Block a user