- Fix build after some recent docbook-310 changes

- Adjust better the dependencies
- Eliminate some patches and use reinplace editing
- Take maintainership

Approved by:	araujo (maintainer)

4 files changed, 13 insertions, 79 deletions

diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index 2a4d176bd2f..a80385dd100 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -7,20 +7,21 @@
 
 PORTNAME=	docbook-utils
 PORTVERSION=	0.6.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	docbook-tools/new-trials/SOURCES
 
-MAINTAINER=	araujo@FreeBSD.org
+MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	Generates various output formats from DocBook SGML documents
 
-BUILD_DEPENDS+=	nsgmls:${PORTSDIR}/textproc/jade \
-		${LOCALBASE}/share/sgml/docbook/3.1/docbook.dtd:${PORTSDIR}/textproc/docbook-310 \
-		${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular
-RUN_DEPENDS+=	${LOCALBASE}/share/texmf/tex/jadetex/dsssl.def:${PORTSDIR}/print/jadetex \
+BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \
+		${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular \
+		nsgmls:${PORTSDIR}/textproc/jade
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular \
+		${LOCALBASE}/share/texmf/tex/jadetex/dsssl.def:${PORTSDIR}/print/jadetex \
+		nsgmls:${PORTSDIR}/textproc/jade \
 		sgmlspl:${PORTSDIR}/textproc/p5-SGMLSpm \
-    		jade:${PORTSDIR}/textproc/jade \
 		lynx:${PORTSDIR}/www/lynx
 
 USE_PERL5_RUN=	yes
@@ -44,8 +45,12 @@ PORTDOCS=	*
 .endif
 
 post-patch:
-	 @${REINPLACE_CMD} -e '254 s/install-htmlDATA//' \
+	@${REINPLACE_CMD} -e 's|/etc/sgml/catalog|${PREFIX}/share/sgml/catalog|g' \
 		${WRKSRC}/doc/HTML/Makefile.in
+	@${REINPLACE_CMD} -e 's|/etc/sgml|${LOCALBASE}/share/sgml|g' \
+			-e 's|/usr/bin/|${LOCALBASE}/bin/|g' \
+			${WRKSRC}/doc/refentry/*.sgml \
+			${WRKSRC}/backends/txt
 
 pre-configure:
 	${RM} -f ${WRKSRC}/config.cache
diff --git a/textproc/docbook-utils/files/patch-backends_txt b/textproc/docbook-utils/files/patch-backends_txt
deleted file mode 100644
index ec07201c174..00000000000
--- a/textproc/docbook-utils/files/patch-backends_txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../docbook-utils-0.6.14.orig/backends/txt	Wed Feb 11 13:58:03 2004
-+++ backends/txt	Tue May  4 09:29:54 2004
-@@ -2,17 +2,17 @@
- # Send any comments to Eric Bischoff <eric@caldera.de>
- # This program is under GPL license. See LICENSE file for details.
- 
--if [ -x /usr/bin/lynx ]
-+if [ -x /usr/local/bin/lynx ]
- then
--  CONVERT=/usr/bin/lynx
-+  CONVERT=/usr/local/bin/lynx
-   ARGS="-force_html -dump -nolist -width=72"
--elif [ -x /usr/bin/links ]
-+elif [ -x /usr/local/bin/links ]
- then
--  CONVERT=/usr/bin/links
-+  CONVERT=/usr/local/bin/links
-   ARGS="-dump"
--elif [ -x /usr/bin/w3m ]
-+elif [ -x /usr/local/bin/w3m ]
- then
--  CONVERT=/usr/bin/w3m
-+  CONVERT=/usr/local/bin/w3m
-   ARGS="-dump"
- else
-   echo >&2 "No way to convert HTML to text found."
diff --git a/textproc/docbook-utils/files/patch-doc_refentry_frontend-spec.sgml b/textproc/docbook-utils/files/patch-doc_refentry_frontend-spec.sgml
deleted file mode 100644
index 4506ad515d6..00000000000
--- a/textproc/docbook-utils/files/patch-doc_refentry_frontend-spec.sgml
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../docbook-utils-0.6.14.orig/doc/refentry/frontend-spec.sgml	Thu Nov  9 22:06:23 2000
-+++ doc/refentry/frontend-spec.sgml	Mon May  3 20:14:10 2004
-@@ -51,7 +51,7 @@
-               <term>centralized-catalog</term>
-               <listitem><para>The frontend must return the DTD-specific
-               centralized catalog name.  Centralized catalogs normally
--              reside in <filename>/etc/sgml</filename> and provide the
-+              reside in <filename>/usr/local/share/sgml</filename> and provide the
-               location of all the catalog files useful for handling
-               this input type (the catalog for the DTD, the catalog
-               for the stylesheets, the catalog for the entities,
-@@ -78,7 +78,7 @@
-         </glossterm>
-         <glossdef>
-           <para>The directory where the centralized catalogs reside. It is normally
--            <filename>/etc/sgml</filename>.</para>
-+            <filename>/usr/local/share/sgml</filename>.</para>
-           <para>(This variable is valid only while determining
-             the centralized catalog to use.)</para>
-         </glossdef>
-diff -uNr ../docbook-utils-0.6.14.orig/doc/refentry/jw.sgml ./doc/refentry/jw.sgml
diff --git a/textproc/docbook-utils/files/patch-doc_refentry_jw.sgml b/textproc/docbook-utils/files/patch-doc_refentry_jw.sgml
deleted file mode 100644
index dbbc11a22d9..00000000000
--- a/textproc/docbook-utils/files/patch-doc_refentry_jw.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../docbook-utils-0.6.14.orig/doc/refentry/jw.sgml	Mon Oct 21 16:54:35 2002
-+++ doc/refentry/jw.sgml	Mon May  3 20:15:26 2004
-@@ -371,10 +371,10 @@
-               <para>if the centralized catalog exists, then
-               use it. The centralized catalog is a list of all
-               catalogs that might be necessary that usually
--              resides in <filename>/etc/sgml</filename>. Its
-+              resides in <filename>/usr/local/share/sgml</filename>. Its
-               name is provided by the frontend, for example
-               the <filename>docbook</filename> frontend returns
--              <filename>/etc/sgml/sgml-docbook.cat</filename>.</para>
-+              <filename>/usr/local/share/sgml/sgml-docbook.cat</filename>.</para>
-             </listitem>
-             <listitem>
-               <para>Otherwise, take all the files
-@@ -583,7 +583,7 @@
-     <variablelist>
- 
-       <varlistentry>
--	<term><filename>/etc/sgml/sgml-docbook.cat</filename></term>
-+	<term><filename>/usr/local/share/sgml/sgml-docbook.cat</filename></term>
- 	<listitem>
-           <para>Centralized SGML open catalog. This file name might
-           vary if another frontend than <filename>docbook</filename>