From 1844d9bbc73296dbdcda6bee5815183b13d37a3f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 10 Jul 2008 18:26:36 +0000
Subject: [PATCH] Switch man page generation from docbook2x to xmlto

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8619 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 tools/build/buildshorewall | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index 5dc5d754f..2a7f741e9 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -69,10 +69,6 @@ GPG="/usr/bin/gpg -ab --batch --comment 'To verify this, you can download our pu
 # SVN Repository
 #
 SVN=https://shorewall.svn.sourceforge.net/svnroot/shorewall
-#
-# Program that generates man pages from Docbook XML
-#
-DOCBOOK2MAN="docbook-to-man --encoding=UTF-8 -C /usr/share/docbook2X/xslt/catalog.xml --utf8trans-map /usr/share/docbook2X/charmaps/roff.charmap"
 ################################################################################
 #                               V A R I A B L E S
 ################################################################################
@@ -474,11 +470,19 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 	for f in *.xml; do
 	    if [ $f != shorewall-template.xml ]; then
 		progress_message "Generating Man Page from $f..."
-		$DOCBOOK2MAN $f
+		do_or_die xmlto --skip-validation man $f
+		case $f in
+		    *.conf.*|shorewall.xml)
+			;;
+		    *)
+			g=${f#shorewall-}
+			h=$(ls ${g%.xml}.[58])
+			mv $h shorewall-$h
+			;;
+		esac
 	    fi
 	done
 	rm *.xml
-	perl -p -i'' -e 's/ \[.*?html\]//g' *.5 *.8
 	cd $DIR
     fi
 
@@ -490,11 +494,19 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 	for f in *.xml; do
 	    if [ $f != shorewall-template.xml ]; then
 		progress_message "Generating Man Page from $f..."
-		$DOCBOOK2MAN $f
+		do_or_die xmlto --skip-validation man $f
+		case $f in
+		    *.conf.*|shorewall-lite.xml)
+			;;
+		    *)
+			g=${f#shorewall-lite-}
+			h=$(ls ${g%.xml}.[58])
+			mv $h shorewall-lite-$h
+			;;
+		esac
 	    fi
 	done
 	rm *.xml
-	perl -p -i'' -e 's/ \[.*?html\]//g' *.5 *.8
 	cd $DIR 
     fi