diff --git a/dev-lang/lua/lua-5.3.2.recipe b/dev-lang/lua/lua-5.3.4.recipe similarity index 67% rename from dev-lang/lua/lua-5.3.2.recipe rename to dev-lang/lua/lua-5.3.4.recipe index 2ab8b11df..27dab4b85 100644 --- a/dev-lang/lua/lua-5.3.2.recipe +++ b/dev-lang/lua/lua-5.3.4.recipe @@ -1,19 +1,25 @@ SUMMARY="A powerful, fast, light-weight, embeddable scripting language" -DESCRIPTION=" -Lua combines simple procedural syntax with powerful data description \ -constructs based on associative arrays and extensible semantics. Lua is \ -dynamically typed, runs by interpreting bytecode for a register-based virtual \ -machine, and has automatic memory management with incremental garbage \ -collection, making it ideal for configuration, scripting, and rapid prototyping. -" -HOMEPAGE="http://www.lua.org" -SOURCE_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz" -CHECKSUM_SHA256="c740c7bb23a936944e1cc63b7c3c5351a8976d7867c5252c8854f7b2af9da68f" +DESCRIPTION="Lua combines simple procedural syntax with powerful data \ +description constructs based on associative arrays and extensible semantics. \ +Lua is dynamically typed, runs by interpreting bytecode for a register-based \ +virtual machine, and has automatic memory management with incremental garbage \ +collection, making it ideal for configuration, scripting, and rapid prototyping." +HOMEPAGE="https://www.lua.org/" +COPYRIGHT="1994-2016 Roberto Ierusalimschy, Waldemar Celes, Luiz Henrique de \ +Figueiredo" LICENSE="MIT" -COPYRIGHT="1994-2015, Lua.org, PUC-Rio" REVISION="1" -ARCHITECTURES="x86 x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="x86" +SOURCE_URI="https://www.lua.org/ftp/lua-$portVersion.tar.gz" +CHECKSUM_SHA256="f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c" +PATCHES="lua-$portVersion.patchset" +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES+=" + lua-$portVersion.gcc2.patchset + " +fi + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" lua$secondaryArchSuffix = $portVersion compat >= 5.3 @@ -26,31 +32,26 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:make - cmd:gcc$secondaryArchSuffix - " PROVIDES_devel=" lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.3 devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.3 " REQUIRES_devel=" - lua$secondaryArchSuffix == $portVersion + lua$secondaryArchSuffix == $portVersion base " -PATCHES="lua-$portVersion.patchset" -if [ $effectiveTargetArchitecture = x86_gcc2 ]; then - PATCHES+=" - lua-$portVersion.gcc2.patchset +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix " -fi - BUILD() { - make haiku MYCFLAGS="-DLUA_COMPAT_5_1 -DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/5.3/\"'" \ + make haiku MYCFLAGS="-DLUA_USE_POSIX -DLUA_COMPAT_5_1 -DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/5.3/\"'" \ LUA_T="lua5.3" LUAC_T="luac5.3" LUA_SO="liblua.so.5.3" } @@ -65,10 +66,12 @@ INSTALL() ln -s luac5.3 $binDir/luac ln -s liblua.so.5.3 $libDir/liblua.so + rm -r $dataDir #empty directory + mkdir -p $developLibDir/pkgconfig cat > $developLibDir/pkgconfig/lua.pc << EOF V=5.3 -R=5.3.1 +R=5.3.4 INSTALL_BIN=$binDir INSTALL_INC=$includeDir diff --git a/dev-lang/lua/patches/lua-5.3.2.gcc2.patchset b/dev-lang/lua/patches/lua-5.3.4.gcc2.patchset similarity index 100% rename from dev-lang/lua/patches/lua-5.3.2.gcc2.patchset rename to dev-lang/lua/patches/lua-5.3.4.gcc2.patchset diff --git a/dev-lang/lua/patches/lua-5.3.2.patchset b/dev-lang/lua/patches/lua-5.3.4.patchset similarity index 100% rename from dev-lang/lua/patches/lua-5.3.2.patchset rename to dev-lang/lua/patches/lua-5.3.4.patchset