mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
git: bump version, split perl modules and web into subpackages (#10649)
Install the perl modules into the vendor_perl directory. This should avoid the perl dependency of the main git package, simplifying perl upgrades.
This commit is contained in:
@@ -12,11 +12,11 @@ COPYRIGHT="2005-2023 Git Authors (see git web site for list)"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="e64d340a8e627ae22cfb8bcc651cca0b497cf1e9fdf523735544ff4a732f12bf"
|
||||
CHECKSUM_SHA256="51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb"
|
||||
SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_2="e622d7ab1114b4f67cb9d8d4ab81f6e0fcf3d1291711569befda29172315d9f0"
|
||||
CHECKSUM_SHA256_2="0938309e86537063b9d6c39b12aa4a786e16e03d02a4d12866be2f3e0db919df"
|
||||
SOURCE_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256_3="f7095c4478028bc04afd63cd217ea5d4fa08ab819cbb66df40a1a12648edbf40"
|
||||
CHECKSUM_SHA256_3="82fdcb1bc184c34f150dd6445efcb0d75498dbec85a362e41f08c16ad8a904bb"
|
||||
PATCHES="git-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -66,6 +66,14 @@ PROVIDES_gui="
|
||||
cmd:git_gui = $portVersionCompat
|
||||
cmd:gitk = $portVersionCompat
|
||||
"
|
||||
PROVIDES_perl="
|
||||
git${secondaryArchSuffix}_perl = $portVersionCompat
|
||||
"
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
PROVIDES_perl+="
|
||||
git_perl = $portVersionCompat
|
||||
"
|
||||
fi
|
||||
PROVIDES_scalar="
|
||||
git${secondaryArchSuffix}_scalar = $portVersionCompat
|
||||
cmd:scalar = $portVersionCompat
|
||||
@@ -77,6 +85,9 @@ PROVIDES_svn="
|
||||
git${secondaryArchSuffix}_svn = $portVersionCompat
|
||||
cmd:git_svn = $portVersionCompat
|
||||
"
|
||||
PROVIDES_web="
|
||||
git${secondaryArchSuffix}_web = $portVersionCompat
|
||||
"
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
for pkg in arch cvs daemon email gui scalar source svn; do eval "REPLACES_${pkg}=git_${pkg}"; done
|
||||
fi
|
||||
@@ -85,7 +96,6 @@ REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
cmd:man
|
||||
cmd:nano
|
||||
cmd:perl >= 5
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
@@ -94,15 +104,16 @@ REQUIRES="
|
||||
lib:libnghttp2$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
vendor_perl
|
||||
"
|
||||
REQUIRES_arch="
|
||||
haiku$secondaryArchSuffix
|
||||
git$secondaryArchSuffix == $portVersion base
|
||||
git${secondaryArchSuffix}_perl == $portVersion
|
||||
"
|
||||
REQUIRES_cvs="
|
||||
haiku$secondaryArchSuffix
|
||||
git$secondaryArchSuffix == $portVersion base
|
||||
git${secondaryArchSuffix}_perl == $portVersion
|
||||
cmd:cvsps
|
||||
"
|
||||
REQUIRES_daemon="
|
||||
@@ -117,12 +128,19 @@ REQUIRES_daemon="
|
||||
REQUIRES_email="
|
||||
haiku$secondaryArchSuffix
|
||||
git$secondaryArchSuffix == $portVersion base
|
||||
git${secondaryArchSuffix}_perl == $portVersion
|
||||
"
|
||||
REQUIRES_gui="
|
||||
haiku$secondaryArchSuffix
|
||||
git$secondaryArchSuffix == $portVersion base
|
||||
cmd:wish
|
||||
"
|
||||
REQUIRES_perl="
|
||||
haiku$secondaryArchSuffix
|
||||
git$secondaryArchSuffix == $portVersion base
|
||||
cmd:perl >= 5
|
||||
vendor_perl
|
||||
"
|
||||
REQUIRES_scalar="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
@@ -133,12 +151,17 @@ REQUIRES_scalar="
|
||||
"
|
||||
|
||||
# The `subversion` package includes perl bindings that this tool needs.
|
||||
# Note: `subversion` still built with gcc2 on 32 bits (matching perl there, at least).
|
||||
REQUIRES_svn="
|
||||
haiku$secondaryArchSuffix
|
||||
git$secondaryArchSuffix == $portVersion base
|
||||
git${secondaryArchSuffix}_perl == $portVersion
|
||||
subversion
|
||||
"
|
||||
REQUIRES_web="
|
||||
haiku$secondaryArchSuffix
|
||||
git$secondaryArchSuffix == $portVersion base
|
||||
git${secondaryArchSuffix}_perl == $portVersion
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
@@ -192,6 +215,7 @@ makeGit()
|
||||
NO_R_TO_GCC_LINKER=YesPlease \
|
||||
GNU_ROFF=YesPlease \
|
||||
PERL_PATH=/bin/perl \
|
||||
perllibdir=$prefix/$(perl -V:installvendorlib | cut -d\' -f2 | cut -d/ -f5-) \
|
||||
NO_PYTHON=YesPlease \
|
||||
OBJECT_CREATION_USES_RENAMES=YesPlease \
|
||||
NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \
|
||||
@@ -292,6 +316,9 @@ INSTALL()
|
||||
$libDir/git-core/git-citool \
|
||||
$prefix/bin/gitk
|
||||
|
||||
packageEntries perl \
|
||||
$prefix/lib/perl5
|
||||
|
||||
packageEntries scalar \
|
||||
$docDir/scalar.html \
|
||||
$manDir/man1/scalar.1 \
|
||||
@@ -302,6 +329,14 @@ INSTALL()
|
||||
$docDir/git-svn.html \
|
||||
$manDir/man1/git-svn.1 \
|
||||
$libDir/git-core/git-svn
|
||||
|
||||
packageEntries web \
|
||||
$docDir/git*web*.html \
|
||||
$manDir/man1/git*web*.1 \
|
||||
$manDir/man5/gitweb.conf.5 \
|
||||
$dataDir/gitweb \
|
||||
$libDir/git-core/git-instaweb \
|
||||
$libDir/git-core/git-web--browse
|
||||
}
|
||||
|
||||
TEST()
|
||||
Reference in New Issue
Block a user