From 2ceb527b0638929a7c21a29d2cd67d12ef423ca5 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 6 Oct 2023 16:56:59 +0000
Subject: [PATCH] multimarkdown, bump version (#9588)

---
 ....4.0.recipe => multimarkdown-6.7.0.recipe} |  9 ++--
 .../patches/multimarkdown-6.4.0.patchset      | 36 -------------
 .../patches/multimarkdown-6.7.0.patchset      | 50 +++++++++++++++++++
 3 files changed, 53 insertions(+), 42 deletions(-)
 rename app-text/multimarkdown/{multimarkdown-6.4.0.recipe => multimarkdown-6.7.0.recipe} (90%)
 delete mode 100644 app-text/multimarkdown/patches/multimarkdown-6.4.0.patchset
 create mode 100644 app-text/multimarkdown/patches/multimarkdown-6.7.0.patchset

diff --git a/app-text/multimarkdown/multimarkdown-6.4.0.recipe b/app-text/multimarkdown/multimarkdown-6.7.0.recipe
similarity index 90%
rename from app-text/multimarkdown/multimarkdown-6.4.0.recipe
rename to app-text/multimarkdown/multimarkdown-6.7.0.recipe
index 4e5e6bb17..d3d85e8f8 100644
--- a/app-text/multimarkdown/multimarkdown-6.4.0.recipe
+++ b/app-text/multimarkdown/multimarkdown-6.7.0.recipe
@@ -15,7 +15,7 @@ LICENSE="BSD (3-clause)
 	Zlib"
 REVISION="3"
 SOURCE_URI="https://github.com/fletcher/MultiMarkdown-6/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="fa9daa089bc0f8bc1f69fd7365778d59210b446ce7008d03b87fb572df8ff5d3"
+CHECKSUM_SHA256="aa386f54631dbc4e0beeb6b9cf9eb769db95a3f505a69b663140a80008cf0595"
 SOURCE_FILENAME="multimarkdown-$portVersion.tar.gz"
 SOURCE_DIR="MultiMarkdown-6-$portVersion"
 PATCHES="multimarkdown-$portVersion.patchset"
@@ -61,18 +61,15 @@ TEST_REQUIRES="
 
 BUILD()
 {
+	export LDFLAGS="-lbsd"
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=$prefix
+		$cmakeDirArgs
 	make -C build $jobArgs
 }
 
 INSTALL()
 {
 	make -C build install
-
-	mkdir -p $dataDir
-	mv $prefix/share/* $dataDir
-	rmdir $prefix/share
 }
 
 TEST()
diff --git a/app-text/multimarkdown/patches/multimarkdown-6.4.0.patchset b/app-text/multimarkdown/patches/multimarkdown-6.4.0.patchset
deleted file mode 100644
index b39ee91bd..000000000
--- a/app-text/multimarkdown/patches/multimarkdown-6.4.0.patchset
+++ /dev/null
@@ -1,36 +0,0 @@
-From f9d04c1c1366fc68e1051037de62650347ab6f52 Mon Sep 17 00:00:00 2001
-From: My Name <mymail@mydomain.org>
-Date: Tue, 25 Dec 2018 12:56:48 +0000
-Subject: [PATCH] applying patch multimarkdown-6.4.0.patch
-
----
- CMakeLists.txt        | 2 +-
- tests/MarkdownTest.pl | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a738a35..83fe951 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -531,7 +531,7 @@ ADD_PUBLIC_HEADER(libMultiMarkdown Sources/libMultiMarkdown/include/version.h)
- 	)
- # 
- #	Link the library to the app?
--	target_link_libraries(multimarkdown libMultiMarkdown)
-+	target_link_libraries(multimarkdown libMultiMarkdown bsd)
- # endif()
- 
- # Xcode settings for fat binaries
-diff --git a/tests/MarkdownTest.pl b/tests/MarkdownTest.pl
-index 36b25d7..cdefc90 100755
---- a/tests/MarkdownTest.pl
-+++ b/tests/MarkdownTest.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/bin/env perl
- 
- #
- # MarkdownTester -- Run tests for Markdown implementations
--- 
-2.19.1
-
diff --git a/app-text/multimarkdown/patches/multimarkdown-6.7.0.patchset b/app-text/multimarkdown/patches/multimarkdown-6.7.0.patchset
new file mode 100644
index 000000000..125a24e45
--- /dev/null
+++ b/app-text/multimarkdown/patches/multimarkdown-6.7.0.patchset
@@ -0,0 +1,50 @@
+From a2aaa543e764c2e92dfa30353e60debfbec857ba Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Fri, 6 Oct 2023 18:35:39 +0200
+Subject: Fix installation paths
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f51d94c..512b908 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -570,14 +570,14 @@ else (hasParent)
+ 			"${PROJECT_BINARY_DIR}/LICENSE.txt"
+ 			"${PROJECT_BINARY_DIR}/README.txt"
+ 			COMPONENT Docs
+-			DESTINATION share/doc/MultiMarkdown
++			DESTINATION ${CMAKE_INSTALL_DOCDIR}/MultiMarkdown
+ 		)
+ 		set (CPACK_COMPONENT_DOCS_DISPLAY_NAME "Documentation")
+ 		set (CPACK_COMPONENT_DOCS_DESCRIPTION "Install README and LICENSE.")
+ 
+ 		# Install LaTeX support files
+ 		install (FILES ${latex}
+-			DESTINATION share/texmf/tex/latex/mmd6
++			DESTINATION ${CMAKE_INSTALL_DATADIR}/texmf/tex/latex/mmd6
+ 			COMPONENT latex
+ 			PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+ 		)
+-- 
+2.37.3
+
+
+From 3f4bb90858c11f3de75741efb2a146e8b40bbe88 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Fri, 6 Oct 2023 18:46:28 +0200
+Subject: Fix path for perl tests
+
+
+diff --git a/tests/MarkdownTest.pl b/tests/MarkdownTest.pl
+index 36b25d7..cdefc90 100755
+--- a/tests/MarkdownTest.pl
++++ b/tests/MarkdownTest.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/bin/env perl
+ 
+ #
+ # MarkdownTester -- Run tests for Markdown implementations
+-- 
+2.37.3
+