lua*, rename recipes, fix conflict for cmd's in lua5.3 and lua5.4 (#6946

)
haikuports · Jun 20, 2022 · fd1e091 · fd1e091
1 parent 5f3ddad
commit fd1e091
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 30 deletions.
diff --git a/dev-lang/lua/lua-5.3.6.recipe b/dev-lang/lua/lua-5.3.6.recipe
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.lua.org/"
 COPYRIGHT="1994-2016 Roberto Ierusalimschy, Waldemar Celes, Luiz Henrique de \
 Figueiredo"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.lua.org/ftp/lua-$portVersion.tar.gz"
 CHECKSUM_SHA256="fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60"
 PATCHES="lua-$portVersion.patchset"
@@ -66,7 +66,11 @@ INSTALL()
 	ln -s luac5.3 $binDir/luac
 	ln -s liblua.so.5.3 $libDir/liblua.so
 
+	mkdir -p $docDir
+	cp doc/{*.html,logo.gif,lua.css,manual.css,osi-certified-72x60.png} $docDir
+
 	rm -r $dataDir #empty directory
+	rm -r $prefix/lib/lua #empty directory
 
 	mkdir -p $developLibDir/pkgconfig
 	cat > $developLibDir/pkgconfig/lua.pc << EOF

diff --git a/dev-lang/lua/lua51-5.1.5.recipe → dev-lang/lua/lua5.1-5.1.5.recipe b/dev-lang/lua/lua51-5.1.5.recipe → dev-lang/lua/lua5.1-5.1.5.recipe
@@ -3,12 +3,11 @@ 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."
+collection, making it ideal for configuration, scripting, and rapid prototyping."
 HOMEPAGE="http://www.lua.org"
 COPYRIGHT="1994-2009, Lua.org, PUC-Rio"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
 CHECKSUM_SHA256="2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"
 SOURCE_DIR="lua-$portVersion"
@@ -18,7 +17,7 @@ ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
-	lua51${secondaryArchSuffix} = $portVersion compat >= 5.1
+	lua5.1${secondaryArchSuffix} = $portVersion compat >= 5.1
 	cmd:lua5.1${secondaryArchSuffix} = $portVersion compat >= 5.1
 	cmd:luac5.1${secondaryArchSuffix} = $portVersion compat >= 5.1
 	lib:liblua${secondaryArchSuffix} = $portVersion compat >= 5.1
@@ -28,19 +27,22 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	lua51${secondaryArchSuffix}_devel = $portVersion compat >= 5.1
+	lua5.1${secondaryArchSuffix}_devel = $portVersion compat >= 5.1
 	devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.1
-	devel:liblua5.1$secondaryArchSuffix = $portVersion compat >= 5.1
 	"
 REQUIRES_devel="
-	lua51$secondaryArchSuffix == $portVersion
+	lua5.1$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	lua${secondaryArchSuffix}_devel
+	lua5.2${secondaryArchSuffix}_devel
+	lua5.4${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:make
 	"
@@ -59,14 +61,21 @@ INSTALL()
 	mkdir -p $libDir/pkgconfig
 	cp etc/lua.pc $libDir/pkgconfig/lua.pc
 
-	ln -s liblua.so $libDir/liblua.so.5.1
-	ln -s liblua.a $libDir/liblua5.1.a
+	mv $libDir/liblua.so $libDir/liblua.so.5.1
+	ln -s liblua.so.5.1 $libDir/liblua.so
 
 	mv $binDir/lua $binDir/lua5.1
 	mv $binDir/luac $binDir/luac5.1
+	mv $manDir/man1/lua.1 $manDir/man1/lua51.1
+	mv $manDir/man1/luac.1 $manDir/man1/luac51.1
+
+	mkdir -p $docDir
+	cp doc/{*.html,logo.gif,lua.css,manual.css} $docDir
+
+	rm -r $dataDir #empty directory
+	rm -r $prefix/lib/lua #empty directory
 
 	prepareInstalledDevelLib liblua
-	prepareInstalledDevelLib liblua5.1
 	fixPkgconfig
 
 	# The includes are in a subdirectory of includeDir, and fixPkgconfig breaks

diff --git a/dev-lang/lua/lua52-5.2.4.recipe → dev-lang/lua/lua5.2-5.2.4.recipe b/dev-lang/lua/lua52-5.2.4.recipe → dev-lang/lua/lua5.2-5.2.4.recipe
@@ -7,7 +7,7 @@ collection, making it ideal for configuration, scripting, and rapid prototyping.
 HOMEPAGE="http://www.lua.org"
 COPYRIGHT="1994-2012, Lua.org, PUC-Rio"
 LICENSE="MIT"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
 CHECKSUM_SHA256="b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b"
 SOURCE_DIR="lua-$portVersion"
@@ -17,7 +17,7 @@ ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	lua52$secondaryArchSuffix = $portVersion compat >= 5.2
+	lua5.2$secondaryArchSuffix = $portVersion compat >= 5.2
 	cmd:lua5.2$secondaryArchSuffix = $portVersion compat >= 5.2
 	cmd:luac5.2$secondaryArchSuffix = $portVersion compat >= 5.2
 	lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
@@ -27,19 +27,22 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	lua52${secondaryArchSuffix}_devel = $portVersion compat >= 5.2
+	lua5.2${secondaryArchSuffix}_devel = $portVersion compat >= 5.2
 	devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
-	devel:liblua52$secondaryArchSuffix = $portVersion compat >= 5.2
 	"
 REQUIRES_devel="
-	lua52$secondaryArchSuffix == $portVersion
+	lua5.2$secondaryArchSuffix == $portVersion base
 	"
 CONFLICTS_devel="
 	lua${secondaryArchSuffix}_devel
+	lua5.1${secondaryArchSuffix}_devel
+	lua5.4${secondaryArchSuffix}_devel
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
@@ -56,14 +59,19 @@ INSTALL()
 		INSTALL_LIB="$libDir" INSTALL_BIN="$binDir"
 
 	mv $libDir/liblua.so $libDir/liblua.so.5.2
-	mv $libDir/liblua.a $libDir/liblua52.a
 	ln -s liblua.so.5.2 $libDir/liblua.so
 
 	mv $binDir/lua $binDir/lua5.2
 	mv $binDir/luac $binDir/luac5.2
 	mv $manDir/man1/lua.1 $manDir/man1/lua52.1
 	mv $manDir/man1/luac.1 $manDir/man1/luac52.1
 
+	mkdir -p $docDir
+	cp doc/{*.html,logo.gif,lua.css,manual.css,osi-certified-72x60.png} $docDir
+
+	rm -r $dataDir #empty directory
+	rm -r $prefix/lib/lua #empty directory
+
 	mkdir -p $developLibDir/pkgconfig
 	cat > $developLibDir/pkgconfig/lua.pc << EOF
 V=5.2
@@ -90,6 +98,6 @@ EOF
 	ln -s $developLibDir/pkgconfig/lua.pc $developLibDir/pkgconfig/lua5.2.pc
 
 	prepareInstalledDevelLib liblua
-	prepareInstalledDevelLib liblua52
+
 	packageEntries devel $developDir
 }
