diff --git a/sci-libs/proj/proj-5.0.1.recipe b/sci-libs/proj/proj-5.0.1.recipe deleted file mode 100644 index e5ce75567..000000000 --- a/sci-libs/proj/proj-5.0.1.recipe +++ /dev/null @@ -1,99 +0,0 @@ -SUMMARY="A cartographic projection software" -DESCRIPTION="Proj.5 is a library for performing conversions between \ -cartographic projections." -HOMEPAGE="https://proj4.org/index.html" -COPYRIGHT="2000-2018 Frank Warmerdam" -LICENSE="MIT" -REVISION="3" -SOURCE_URI="http://download.osgeo.org/proj/proj-$portVersion.tar.gz" -CHECKSUM_SHA256="a792f78897482ed2c4e2af4e8a1a02e294c64e32b591a635c5294cb9d49fdc8c" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -if [ "$targetArchitecture" != x86_gcc2 ]; then - commandSuffix=$secondaryArchSuffix - commandBinDir=$binDir -else - commandSuffix= - commandBinDir=$prefix/bin -fi - -libVersion="13.0.1" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - 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 - cmd:proj$commandSuffix - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - proj${secondaryArchSuffix}_devel = $portVersion compat >= 5 - devel:libproj$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - proj$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:awk - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - 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" - - make $jobArgs -} - -INSTALL() -{ - make install - - rm -f "$libDir"/*.la - - prepareInstalledDevelLibs libproj - fixPkgconfig - - # devel package - packageEntries devel \ - "$developDir" \ - "$manDir"/man3 -} - -TEST() -{ - make check -} diff --git a/sci-libs/proj/proj-5.2.0.recipe b/sci-libs/proj/proj-6.2.0.recipe similarity index 79% rename from sci-libs/proj/proj-5.2.0.recipe rename to sci-libs/proj/proj-6.2.0.recipe index a9522ce08..d30f40dbf 100644 --- a/sci-libs/proj/proj-5.2.0.recipe +++ b/sci-libs/proj/proj-6.2.0.recipe @@ -1,12 +1,12 @@ SUMMARY="A cartographic projection software" -DESCRIPTION="Proj.5 is a library for performing conversions between \ +DESCRIPTION="Proj.6 is a library for performing conversions between \ cartographic projections." HOMEPAGE="https://proj4.org/index.html" COPYRIGHT="2000-2018 Frank Warmerdam" LICENSE="MIT" REVISION="1" SOURCE_URI="http://download.osgeo.org/proj/proj-$portVersion.tar.gz" -CHECKSUM_SHA256="ef919499ffbc62a4aae2659a55e2b25ff09cccbbe230656ba71c6224056c7e60" +CHECKSUM_SHA256="b300c0f872f632ad7f8eb60725edbf14f0f8f52db740a3ab23e7b94f1cd22a50" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -19,11 +19,11 @@ else commandBinDir=$prefix/bin fi -libVersion="13.1.1" +libVersion="15.2.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - proj$secondaryArchSuffix = $portVersion compat >= 5 + proj$secondaryArchSuffix = $portVersion lib:libproj$secondaryArchSuffix = $libVersionCompat cmd:cct$commandSuffix = $portVersion cmd:cs2cs$commandSuffix = $portVersion @@ -31,15 +31,16 @@ PROVIDES=" cmd:gie$commandSuffix = $portVersion cmd:invgeod$commandSuffix = $portVersion cmd:invproj$commandSuffix = $portVersion - cmd:nad2bin$commandSuffix = $portVersion cmd:proj$commandSuffix = $portVersion + cmd:projinfo$commandSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix " PROVIDES_devel=" - proj${secondaryArchSuffix}_devel = $portVersion compat >= 5 + proj${secondaryArchSuffix}_devel = $portVersion devel:libproj$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" @@ -48,6 +49,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libsqlite3$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -58,6 +60,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " defineDebugInfoPackage proj$secondaryArchSuffix \ @@ -65,8 +68,8 @@ defineDebugInfoPackage proj$secondaryArchSuffix \ "$commandBinDir"/cs2cs \ "$commandBinDir"/geod \ "$commandBinDir"/gie \ - "$commandBinDir"/nad2bin \ "$commandBinDir"/proj \ + "$commandBinDir"/projinfo \ "$libDir"/libproj.so.$libVersion BUILD() @@ -82,7 +85,7 @@ INSTALL() { make install - rm -f "$libDir"/*.la + rm -f "$libDir"/*.la "$libDir"/libproj.a prepareInstalledDevelLibs libproj fixPkgconfig