Add support for Docbook 4.2.

Submitted by:	John Merryweather Cooper <john_m_cooper@yahoo.com>

3 files changed, 26 insertions, 21 deletions

diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 44cdb8b2cff..fa9d3ffead6 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.11
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -31,7 +31,7 @@ RUN_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
 # put in the right place.
 PREFIX?=	${X11BASE}
 
-DOCBOOK_VERSION=	4.1.2
+DOCBOOK_VERSION=	4.2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/textproc/scrollkeeper/files/patch-configure b/textproc/scrollkeeper/files/patch-configure
index a03750418e7..7def51b7441 100644
--- a/textproc/scrollkeeper/files/patch-configure
+++ b/textproc/scrollkeeper/files/patch-configure
@@ -1,5 +1,5 @@
 --- configure.orig	Wed Jul 24 22:26:07 2002
-+++ configure	Sun Jul 28 13:37:50 2002
++++ configure	Wed Oct  9 15:45:48 2002
 @@ -5299,6 +5299,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,18 +8,23 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -6279,12 +6280,12 @@
+@@ -6277,14 +6278,14 @@
+ 	
+         ;;
     *)
- 	echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6
- echo "configure:6282: checking for docbook-dtd412-xml" >&5
+-	echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6
+-echo "configure:6282: checking for docbook-dtd412-xml" >&5
 -	if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then
++	echo $ac_n "checking for docbook-dtd42-xml""... $ac_c" 1>&6
++echo "configure:6282: checking for docbook-dtd42-xml" >&5
 +	if test ! -f $LOCALBASE/share/xml/docbook/catalog ; then
  		echo "* ERROR * "
  		echo " "
- 		echo "Couldn't find the DocBook XML V4.1.2 DTD.  Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information."
+-		echo "Couldn't find the DocBook XML V4.1.2 DTD.  Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information."
++		echo "Couldn't find the DocBook XML V4.2 DTD.  Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information."
  		echo " "
 -		{ echo "configure: error: DocBook XML V4.1.2 DTD not present in /etc/xml/catalog. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." 1>&2; exit 1; }
-+		{ echo "configure: error: DocBook XML V4.1.2 DTD not present in $LOCALBASE/share/xml. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." 1>&2; exit 1; }
++		{ echo "configure: error: DocBook XML V4.2 DTD not present in $LOCALBASE/share/xml. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." 1>&2; exit 1; }
  	fi
  	echo "$ac_t""found" 1>&6
  	;;
diff --git a/textproc/scrollkeeper/pkg-install b/textproc/scrollkeeper/pkg-install
index fdd3a920883..add95fa381c 100644
--- a/textproc/scrollkeeper/pkg-install
+++ b/textproc/scrollkeeper/pkg-install
@@ -55,7 +55,7 @@ fi
 
 dtd421=""
 for dtd in $found; do
-    check=`grep '//OASIS//DTD DocBook XML V4.1.2//EN' $dtd`
+    check=`grep '//OASIS//DTD DocBook XML V4.2//EN' $dtd`
     if [ "$check" != "" ] ; then
         dtd421=$dtd
         break
@@ -63,42 +63,42 @@ for dtd in $found; do
 done
 
 if [ "$dtd421" = "" ] ; then
-    echo could not locate version 4.1.2 of DocBook XML
+    echo could not locate version 4.2 of DocBook XML
     exit 1
 fi
 
 docbookdir=`dirname $dtd421`
-echo Found DocBook XML 4.1.2 DTD in $docbookdir
+echo Found DocBook XML 4.2 DTD in $docbookdir
 
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
+    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \
     "file://$docbookdir/dbpoolx.mod" $CATALOG
 xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.1.2//EN" \
+    "-//OASIS//DTD DocBook XML V4.2//EN" \
     "file://$docbookdir/docbookx.dtd" $CATALOG
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
+    "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \
     "file://$docbookdir/dbcentx.mod" $CATALOG
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
+    "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \
     "file://$docbookdir/dbnotnx.mod" $CATALOG
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
+    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \
     "file://$docbookdir/dbgenent.mod" $CATALOG
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
+    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \
     "file://$docbookdir/dbhierx.mod" $CATALOG
 xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "file://$docbookdir/soextblx.dtd" $CATALOG
 xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
+    "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \
     "file://$docbookdir/calstblx.dtd" $CATALOG
 xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
+    "http://www.oasis-open.org/docbook/xml/4.2" \
     "file://$docbookdir" $CATALOG
 xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
+    "http://www.oasis-open.org/docbook/xml/4.2" \
     "file://$docbookdir" $CATALOG
 
 xmlcatalog --noout --add "delegatePublic" \
@@ -230,7 +230,7 @@ if [ "$xsldir" = "" ] ; then
 fi
 echo Found DocBook XSLT stylesheets in $xsldir
 for version in current 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 \
-               1.48 1.49 1.50
+               1.48 1.49 1.50 1.51 1.52 1.53 1.54 1.55
 do
     xmlcatalog --noout --add "rewriteSystem" \
 	"http://docbook.sourceforge.net/release/xsl/$version" \