diff --git a/dev-lang/lua/lua54-5.4.4.recipe → dev-lang/lua/lua5.4-5.4.4.recipe b/dev-lang/lua/lua54-5.4.4.recipe → dev-lang/lua/lua5.4-5.4.4.recipe
@@ -3,12 +3,11 @@ 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."
+collection, making it ideal for configuration, scripting, and rapid prototyping."
 HOMEPAGE="https://www.lua.org/"
 COPYRIGHT="1994-2020 Lua.org, PUC-Rio"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
 CHECKSUM_SHA256="164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61"
 SOURCE_DIR="lua-$portVersion"
@@ -28,10 +27,10 @@ luaInc="`echo ${libVersion} | tr -d '.'`"
 luaVer="`echo $portVersion | cut -d~ -f1`"
 
 PROVIDES="
-	lua54$secondaryArchSuffix = $portVersion compat >= 5.4
-	cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.4
+	lua5.4$secondaryArchSuffix = $portVersion compat >= 5.4
+#	cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.4
 	cmd:lua$libVersion$secondaryArchSuffix = $portVersion compat >= 5.4
-	cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.4
+#	cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.4
 	cmd:luac$libVersion$secondaryArchSuffix = $portVersion compat >= 5.4
 	lib:liblua$secondaryArchSuffix = $libVersionCompat
 	"
@@ -40,14 +39,16 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	lua54${secondaryArchSuffix}_devel = $portVersion compat >= 5.4
+	lua5.4${secondaryArchSuffix}_devel = $portVersion compat >= 5.4
 	devel:liblua$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	lua54$secondaryArchSuffix == $portVersion base
+	lua5.4$secondaryArchSuffix == $portVersion base
 	"
 CONFLICTS_devel="
 	lua${secondaryArchSuffix}_devel
+	lua5.1${secondaryArchSuffix}_devel
+	lua5.2${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="
@@ -76,10 +77,16 @@ INSTALL()
 		INSTALL_LIB="$libDir" INSTALL_BIN="$binDir" TO_BIN="lua$libVersion luac$libVersion" \
 		TO_LIB="liblua.a liblua.so.$libVersion"
 
-	ln -s lua$libVersion $binDir/lua
-	ln -s luac$libVersion $binDir/luac
+#	ln -s lua$libVersion $binDir/lua
+#	ln -s luac$libVersion $binDir/luac
 	ln -s liblua.so.$libVersion $libDir/liblua.so
 
+	mv $manDir/man1/lua.1 $manDir/man1/lua$luaInc.1
+	mv $manDir/man1/luac.1 $manDir/man1/luac$luaInc.1
+
+	mkdir -p $docDir
+	cp doc/{*.html,logo.gif,lua.css,manual.css,osi-certified-72x60.png} $docDir
+
 	rm -r $dataDir #empty directory
 	rm -r $prefix/lib/lua #empty directory