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

proj: fix minor issue in recipe for 4.8.0 and add 4.9.2.

Browse Source 
* Fix test for setting commandSuffix and commandBinDir on x86_gcc2.
* Install runtimes in bin instead of bin/x86/ for x86 2nd arch.
* Drop unneeded "chmod +x ./configure" in BUILD().

Off topic: I would like to apologize for the duplicate commit log 3
commits earlier: "Update DriveEncryption homepage to upstream repo"
for haiku-apps/drive_encryption/drive_encryption-1.0.recipe.
I'm the only person to blame for this mistake. Sorry for the noise.
This commit is contained in:
fbrosson
2016-04-15 21:32:52 +00:00
parent f07ee0f24a
commit b3e8768b0d
2 changed files with 85 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sci-libs/proj/proj-4.8.0.recipe
View File

@@ -2,9 +2,9 @@ SUMMARY="A cartographic projection software"
DESCRIPTION="Proj.4 is a library for performing conversions between \
cartographic projections."
HOMEPAGE="http://trac.osgeo.org/proj/"
COPYRIGHT="2000, Frank Warmerdam"
COPYRIGHT="2000-2012 Frank Warmerdam"
LICENSE="MIT"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/OSGeo/proj.4/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="49635259993aa3ed7d06ae39ed12fac250401e7fc2d1c459d86e28400abbeb44"
SOURCE_DIR="proj.4-$portVersion"
@@ -12,7 +12,10 @@ SOURCE_DIR="proj.4-$portVersion"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
if [ $targetArchitecture != x86_gcc2 ]; then
if [ "$targetArchitecture" != x86_gcc2 ]; then
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
else
commandSuffix=
commandBinDir=$prefix/bin
fi
@@ -20,12 +23,12 @@ fi
PROVIDES="
proj$secondaryArchSuffix = $portVersion compat >= 4
lib:libproj$secondaryArchSuffix = 0.7.0 compat >= 0.7
cmd:cs2cs$secondaryArchSuffix
cmd:geod$secondaryArchSuffix
cmd:invgeod$secondaryArchSuffix
cmd:invproj$secondaryArchSuffix
cmd:nad2bin$secondaryArchSuffix
cmd:proj$secondaryArchSuffix
cmd:cs2cs$commandSuffix
cmd:geod$commandSuffix
cmd:invgeod$commandSuffix
cmd:invproj$commandSuffix
cmd:nad2bin$commandSuffix
cmd:proj$commandSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -51,8 +54,7 @@ BUILD_PREREQUIRES="
BUILD()
{
chmod +x ./configure
runConfigure ./configure
runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
make $jobArgs
}

72
sci-libs/proj/proj-4.9.2.recipe Normal file
View File

@@ -0,0 +1,72 @@
SUMMARY="A cartographic projection software"
DESCRIPTION="Proj.4 is a library for performing conversions between \
cartographic projections."
HOMEPAGE="http://trac.osgeo.org/proj/"
COPYRIGHT="2000-2015 Frank Warmerdam"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://github.com/OSGeo/proj.4/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="9a40de36183d23a395cf51ba7a465e1e6c982b6e4553b31310c42012d188be6b"
SOURCE_DIR="proj.4-$portVersion"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
if [ "$targetArchitecture" != x86_gcc2 ]; then
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
else
commandSuffix=
commandBinDir=$prefix/bin
fi
PROVIDES="
proj$secondaryArchSuffix = $portVersion compat >= 4
lib:libproj$secondaryArchSuffix = 9.1.0 compat >= 9.1
cmd:cs2cs$commandSuffix
cmd:geod$commandSuffix
cmd:invgeod$commandSuffix
cmd:invproj$commandSuffix
cmd:nad2bin$commandSuffix
cmd:proj$commandSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
proj${secondaryArchSuffix}_devel = $portVersion compat >= 4
devel:libproj$secondaryArchSuffix = 9.1.0 compat >= 9.1
"
REQUIRES_devel="
proj$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:awk
"
BUILD()
{
runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libproj
fixPkgconfig
# devel package
packageEntries devel \
$developDir \
$manDir/man3
}