xsb: Overrode config.guess with MACHINE_GNU_PLATFORM, xsb uses this string in PLIST and at runtime

[Mayuresh (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mayuresh <mayuresh%acm.org@localhost>
Pushed By:	mayuresh
Date:		Thu Sep 18 15:36:10 2025 +0530
Changeset:	770f3b50562c6bab2c5348d306dce31dbf3f0088

Modified Files:
	xsb/Makefile
	xsb/PLIST
	xsb/buildlink3.mk

Log Message:
xsb: Overrode config.guess with MACHINE_GNU_PLATFORM, xsb uses this string in PLIST and at runtime

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=770f3b50562c6bab2c5348d306dce31dbf3f0088

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xsb/Makefile      | 12 ++++++++----
 xsb/PLIST         | 25 ++++++++++++-------------
 xsb/buildlink3.mk |  2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)

diffs:
diff --git a/xsb/Makefile b/xsb/Makefile
index ad4a19765b..fbc52456cc 100644
--- a/xsb/Makefile
+++ b/xsb/Makefile
@@ -31,6 +31,13 @@ REPLACE_BASH+=	${WRKDIR}/XSB/packages/xasp/makelinks.sh
 XSB_PREFIXDIR=	${DESTDIR}${PREFIX}/${XSB_VERSION_STR}
 XSB_PKGDIR=	${XSB_PREFIXDIR}/packages
 
+# XSB uses config.guess at runtime, making it harder to make predictable paths
+# We override the script to use MACHINE_GNU_PLATFORM
+pre-configure:
+	${ECHO} '#!/bin/sh' > ${WRKSRC}/config.guess
+	${ECHO} 'echo ${MACHINE_GNU_PLATFORM}' >> ${WRKSRC}/config.guess
+	${CHMOD} +x ${WRKSRC}/config.guess
+
 do-build:
 	cd ${WRKSRC} && ./makexsb fast packages
 
@@ -48,12 +55,9 @@ REMOVE_P+=		${XSB_PREFIXDIR}/config/${XSB_CONFIG_NAME}/lib/xsb_configuration.P
 REMOVE_P+=		${XSB_PREFIXDIR}/lib/prolog_db_doc/prolog_db_format.P
 REMOVE_P+=		${XSB_PREFIXDIR}/syslib/debugger_data.P
 
-# XSB uses config.guess at runtime, making it harder to make predictable paths
-# Hence we soft link the configuration with name 'local'
 do-install:
 	cd ${WRKSRC} && DESTDIR=${DESTDIR} ./makexsb install && \
-	${RM} -rf ${XSB_PKGDIR} ${REMOVE_P} && \
-	cd ${XSB_PREFIXDIR}/config && ${LN} -sf ${XSB_CONFIG_NAME} local
+	${RM} -rf ${XSB_PKGDIR} ${REMOVE_P}
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xsb/PLIST b/xsb/PLIST
index 2e8c7467d0..f4c18193ad 100644
--- a/xsb/PLIST
+++ b/xsb/PLIST
@@ -43,18 +43,17 @@ ${PKGNAME}.0/cmplib/tprog.xwam
 ${PKGNAME}.0/cmplib/useinfer.xwam
 ${PKGNAME}.0/cmplib/varproc.xwam
 ${PKGNAME}.0/cmplib/writeasm.xwam
-${PKGNAME}.0/config/local
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/banner.msg
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/bin/gpp
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/bin/libxsb.so
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/bin/xsb
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/lib/xsb_configuration.xwam
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/lib/xsb_re_match.so
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/lib/xsb_re_match.xwam
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/lib/xsb_wildmatch.so
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/lib/xsb_wildmatch.xwam
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/xsb_config.h
-${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/xsb_debug.h
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/banner.msg
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/bin/gpp
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/bin/libxsb.so
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/bin/xsb
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/lib/xsb_configuration.xwam
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/lib/xsb_re_match.so
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/lib/xsb_re_match.xwam
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/lib/xsb_wildmatch.so
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/lib/xsb_wildmatch.xwam
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/xsb_config.h
+${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/xsb_debug.h
 ${PKGNAME}.0/emu/auxlry.h
 ${PKGNAME}.0/emu/basicdefs.h
 ${PKGNAME}.0/emu/basictypes.h
@@ -668,4 +667,4 @@ ${PKGNAME}.0/syslib/xsb_hook.xwam
 ${PKGNAME}.0/syslib/xsb_read.xwam
 ${PKGNAME}.0/syslib/xsb_writ.xwam
 ${PKGNAME}.0/syslib/xsbbrat.xwam
-@pkgdir ${PKGNAME}.0/config/x86_64-unknown-netbsd10.1/saved.o
+@pkgdir ${PKGNAME}.0/config/${MACHINE_GNU_PLATFORM}/saved.o
diff --git a/xsb/buildlink3.mk b/xsb/buildlink3.mk
index dfcbd3b383..8e8ba5121a 100644
--- a/xsb/buildlink3.mk
+++ b/xsb/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.xsb+=	xsb>=5.0
 BUILDLINK_PKGSRCDIR.xsb?=	../../wip/xsb
 
 XSBDIR=			${BUILDLINK_PREFIX.xsb}/xsb-5.0.0
-XSBARCHDIR=		${XSBDIR}/config/local
+XSBARCHDIR=		${XSBDIR}/config/${MACHINE_GNU_PLATFORM}
 XSBLIBDIR=		${XSBARCHDIR}/bin
 
 BUILDLINK_INCDIRS.xsb+=		${XSBARCHDIR} ${XSBDIR}/emu