From 30f5bc51cac52a2643d21ae9f7e9048fdd62c5e1 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 30 Mar 2023 12:25:59 +0200
Subject: [PATCH] toluapp, bump version, cleanup (#8190)

---
 dev-lua/toluapp/tolua++-1.0.recipe    | 62 ---------------------------
 dev-lua/toluapp/toluapp-1.0.93.recipe | 54 +++++++++++++++++++++++
 2 files changed, 54 insertions(+), 62 deletions(-)
 delete mode 100644 dev-lua/toluapp/tolua++-1.0.recipe
 create mode 100644 dev-lua/toluapp/toluapp-1.0.93.recipe

diff --git a/dev-lua/toluapp/tolua++-1.0.recipe b/dev-lua/toluapp/tolua++-1.0.recipe
deleted file mode 100644
index d9a1d9910..000000000
--- a/dev-lua/toluapp/tolua++-1.0.recipe
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY="An extension of toLua, a tool to integrate C/Cpp code with Lua"
-DESCRIPTION="tolua++ is an extension of toLua, a tool to integrate C/C++ code with \
-Lua. tolua++ includes new features oriented to c++, such as class templates."
-HOMEPAGE="https://github.com/LuaDist/toluapp"
-COPYRIGHT="2009 Ariel Manzur"
-LICENSE="MIT"
-REVISION="1"
-srcGitRev="b34075b76835b778bb6b2ce0aa224afd9d182887"
-SOURCE_URI="https://github.com/LuaDist/toluapp/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a86eada2ec3fcc162d2986686eba36e51d095aa471b898d4c641715423310974"
-SOURCE_FILENAME="toluapp-$portVersion-$srcGitRev.tar.gz"
-SOURCE_DIR="toluapp-$srcGitRev"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	tolua++$secondaryArchSuffix = $portVersion
-	cmd:tolua++$secondaryArchSuffix = $portVersion
-	lib:libtolua++$secondaryArchSuffix = $portVersion
-	lib:libtoluapp$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:liblua$secondaryArchSuffix >= 5.1
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:liblua$secondaryArchSuffix >= 5.1
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:g++$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	cmake . -DLUA_INCLUDE_DIR="`pkg-config --variable=includedir lua`" \
-		-DCMAKE_INSTALL_PREFIX=$prefix \
-		-DCMAKE_INSTALL_BINDIR=$binDir \
-		-DCMAKE_INSTALL_INCLUDEDIR=$includeDir \
-		-DCMAKE_INSTALL_LIBDIR=$libDir \
-		-DCMAKE_INSTALL_MANDIR=$manDir \
-		-DCMAKE_BUILD_TYPE=Release
-	make
-}
-
-INSTALL()
-{
-	mkdir -p $includeDir
-	mkdir -p $binDir
-	mkdir -p $libDir
-	cp include/tolua++.h $includeDir/
-	cp toluapp $binDir/tolua++
-	cp libtoluapp.so $libDir/libtolua++.so
-	cp libtoluapp.so $libDir/libtoluapp.so
-}
diff --git a/dev-lua/toluapp/toluapp-1.0.93.recipe b/dev-lua/toluapp/toluapp-1.0.93.recipe
new file mode 100644
index 000000000..840e5b692
--- /dev/null
+++ b/dev-lua/toluapp/toluapp-1.0.93.recipe
@@ -0,0 +1,54 @@
+SUMMARY="An extension of toLua, a tool to integrate C/Cpp code with Lua"
+DESCRIPTION="tolua++ is an extension of toLua, a tool to integrate C/C++ code with \
+Lua. tolua++ includes new features oriented to c++, such as class templates."
+HOMEPAGE="https://github.com/LuaDist/toluapp"
+COPYRIGHT="2012 Ariel Manzur"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://github.com/LuaDist/toluapp/archive/refs/tags/$portVersion.tar.gz"
+CHECKSUM_SHA256="0a1ff87cb74e7531aec57e2a7cfdf282116647dea3b46223e3cc7c362b55b5bb"
+SOURCE_FILENAME="toluapp-$portVersion.tar.gz"
+
+ARCHITECTURES="all"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	toluapp$secondaryArchSuffix = $portVersion
+	cmd:toluapp$secondaryArchSuffix = $portVersion
+	lib:libtoluapp$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:liblua$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:liblua$secondaryArchSuffix >= 5.1
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:g++$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		-DLUA_INCLUDE_DIR="`pkg-config --variable=includedir lua`" \
+		-DINSTALL_BIN:PATH=$binDir \
+		-DINSTALL_DATA:PATH=$dataDir/toluapp \
+		-DINSTALL_DOC:PATH=$docDir/toluapp \
+		-DINSTALL_INC:PATH=$includeDir \
+		-DINSTALL_LIB:PATH=$libDir \
+		-DINSTALL_SHARE:PATH=$dataDir
+	make -C build $jobArgs
+}
+
+INSTALL()
+{
+		make -C build install
+}