From 9ab2744293e57d81d88f0a650554770c1ca4f193 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 15 Jan 2014 13:11:44 -0600 Subject: [PATCH] lua: fix lua 5.1.4 recipe --- dev-lang/lua/lua-5.1.4.recipe | 37 +++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dev-lang/lua/lua-5.1.4.recipe b/dev-lang/lua/lua-5.1.4.recipe index 853e92677..d9ab7e403 100644 --- a/dev-lang/lua/lua-5.1.4.recipe +++ b/dev-lang/lua/lua-5.1.4.recipe @@ -2,24 +2,23 @@ SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language." HOMEPAGE="http://www.lua.org" SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" -REVISION="3" +REVISION="4" ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" PROVIDES=" - lua = $portVersion compat = 5.1 - cmd:lua = $portVersion compat = 5.1 - cmd:luac = $portVersion - lib:liblua = $portVersion compat = 5.2 - devel:liblua = $portVersion compat = 5.2 + lua${secondaryArchSuffix} = $portVersion compat >= 5.1 + cmd:lua${secondaryArchSuffix} = $portVersion compat >= 5.1 + cmd:luac${secondaryArchSuffix} = $portVersion compat >= 5.1 + lib:liblua${secondaryArchSuffix} = $portVersion compat >= 5.1 " - REQUIRES=" - haiku >= $haikuVersion + haiku${secondaryArchSuffix} >= $haikuVersion " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:make - cmd:gcc + cmd:gcc${secondaryArchSuffix} " PATCHES="lua-5.1.4.patchset" @@ -30,14 +29,28 @@ BUILD() INSTALL() { - make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir" \ - INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/$V" + make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \ + INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/5.1" \ + INSTALL_LIB="$libDir" INSTALL_BIN="$binDir" + mkdir -p $libDir/pkgconfig cp etc/lua.pc $libDir/pkgconfig/lua.pc prepareInstalledDevelLib liblua fixPkgconfig + + packageEntries devel $developDir } + +PROVIDES_devel=" + lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.1 + devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.1 + " + +REQUIRES_devel=" + lua$secondaryArchSuffix == $portVersion + " + LICENSE="MIT" COPYRIGHT="1994-2009, Lua.org, PUC-Rio" DESCRIPTION="