From: Kirill A. Korinsky <kirill@korins.ky>
Subject: lang/apl: fix build with gsl and/or libreoffice
To: OpenBSD ports <ports@openbsd.org>
Cc: Brian Callahan <bcallah@openbsd.org>
Date: Wed, 01 Oct 2025 18:48:20 +0200

ports@, Brian,

here a diff which fix building lang/apl when gls or/and libreoffice is
installed. No change in PLIST.

Ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/apl/Makefile,v
diff -u -p -r1.14 Makefile
--- Makefile	5 Sep 2025 17:55:11 -0000	1.14
+++ Makefile	1 Oct 2025 16:47:10 -0000
@@ -1,5 +1,6 @@
 COMMENT =	interpreter for the programming language APL
 DISTNAME =	apl-1.9pl20250903
+REVISION =	0
 CATEGORIES =	lang
 
 SHARED_LIBS +=	_sql                      0.0 # 0.0
@@ -37,7 +38,9 @@ LIB_DEPENDS =	devel/pcre2 \
 
 RUN_DEPENDS =	fonts/apl-fonts
 
-CONFIGURE_STYLE =	gnu
+AUTOCONF_VERSION =	2.71
+AUTOMAKE_VERSION =	1.16
+CONFIGURE_STYLE =	autoreconf
 CONFIGURE_ARGS +=	--without-sqlite3 \
 			--without-postgresql
 CONFIGURE_ENV +=	CXX_WERROR=no \
Index: patches/patch-HOWTOs_Makefile_am
===================================================================
RCS file: patches/patch-HOWTOs_Makefile_am
diff -N patches/patch-HOWTOs_Makefile_am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-HOWTOs_Makefile_am	1 Oct 2025 16:47:10 -0000
@@ -0,0 +1,23 @@
+Disable use asciidoc and libreoffice, we don't install HOWTO anyway
+
+Index: HOWTOs/Makefile.am
+--- HOWTOs/Makefile.am.orig
++++ HOWTOs/Makefile.am
+@@ -63,7 +63,7 @@ all: LApack-primer.pdf
+ # The .html has a stupid <noscript> tag that needs to be removed
+ # in order to properly display the Table of Contents.
+ .asciidoc.html:
+-	@if [ -z `which asciidoc` ] ; then touch $@ ;        \
++	@if [ -z `which _asciidoc` ] ; then touch $@ ;        \
+ 	else asciidoc -a icons -o $@ $< ;                    \
+         sed -i 's|Cpp|C++|g'                        $@ ; \
+         sed -i 's|<pre><code>|<pre>\n\n<code>|'     $@ ; \
+@@ -75,7 +75,7 @@ all: LApack-primer.pdf
+ # use LibreOffic Writer (if installed) to convert .html to .pdf
+ #
+ .html.pdf:
+-	@if [ -z `which lowriter` ] ; then touch $@  ; \
++	@if [ -z `which _lowriter` ] ; then touch $@  ; \
+ 	else lowriter --headless --convert-to pdf $< ; \
+ 	fi
+ 
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac	1 Oct 2025 16:47:10 -0000
@@ -0,0 +1,15 @@
+error: unknown type name 'lognormal_distribution'; did you mean 'bernoulli_distribution'?
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -293,9 +293,6 @@ apl_YES($apl_POSTGRES) && apl_POSTGRES=yes
+ m4_include([m4/check_PCRE.m4])
+    apl_NYES($apl_PCRE) && AS_ECHO(["   └──── will affect: ⎕RE"])
+ 
+-m4_include([m4/check_GSL.m4])
+-   apl_NYES($apl_GSL) && AS_ECHO(["   └──── will affect: ⎕MX"])
+-
+ m4_include([m4/check_GTK.m4])
+    apl_NYES($apl_GTK3) && AS_ECHO(["   └──── may affect: ⎕PLOT, will affect ⎕PNG"])
+ 


-- 
wbr, Kirill