diff --git a/dev-lang/xamos/xamos-0.29.recipe b/dev-lang/xamos/xamos-0.29.recipe index 8050aef09..296c10966 100644 --- a/dev-lang/xamos/xamos-0.29.recipe +++ b/dev-lang/xamos/xamos-0.29.recipe @@ -10,46 +10,47 @@ with a serious speed boost over the Java original, particularly on low-end platforms. " HOMEPAGE="http://sourceforge.net/projects/xamos" +COPYRIGHT="2012 Mequa Innovations" +LICENSE="BSD (2-clause)" +REVISION="1" SOURCE_URI="http://sourceforge.net/projects/xamos/files/XAMOS_src.zip" CHECKSUM_SHA256="f559794ed7a443f00a21b3c0050e8ee70a9d1340ad41e46a5f87f5238bc7479e" -ARCHITECTURES="x86_gcc2" -LICENSE="BSD (2-clause)" -COPYRIGHT="2012 Mequa Innovations" -REVISION="1" - -PROVIDES=" - xamos = $portVersion -" - -BUILD_REQUIRES=" - haiku_devel - devel:libsdl - devel:sdl_image - devel:sdl_mixer - devel:sdl_ttf - devel:sdl_gfx - devel:libglu - devel:libjpeg - devel:libpng - devel:libvorbisfile - devel:libogg - devel:libfreetype - devel:libz - " - -BUILD_PREREQUIRES=" - cmd:make - cmd:gcc - " - SOURCE_DIR="XAMOS" PATCHES="xamos-$portVersion.patchset" -BUILD() { +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + xamos = $portVersion + " + +BUILD_REQUIRES=" + haiku_devel + devel:libfreetype + devel:libglu + devel:libjpeg + devel:libogg + devel:libpng + devel:libsdl + devel:libvorbisfile + devel:libz + devel:sdl_gfx + devel:sdl_image + devel:sdl_mixer + devel:sdl_ttf + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + " + +BUILD() +{ cd src make -f Makefile_aros } -INSTALL() { +INSTALL() +{ false } diff --git a/dev-libs/chmlib/chmlib-0.40.recipe b/dev-libs/chmlib/chmlib-0.40.recipe index 9f0f73857..26df087aa 100644 --- a/dev-libs/chmlib/chmlib-0.40.recipe +++ b/dev-libs/chmlib/chmlib-0.40.recipe @@ -13,9 +13,10 @@ COPYRIGHT=" 2003 Jed Wing " LICENSE="GNU LGPL v2.1" +REVISION="4" SOURCE_URI="http://www.jedrea.com/chmlib/chmlib-0.40.tar.gz" CHECKSUM_SHA256="512148ed1ca86dea051ebcf62e6debbb00edfdd9720cde28f6ed98071d3a9617" -REVISION="4" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -26,6 +27,15 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + chmlib${secondaryArchSuffix}_devel = $portVersion + devel:libchm${secondaryArchSuffix} = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + chmlib${secondaryArchSuffix} == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -60,13 +70,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - chmlib${secondaryArchSuffix}_devel = $portVersion - devel:libchm${secondaryArchSuffix} = 0.0.0 compat >= 0 - " -REQUIRES_devel=" - chmlib${secondaryArchSuffix} == $portVersion base - " diff --git a/dev-libs/cloog/cloog-0.18.5.recipe b/dev-libs/cloog/cloog-0.18.5.recipe index 50e834f38..6858b1394 100644 --- a/dev-libs/cloog/cloog-0.18.5.recipe +++ b/dev-libs/cloog/cloog-0.18.5.recipe @@ -11,14 +11,14 @@ COPYRIGHT=" 2008 University Paris-Sud 11 and INRIA " LICENSE="GNU LGPL v2.1" +REVISION="1" SOURCE_URI="https://github.com/periscop/cloog/releases/download/cloog-$portVersion/cloog-$portVersion.tar.gz" CHECKSUM_SHA256="48602a72aaec8e1dabc33ec0622739d3ad585b7f0ec480eebdc1d724822b7cfd" -REVISION="1" +PATCHES="cloog-$portVersion.patchset" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -PATCHES="cloog-$portVersion.patchset" - PROVIDES=" cloog$secondaryArchSuffix = $portVersion compat >= 0.18 cmd:cloog$secondaryArchSuffix @@ -29,6 +29,15 @@ REQUIRES=" lib:libgmp$secondaryArchSuffix lib:libisl$secondaryArchSuffix " + +PROVIDES_devel=" + cloog${secondaryArchSuffix}_devel = $portVersion compat >= 0.18 + devel:libcloog_isl$secondaryArchSuffix = 4.0.0 compat >= 4 + " +REQUIRES_devel=" + cloog$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libgmp$secondaryArchSuffix @@ -71,13 +80,3 @@ TEST() { make check } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - cloog${secondaryArchSuffix}_devel = $portVersion compat >= 0.18 - devel:libcloog_isl$secondaryArchSuffix = 4.0.0 compat >= 4 - " -REQUIRES_devel=" - cloog$secondaryArchSuffix == $portVersion base - " diff --git a/dev-libs/fribidi/fribidi-0.19.7.recipe b/dev-libs/fribidi/fribidi-0.19.7.recipe index a39e5735f..967cc0128 100644 --- a/dev-libs/fribidi/fribidi-0.19.7.recipe +++ b/dev-libs/fribidi/fribidi-0.19.7.recipe @@ -8,14 +8,13 @@ been implemented. It is our hope that this library will stimulate more free \ software in the Middle Eastern countries. " HOMEPAGE="https://github.com/fribidi/fribidi" -SOURCE_URI="https://github.com/fribidi/fribidi/releases/download/$portVersion/fribidi-$portVersion.tar.bz2" -CHECKSUM_SHA256="08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e" -REVISION="4" - -LICENSE="GNU LGPL v2.1" COPYRIGHT="2004 Sharif FarsiWeb, Inc 2001,2002 Behdad Esfahbod 1999,2000 Dov Grobgeld" +LICENSE="GNU LGPL v2.1" +REVISION="4" +SOURCE_URI="https://github.com/fribidi/fribidi/releases/download/$portVersion/fribidi-$portVersion.tar.bz2" +CHECKSUM_SHA256="08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -25,15 +24,21 @@ PROVIDES=" cmd:fribidi$secondaryArchSuffix = $portVersion compat >= 0.19 lib:libfribidi$secondaryArchSuffix = 0.3.6 compat >= 0 " - REQUIRES=" haiku$secondaryArchSuffix " +PROVIDES_devel=" + fribidi${secondaryArchSuffix}_devel = $portVersion + devel:libfribidi$secondaryArchSuffix = 0.3.6 compat >= 0 + " +REQUIRES_devel=" + fribidi$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf @@ -83,14 +88,3 @@ TEST() { make test } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - fribidi${secondaryArchSuffix}_devel = $portVersion - devel:libfribidi$secondaryArchSuffix = 0.3.6 compat >= 0 - " - -REQUIRES_devel=" - fribidi$secondaryArchSuffix == $portVersion base - " diff --git a/dev-libs/hyphen/hyphen-2.8.8.recipe b/dev-libs/hyphen/hyphen-2.8.8.recipe index 2c70f951b..159685904 100644 --- a/dev-libs/hyphen/hyphen-2.8.8.recipe +++ b/dev-libs/hyphen/hyphen-2.8.8.recipe @@ -10,20 +10,30 @@ COPYRIGHT=" LICENSE="GNU GPL v2 GNU LGPL v2.1 MPL v1.1" +REVISION="3" SOURCE_URI="http://sourceforge.net/projects/hunspell/files/Hyphen/2.8/hyphen-$portVersion.tar.gz" CHECKSUM_SHA256="304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705" -REVISION="3" + ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 x86" PROVIDES=" hyphen$secondaryArchSuffix = $portVersion compat >= 2.8 - lib:libhyphen$secondaryArchSuffix = 0.3.0 compat >= 0 cmd:substrings.pl$secondaryArchSuffix + lib:libhyphen$secondaryArchSuffix = 0.3.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + hyphen${secondaryArchSuffix}_devel = $portVersion compat >= 2.8 + devel:libhyphen$secondaryArchSuffix = 0.3.0 compat >= 0 + " +REQUIRES_devel=" + hyphen$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -56,13 +66,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - hyphen${secondaryArchSuffix}_devel = $portVersion compat >= 2.8 - devel:libhyphen$secondaryArchSuffix = 0.3.0 compat >= 0 - " -REQUIRES_devel=" - hyphen$secondaryArchSuffix == $portVersion base - " diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2.recipe index accb18e8f..99c5e277b 100644 --- a/haiku-apps/mrpeeps/mrpeeps-1.2.recipe +++ b/haiku-apps/mrpeeps/mrpeeps-1.2.recipe @@ -19,10 +19,10 @@ HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" COPYRIGHT="2003 Jon Yoder (DarkWyrm)" LICENSE="MIT" REVISION="3" -gitCommit="8866b4fe8f073d634dcd64ef92cf97027dd324a0" -SOURCE_URI="https://github.com/HaikuArchives/MrPeeps/archive/$gitCommit.tar.gz" +srcGitRev="8866b4fe8f073d634dcd64ef92cf97027dd324a0" +SOURCE_URI="https://github.com/HaikuArchives/MrPeeps/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="7363c74956feaf5440d8c5627318ec43dda8253fa80e6bb78d474972c996ac2c" -SOURCE_DIR="MrPeeps-$gitCommit" +SOURCE_DIR="MrPeeps-$srcGitRev" ARCHITECTURES="x86_gcc2 ?x86 x86_64" @@ -39,8 +39,8 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" makefile_engine - cmd:make cmd:g++ + cmd:make " BUILD() diff --git a/media-libs/lib3ds/lib3ds-2.0.0.recipe b/media-libs/lib3ds/lib3ds-2.0.0.recipe index 8943ed012..8c4262609 100644 --- a/media-libs/lib3ds/lib3ds-2.0.0.recipe +++ b/media-libs/lib3ds/lib3ds-2.0.0.recipe @@ -10,10 +10,10 @@ HOMEPAGE="http://lib3ds.org" COPYRIGHT="2000-2010 Jan Eric Kyprianidis" LICENSE="GNU LGPL v2" REVISION="2" -gitCommit="d477b7dc451ec88a739cc28e6d9a7564123569d0" -SOURCE_URI="https://github.com/AdrianArroyoCalle/lib3ds/archive/$gitCommit.tar.gz" +srcGitRev="d477b7dc451ec88a739cc28e6d9a7564123569d0" +SOURCE_URI="https://github.com/AdrianArroyoCalle/lib3ds/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="04e28c09b9b1905a401686f9c27ffc520104801fb1353ed89ac6ec7f50f1104e" -SOURCE_DIR="lib3ds-$gitCommit" +SOURCE_DIR="lib3ds-$srcGitRev" PATCHES="lib3ds-$portVersion.patchset" ARCHITECTURES="?x86 x86_gcc2 x86_64" @@ -39,10 +39,10 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:cmake " BUILD()