From c47776113aea56090d20c86f156226013528a31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 31 Aug 2024 17:25:06 +0200
Subject: [PATCH] m-tx: unbundle from texlive_core

---
 .../texlive_core/texlive_core-2024.2.recipe   |  3 +-
 dev-tex/m-tx/m_tx-0.63d.recipe                | 62 +++++++++++++++++++
 dev-tex/m-tx/patches/m_tx-0.63d.patchset      | 59 ++++++++++++++++++
 3 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 dev-tex/m-tx/m_tx-0.63d.recipe
 create mode 100644 dev-tex/m-tx/patches/m_tx-0.63d.patchset

diff --git a/app-text/texlive_core/texlive_core-2024.2.recipe b/app-text/texlive_core/texlive_core-2024.2.recipe
index 6d61d833a..564ab393a 100644
--- a/app-text/texlive_core/texlive_core-2024.2.recipe
+++ b/app-text/texlive_core/texlive_core-2024.2.recipe
@@ -320,7 +320,6 @@ PROVIDES="
 	cmd:pn2pdf
 	cmd:pooltype
 	cmd:ppltotf
-	cmd:prepmx
 	cmd:ps2eps
 	cmd:ps2frag
 	cmd:ps2pk
@@ -603,7 +602,6 @@ defineDebugInfoPackage texlive_core$secondaryArchSuffix \
 	$prefix/bin/pmxab \
 	$prefix/bin/pooltype \
 	$prefix/bin/ppltotf \
-	$prefix/bin/prepmx \
 	$prefix/bin/ps2pk \
 	$prefix/bin/ptekf \
 	$prefix/bin/ptex \
@@ -816,6 +814,7 @@ BUILD()
 		--disable-gsftopk \
 		--disable-lcdf-typetools \
 		--disable-musixtnt \
+		--disable-m-tx \
 		--disable-psutils \
 		--disable-upmendex \
 		--disable-autosp \
diff --git a/dev-tex/m-tx/m_tx-0.63d.recipe b/dev-tex/m-tx/m_tx-0.63d.recipe
new file mode 100644
index 000000000..20cd2bb45
--- /dev/null
+++ b/dev-tex/m-tx/m_tx-0.63d.recipe
@@ -0,0 +1,62 @@
+SUMMARY="A preprocessor for pmx"
+DESCRIPTION="M-Tx is a preprocessor for PMX that facilitates inputting lyrics. It builds the PMX \
+input file based on a language very similar to PMX. M-Tx includes most of PMX's functionality, \
+but it also permits in-line PMX commands to give access to virtually all of PMX."
+HOMEPAGE="http://icking-music-archive.org/software/htdocs/index.html"
+COPYRIGHT="2014 Dirk Laurie"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://mirrors.ctan.org/support/m-tx/mtx-$portVersion.tar.gz"
+CHECKSUM_SHA256="50e07834e5b0ba9d01322382ee85e30210ae1b4feedc5129e46b32fa3ecb57fe"
+SOURCE_DIR="mtx-$portVersion"
+PATCHES="m_tx-$portVersion.patchset"
+
+ARCHITECTURES="all"
+
+PROVIDES="
+	m_tx = $portVersion
+	cmd:prepmx
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	#cmd:fpc
+	cmd:gcc
+	cmd:make
+	"
+
+TEST_REQUIRES="
+	cmd:diff
+	"
+
+defineDebugInfoPackage m_tx \
+	$binDir/prepmx
+
+BUILD()
+{
+	#make -f Makefile.orig $jobArgs SYSTEM=Haiku
+
+	runConfigure configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	#mkdir -p $binDir
+	#cp prepmx $binDir
+
+	make install
+}
+
+TEST()
+{
+	#./mtx.test
+
+	make check
+}
diff --git a/dev-tex/m-tx/patches/m_tx-0.63d.patchset b/dev-tex/m-tx/patches/m_tx-0.63d.patchset
new file mode 100644
index 000000000..0c29ae288
--- /dev/null
+++ b/dev-tex/m-tx/patches/m_tx-0.63d.patchset
@@ -0,0 +1,59 @@
+From fe4d34ee7754d66a369fcdd9302db8d6859ad154 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
+Date: Sat, 31 Aug 2024 17:22:04 +0200
+Subject: activate commented-out typedefs
+
+
+diff --git a/strings.h b/strings.h
+index 06cd8fc..5806f1a 100644
+--- a/strings.h
++++ b/strings.h
+@@ -9,8 +9,8 @@
+ #endif
+ 
+ /* Uncomment if necessary:  */
+-/* typedef char Char; */
+-/* typedef unsigned char  boolean; */
++typedef char Char;
++typedef unsigned char  boolean;
+ 
+ 
+ extern void scan1(Char *s, short p, short *n);
+-- 
+2.45.2
+
+
+From db7842f14eaa9b04986a68d9c32ad1b24ea5cf41 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
+Date: Sat, 31 Aug 2024 17:54:58 +0200
+Subject: avoid duplicate typedefs with gcc2
+
+it apparently includes strings.h somewhere before
+
+diff --git a/libp2c/p2c.h b/libp2c/p2c.h
+index 7256046..44c6978 100644
+--- a/libp2c/p2c.h
++++ b/libp2c/p2c.h
+@@ -234,7 +234,9 @@ typedef char *Anyptr;
+ #endif
+ 
+ #define Register    register  /* Register variables */
++#if __GNUC__ >= 3
+ typedef  char        Char;      /* Characters (not bytes) */
++#endif
+ 
+ #ifndef Static
+ # define Static     static    /* Private global funcs and vars */
+@@ -246,7 +248,9 @@ typedef  char        Char;      /* Characters (not bytes) */
+ 
+ typedef Signed   char schar;
+ typedef unsigned char uchar;
++#if __GNUC__ >= 3
+ typedef unsigned char boolean;
++#endif
+ 
+ #ifndef NO_DECLARE_ALFA
+ typedef Char alfa[10];
+-- 
+2.45.2
+