haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

xapian: fix typos introduced in #2633

Browse Source 
These typos only affect x86 secondary arch when the primary arch
is x86_64. But since Haiku does not yet provide x86_64 hybrid and
since there are no architectures marked as tested for xapian, we
can keep REVISION unchanged.

While at it, use a variant for the test before CONFLICTS_devel.
This commit is contained in:
fbrosson
2018-06-02 20:59:01 +00:00
parent 17174514d5
commit b860895b73
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev-libs/xapian/xapian-1.2.25.recipe
View File

@@ -60,7 +60,7 @@ PROVIDES_devel="
REQUIRES_devel="
xapian$secondaryArchSuffix == $portVersion base
"
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$prefix"/bin ]; then
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" = "$binDir" ]; then
CONFLICTS_devel="
xapian_devel
"
@@ -101,7 +101,7 @@ INSTALL()
rm -f "$libDir"/libxapian.la
if [ -n "secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
mkdir -p "$binDir"
mv "$commandBinDir"/xapian-config "$binDir"
fi
@@ -119,7 +119,7 @@ INSTALL()
"$developDir" \
"$dataDir"
if [ -n "secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
rmdir "$binDir"
fi
}

6
dev-libs/xapian/xapian-1.4.5.recipe
View File

@@ -58,7 +58,7 @@ PROVIDES_devel="
REQUIRES_devel="
xapian$secondaryArchSuffix == $portVersion base
"
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$prefix"/bin ]; then
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" = "$binDir" ]; then
CONFLICTS_devel="
xapian_devel
"
@@ -103,7 +103,7 @@ INSTALL()
rm -f "$libDir"/libxapian.la
if [ -n "secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
mkdir -p "$binDir"
mv "$commandBinDir"/xapian-config "$binDir"
fi
@@ -121,7 +121,7 @@ INSTALL()
"$developDir" \
"$dataDir"
if [ -n "secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
rmdir "$binDir"
fi
}