diff --git a/sci-libs/proj/proj-4.8.0.recipe b/sci-libs/proj/proj-4.8.0.recipe deleted file mode 100644 index 07a12e32d..000000000 --- a/sci-libs/proj/proj-4.8.0.recipe +++ /dev/null @@ -1,72 +0,0 @@ -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-2012 Frank Warmerdam" -LICENSE="MIT" -REVISION="2" -SOURCE_URI="https://github.com/OSGeo/proj.4/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="49635259993aa3ed7d06ae39ed12fac250401e7fc2d1c459d86e28400abbeb44" -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 = 0.7.0 compat >= 0.7 - 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 = 0.7.0 compat >= 0.7 - " -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 -} diff --git a/sci-libs/proj/proj-4.9.3.recipe b/sci-libs/proj/proj-5.0.1.recipe similarity index 52% rename from sci-libs/proj/proj-4.9.3.recipe rename to sci-libs/proj/proj-5.0.1.recipe index 4270e7eba..0a86a9e57 100644 --- a/sci-libs/proj/proj-4.9.3.recipe +++ b/sci-libs/proj/proj-5.0.1.recipe @@ -1,17 +1,19 @@ SUMMARY="A cartographic projection software" -DESCRIPTION="Proj.4 is a library for performing conversions between \ +DESCRIPTION="Proj.5 is a library for performing conversions between \ cartographic projections." -HOMEPAGE="http://trac.osgeo.org/proj/" -COPYRIGHT="2000-2015 Frank Warmerdam" +HOMEPAGE="http://proj4.org/index.html" +COPYRIGHT="2000-2018 Frank Warmerdam" LICENSE="MIT" REVISION="1" -SOURCE_URI="https://github.com/OSGeo/proj.4/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="c34254f9d54e1f1fcafd322e529a6ca2785785ff99b529dc40b2a25a8a46c871" -SOURCE_DIR="proj.4-$portVersion" +SOURCE_URI="http://download.osgeo.org/proj/proj-$portVersion.tar.gz" +CHECKSUM_SHA256="a792f78897482ed2c4e2af4e8a1a02e294c64e32b591a635c5294cb9d49fdc8c" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="13.0.1" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + if [ "$targetArchitecture" != x86_gcc2 ]; then commandSuffix=$secondaryArchSuffix commandBinDir=$binDir @@ -21,10 +23,12 @@ else fi PROVIDES=" - proj$secondaryArchSuffix = $portVersion compat >= 4 - lib:libproj$secondaryArchSuffix = 12.0.0 compat >= 12 + proj$secondaryArchSuffix = $portVersion compat >= 5 + lib:libproj$secondaryArchSuffix = $libVersionCompat + cmd:cct$commandSuffix cmd:cs2cs$commandSuffix cmd:geod$commandSuffix + cmd:gie$commandSuffix cmd:invgeod$commandSuffix cmd:invproj$commandSuffix cmd:nad2bin$commandSuffix @@ -35,8 +39,8 @@ REQUIRES=" " PROVIDES_devel=" - proj${secondaryArchSuffix}_devel = $portVersion compat >= 4 - devel:libproj$secondaryArchSuffix = 12.0.0 compat >= 12 + proj${secondaryArchSuffix}_devel = $portVersion compat >= 5 + devel:libproj$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" proj$secondaryArchSuffix == $portVersion base @@ -56,10 +60,21 @@ BUILD_PREREQUIRES=" cmd:make " +defineDebugInfoPackage proj$secondaryArchSuffix \ + "$commandBinDir"/cct \ + "$commandBinDir"/cs2cs \ + "$commandBinDir"/geod \ + "$commandBinDir"/gie \ + "$commandBinDir"/nad2bin \ + "$commandBinDir"/proj \ + "$libDir"/libproj.so.$libVersion + BUILD() { autoreconf -fi - runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir + runConfigure --omit-dirs binDir ./configure \ + --bindir="$commandBinDir" + make $jobArgs }