From 22605d43a2c1188a170646275a99387336e47288 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Tue, 14 Jan 2025 08:40:17 +0100
Subject: [PATCH] Import the newer scripts from DeforaOS configure

---
 doc/docbook.sh | 25 +++++++++++++++----------
 tests/fixme.sh |  6 +++---
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/doc/docbook.sh b/doc/docbook.sh
index d3ca1cd..7eab664 100755
--- a/doc/docbook.sh
+++ b/doc/docbook.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2012-2021 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2012-2024 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -28,14 +28,17 @@
 CONFIGSH="${0%/docbook.sh}/../config.sh"
 PREFIX="/usr/local"
 PROGNAME="docbook.sh"
+XSL_HTML="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"
+XSL_MAN="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
+XSL_PDF="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
 #executables
 DEBUG="_debug"
 FOP="fop"
 INSTALL="install -m 0644"
 MKDIR="mkdir -m 0755 -p"
 RM="rm -f"
-XMLLINT="xmllint --nonet --xinclude"
-XSLTPROC="xsltproc --nonet --xinclude"
+XMLLINT="xmllint --noent --nonet --xinclude --path ${PWD}"
+XSLTPROC="xsltproc --nonet --xinclude --path ${PWD}"
 
 [ -f "$CONFIGSH" ] && . "$CONFIGSH"
 
@@ -60,18 +63,20 @@ _docbook()
 	ext="${ext##.}"
 	case "$ext" in
 		html)
-			XSL="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"
+			XSL="$XSL_HTML"
 			[ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl"
 			[ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl"
 			if [ -f "${target%.*}.css.xml" ]; then
-				XSLTPROC="$XSLTPROC --param custom.css.source \"${target%.*}.css.xml\" --param generate.css.header 1"
+				XSLTPROC_PARAMS="--param custom.css.source \"${target%.*}.css.xml\" --param generate.css.header 1"
 			elif [ -f "${source%.*}.css.xml" ]; then
-				XSLTPROC="$XSLTPROC --param custom.css.source \"${source%.*}.css.xml\" --param generate.css.header 1"
+				XSLTPROC_PARAMS="--param custom.css.source \"${source%.*}.css.xml\" --param generate.css.header 1"
+			else
+				XSLTPROC_PARAMS=
 			fi
-			$DEBUG $XSLTPROC -o "$target" "$XSL" "$source"
+			$DEBUG $XSLTPROC $XSLTPROC_PARAMS -o "$target" "$XSL" "$source"
 			;;
 		pdf)
-			XSL="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
+			XSL="$XSL_PDF"
 			[ -f "${source%.*}.xsl" ] && XSL="${source%.*}.xsl"
 			[ -f "${target%.*}.xsl" ] && XSL="${target%.*}.xsl"
 			$DEBUG $XSLTPROC -o "${target%.*}.fo" "$XSL" "$source" &&
@@ -79,7 +84,7 @@ _docbook()
 			$RM -- "${target%.*}.fo"
 			;;
 		1|2|3|4|5|6|7|8|9)
-			XSL="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
+			XSL="$XSL_MAN"
 			$DEBUG $XSLTPROC -o "$target" "$XSL" "$source"
 			;;
 		*)
@@ -170,7 +175,7 @@ while [ $# -gt 0 ]; do
 			source="${target#$OBJDIR}"
 			source="${source%.*}.xml"
 			xpath="string(/refentry/refmeta/manvolnum)"
-			section=$($XMLLINT --xpath "$xpath" "$source")
+			section=$($DEBUG $XMLLINT --xpath "$xpath" "$source")
 			if [ $? -eq 0 -a -n "$section" ]; then
 				instdir="$MANDIR/html$section"
 			fi
diff --git a/tests/fixme.sh b/tests/fixme.sh
index 0d15f7d..e5c85e3 100755
--- a/tests/fixme.sh
+++ b/tests/fixme.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2017-2021 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2017-2022 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -95,7 +95,7 @@ _fixme_callback()
 			echo "_fixme_callback_asm"
 			return 0
 			;;
-		c|cc|cpp|cxx|h|js|v)
+		c|cc|cpp|cxx|go|h|js|v)
 			echo "_fixme_callback_c"
 			return 0
 			;;
@@ -122,7 +122,7 @@ _fixme_callback()
 			echo "_fixme_callback_python"
 			return 0
 			;;
-		"<html"*|"<?xml"*)
+		"<!DOCTYPE"*|"<!doctype"*|"<HTML"*|"<html"*|"<?xml"*)
 			echo "_fixme_callback_xml"
 			return 0
 			;;