maeparser, cleanup, fix install paths (#8377)

sci-chemistry/maeparser/maeparser-1.2.3.recipe

@@ -7,17 +7,21 @@ Maestro output needs to interact directly with this format."
 HOMEPAGE="https://github.com/schrodinger/maeparser"
 COPYRIGHT="2017 Schrödinger, LLC"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="maeparser-$portVersion.tar.gz"
 CHECKSUM_SHA256="ca2e2dead8a1fdd74b624ca0f0c4dde205d0b8abbbfdd62de0786f2d3f6f291c"
+PATCHES="maeparser-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	maeparser$secondaryArchSuffix = $portVersion
-	lib:libmaeparser$secondaryArchSuffix = 1.2.3 compat >= 1
+	lib:libmaeparser$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -28,7 +32,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	maeparser${secondaryArchSuffix}_devel = $portVersion
-	devel:libmaeparser$secondaryArchSuffix = 1.2.3 compat >= 1
+	devel:libmaeparser$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	maeparser$secondaryArchSuffix == $portVersion base
@@ -49,21 +53,16 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix \
-		.
-	make $jobArgs
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make -C build install
 
-	mv $prefix/lib $prefix/lib2
-	mkdir -p $(dirname $libDir) $(dirname $includeDir)
-	mv $prefix/lib2 $libDir
-	mv $prefix/include $includeDir
-
-	prepareInstalledDevelLibs libmaeparser
+	prepareInstalledDevelLib libmaeparser
 	fixPkgconfig
 
 	# devel package

sci-chemistry/maeparser/patches/maeparser-1.2.3.patchset

@@ -0,0 +1,35 @@
+From ae6d51e7b7cbbfb84321ba7c1c2640d4c73a61c5 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 14 Apr 2023 12:07:50 +0200
+Subject: Fix installation paths
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e8c9851..447ca7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,16 +65,16 @@ target_include_directories(maeparser PUBLIC
+ 
+ install(TARGETS maeparser
+     EXPORT maeparser-targets
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib
+-    RUNTIME DESTINATION bin)
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ INSTALL(EXPORT maeparser-targets
+     FILE ${PROJECT_NAME}-config.cmake
+-    DESTINATION lib/cmake)
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ 
+ file(GLOB mae_headers "*.hpp")
+-install(FILES ${mae_headers} DESTINATION include/maeparser)
++install(FILES ${mae_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/maeparser)
+ 
+ # Tests
+ if (MAEPARSER_BUILD_TESTS)
+-- 
+2.37.3
+