- fix paths in CATALOG;

- since I'm there, fix ownership of installed files;

- complete pkg-message and bump PORTREVISION.

PR:		ports/37518
Submitted by:	Paul Hoadley.

4 files changed, 30 insertions, 8 deletions

diff --git a/textproc/gmat/Makefile b/textproc/gmat/Makefile
index 5fa71c96029e..06878daa3d19 100644
--- a/textproc/gmat/Makefile
+++ b/textproc/gmat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gmat
 PORTVERSION=	0.2.4c
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.ora.com/pub/gmat/
 
@@ -15,7 +16,8 @@ COMMENT=	O'Reilly's SGML formatting package
 
 RUN_DEPENDS=	${LOCALBASE}/bin/nsgmls:${PORTSDIR}/textproc/sp		\
 		${LOCALBASE}/bin/procmail:${PORTSDIR}/mail/procmail	\
-		${LOCALBASE}/share/sgml/docbook/3.1/docbook.dtd:${PORTSDIR}/textproc/docbook-310 \
+		${LOCALBASE}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook \
+		${LOCALBASE}/share/sgml/iso12083/book.dtd:${PORTSDIR}/textproc/iso12083 \
 		gv:${PORTSDIR}/print/gv
 
 USE_PERL5_BUILD=yes
@@ -26,11 +28,21 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-0.2.4
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTDOCS=	README gmat.sgm
 
+DTDVER?=	4.2	# docbook-xml version
+
 post-patch:
-	@${RM} ${WRKSRC}/src/crlf/crlf.o ${WRKSRC}/src/crlf/crlf
+	@${RM} ${WRKSRC}/src/crlf/crlf.o ${WRKSRC}/src/crlf/crlf ${WRKSRC}/bin/gmat.troff.orig
 
 pre-build:
 # Change the pathnames in CATALOG & BOOKFILES
+.for RP in /usr/local/prod %%PRODROOT%%
+	${REINPLACE_CMD} -e "s|${RP}/sgml/ISO_12083-1993/dtds|${LOCALBASE}/share/sgml/iso12083|" \
+		-e "s|${RP}/sgml/Davenport/dtds|${LOCALBASE}/share/sgml/docbook|" \
+		-e "s|${RP}/sgml/DocBook-XML/iso|${LOCALBASE}/share/xml/docbook/${DTDVER}/ent/iso|" \
+		-e "s|${RP}/sgml/DocBook-XML|${LOCALBASE}/share/xml/docbook/${DTDVER}|" \
+		-e "s|${RP}/sgml/DocBook|${LOCALBASE}/share/sgml/docbook|" \
+		${WRKSRC}/test/CATALOG ${WRKSRC}/sgml/CATALOG
+.endfor
 .for FILE in BOOKFILES CATALOG
 	${REINPLACE_CMD} -e "s|/usr/local/prod|${DATADIR}|" ${WRKSRC}/test/${FILE}
 .endfor
@@ -42,6 +54,7 @@ pre-build:
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/crlf
 	(cd ${WRKSRC}; tar cf - test) | (cd ${DATADIR}; tar xvf -)
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
diff --git a/textproc/gmat/files/patch-ae b/textproc/gmat/files/patch-ae
index af0ded91b06d..e5c768fac553 100644
--- a/textproc/gmat/files/patch-ae
+++ b/textproc/gmat/files/patch-ae
@@ -1,5 +1,14 @@
---- bin/gmat.troff~	Fri Dec 27 15:20:10 2002
-+++ bin/gmat.troff	Fri Dec 27 15:20:33 2002
+--- bin/gmat.troff.orig	Tue Feb  1 21:49:18 2000
++++ bin/gmat.troff	Mon Dec 13 14:04:14 2004
+@@ -90,7 +90,7 @@
+ 
+ $PS_FONT_FILE = ($ENV{"PSFONTFILE"} 
+ 	      || &cfg($gmat, $PROGNAME, "ps-font-file")
+-	      || "/usr/local/lib/groff/font/devps/download");
++	      || "/usr/share/groff_font/devps");
+ 
+ ############################################################################
+ # Let's get to work, process each file with its options
 @@ -519,10 +519,10 @@
  # HANDLE RETURN CODE!
      } elsif ($preview) {
diff --git a/textproc/gmat/files/pkg-message.in b/textproc/gmat/files/pkg-message.in
index e9a2b10961b2..01cbb23048f3 100644
--- a/textproc/gmat/files/pkg-message.in
+++ b/textproc/gmat/files/pkg-message.in
@@ -1,7 +1,8 @@
-============================================================
+===============================================================================
 To use the programs in this package, add the path
 /usr/local/share/gmat/bin to your PATH environment variable.
 
-Then, type gmat /usr/local/share/doc/gmat/gmat.sgm
+Then, type
+gmat --job /usr/local/share/gmat/test/BOOKFILES /usr/local/share/doc/gmat/gmat.sgm
 to format the documentation.
-============================================================
+===============================================================================
diff --git a/textproc/gmat/pkg-plist b/textproc/gmat/pkg-plist
index dcc5d697bb21..d060b48439a9 100644
--- a/textproc/gmat/pkg-plist
+++ b/textproc/gmat/pkg-plist
@@ -21,7 +21,6 @@ bin/crlf
 %%DATADIR%%/bin/gmat.nop
 %%DATADIR%%/bin/gmat.sgmls
 %%DATADIR%%/bin/gmat.troff
-%%DATADIR%%/bin/gmat.troff.orig
 %%DATADIR%%/bin/gnct
 %%DATADIR%%/bin/inx
 %%DATADIR%%/bin/kern10sed