Update to 3.0.3: adds more catalogs (not relevant to FreeBSD), generalized

install somewhat, minor bugfixes.

PR:		ports/41400
Submitted by:	Marc Recht <marc@informatik.uni-bremen.de>

4 files changed, 34 insertions, 29 deletions

diff --git a/textproc/sgmltools-lite/Makefile b/textproc/sgmltools-lite/Makefile
index 69905399b7b4..ab3708b55515 100644
--- a/textproc/sgmltools-lite/Makefile
+++ b/textproc/sgmltools-lite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sgmltools-lite
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sgmltools-lite
@@ -15,14 +15,14 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates various output formats from DocBook SGML documents
 
 BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python \
-		jade:${PORTSDIR}/textproc/jade \
+		openjade:${PORTSDIR}/textproc/openjade \
 		${LOCALBASE}/share/texmf:${PORTSDIR}/print/teTeX
 RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook:${PORTSDIR}/textproc/docbook \
 		${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular
 
 MAN1=		sgmltools.1
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-etcsgml=${PREFIX}/etc/sgml
+CONFIGURE_ARGS+=--with-etcsgml=${PREFIX}/etc/sgml --datadir=${LOCALBASE}/share
 
 pre-configure:
 	${RM} -f ${WRKSRC}/config.cache
@@ -31,6 +31,6 @@ pre-install:
 	${MKDIR} ${PREFIX}/etc/sgml
 
 post-install:
-	${ECHO_CMD} "3.0.0" > ${LOCALBASE}/share/sgml/misc/sgmltools/VERSION
+	${ECHO_CMD} "3.0.3" > ${LOCALBASE}/share/sgml/misc/sgmltools/VERSION
 
 .include <bsd.port.mk>
diff --git a/textproc/sgmltools-lite/distinfo b/textproc/sgmltools-lite/distinfo
index 3ea84c6f7bbb..538e7c2638ea 100644
--- a/textproc/sgmltools-lite/distinfo
+++ b/textproc/sgmltools-lite/distinfo
@@ -1 +1 @@
-MD5 (sgmltools-lite-3.0.0.tar.gz) = 3d08ceb639c1213d136876e4431129b9
+MD5 (sgmltools-lite-3.0.3.tar.gz) = dab77d3d751ca381a95ccebd88480a85
diff --git a/textproc/sgmltools-lite/files/patch-aa b/textproc/sgmltools-lite/files/patch-aa
index e111a844354a..700c030acd91 100644
--- a/textproc/sgmltools-lite/files/patch-aa
+++ b/textproc/sgmltools-lite/files/patch-aa
@@ -1,26 +1,26 @@
---- Makefile.in.old	Sat Jun 17 20:10:39 2000
-+++ Makefile.in	Sat Jun 17 20:10:55 2000
-@@ -29,7 +29,7 @@
- ETCDIR=@etcsgml@
+--- Makefile.in.orig	Tue Apr 24 20:37:22 2001
++++ Makefile.in	Wed Aug  7 12:11:58 2002
+@@ -33,7 +33,7 @@
+ etcdir=@etcsgml@
  PERL=@PERL@      
  INSTALL=@INSTALL@
 -INSTALL_PROGRAM=@INSTALL_PROGRAM@
 +INSTALL_SCRIPT=@INSTALL_SCRIPT@
  INSTALL_DATA=@INSTALL_DATA@
  MKDIRHIER=mkdir -p
- 
-@@ -38,10 +38,10 @@
- .PHONY: install
- install:
- 	-$(MKDIRHIER) $(BINDIR)
--	$(INSTALL_PROGRAM) bin/sgmltools $(BINDIR)/sgmltools
--	$(INSTALL_PROGRAM) bin/buildcat $(BINDIR)/buildcat
--	$(INSTALL_PROGRAM) bin/gensgmlenv $(BINDIR)/gensgmlenv
--	$(INSTALL_PROGRAM) bin/sgmlwhich $(BINDIR)/sgmlwhich
-+	$(INSTALL_SCRIPT) bin/sgmltools $(BINDIR)/sgmltools
-+	$(INSTALL_SCRIPT) bin/buildcat $(BINDIR)/buildcat
-+	$(INSTALL_SCRIPT) bin/gensgmlenv $(BINDIR)/gensgmlenv
-+	$(INSTALL_SCRIPT) bin/sgmlwhich $(BINDIR)/sgmlwhich
- 	-umask 022;$(MKDIRHIER) $(SHAREDIR)/stylesheets/sgmltools
+ PACKAGE=sgmltools-lite
+@@ -48,10 +48,10 @@
+ install: all
+ 	-$(MKDIRHIER) $(bindir)
+ 	-$(MKDIRHIER) $(etcdir)/catalog.d
+-	$(INSTALL_PROGRAM) bin/sgmltools $(bindir)/sgmltools
+-	$(INSTALL_PROGRAM) bin/buildcat $(bindir)/buildcat
+-	$(INSTALL_PROGRAM) bin/gensgmlenv $(bindir)/gensgmlenv
+-	$(INSTALL_PROGRAM) bin/sgmlwhich $(bindir)/sgmlwhich
++	$(INSTALL_SCRIPT) bin/sgmltools $(bindir)/sgmltools
++	$(INSTALL_SCRIPT) bin/buildcat $(bindir)/buildcat
++	$(INSTALL_SCRIPT) bin/gensgmlenv $(bindir)/gensgmlenv
++	$(INSTALL_SCRIPT) bin/sgmlwhich $(bindir)/sgmlwhich
+ 	-umask 022;$(MKDIRHIER) $(stylesheets)
  	  set -e; for i in dsssl/*.dsl dsssl/*.cat; do \
- 	    $(INSTALL_DATA) $$i $(SHAREDIR)/stylesheets/sgmltools; \
+ 	    $(INSTALL_DATA) $$i $(stylesheets); \
diff --git a/textproc/sgmltools-lite/pkg-plist b/textproc/sgmltools-lite/pkg-plist
index 2da2d6e298ac..fca0d37a1bb5 100644
--- a/textproc/sgmltools-lite/pkg-plist
+++ b/textproc/sgmltools-lite/pkg-plist
@@ -2,8 +2,11 @@ bin/sgmltools
 bin/buildcat
 bin/gensgmlenv
 bin/sgmlwhich
+etc/sgml/catalog.rh62
+etc/sgml/catalog.suse
 etc/sgml/aliases
 share/sgml/stylesheets/sgmltools/ascii-lynx.dsl
+share/sgml/stylesheets/sgmltools/ascii-w3m.dsl
 share/sgml/stylesheets/sgmltools/html.dsl
 share/sgml/stylesheets/sgmltools/ld2db.dsl
 share/sgml/stylesheets/sgmltools/print.dsl
@@ -14,10 +17,6 @@ share/sgml/dtd/sgmltools/deprec96
 share/sgml/dtd/sgmltools/isoent
 share/sgml/dtd/sgmltools/linuxdoc96.dtd
 share/sgml/dtd/sgmltools/linuxdoc97.dtd
-share/sgml/misc/sgmltools/VERSION
-share/sgml/misc/sgmltools/python/Backend.py
-share/sgml/misc/sgmltools/python/SGMLtools.py
-share/sgml/misc/sgmltools/python/utils.py
 share/sgml/misc/sgmltools/python/backends/Dvi.py
 share/sgml/misc/sgmltools/python/backends/Html.py
 share/sgml/misc/sgmltools/python/backends/JadeTeX.py
@@ -27,11 +26,17 @@ share/sgml/misc/sgmltools/python/backends/OneHtml.py
 share/sgml/misc/sgmltools/python/backends/Pdf.py
 share/sgml/misc/sgmltools/python/backends/Ps.py
 share/sgml/misc/sgmltools/python/backends/Rtf.py
+share/sgml/misc/sgmltools/python/backends/W3m.py
 share/sgml/misc/sgmltools/python/backends/iSilo.py
+share/sgml/misc/sgmltools/python/Backend.py
+share/sgml/misc/sgmltools/python/SGMLtools.py
+share/sgml/misc/sgmltools/python/utils.py
+share/sgml/misc/sgmltools/VERSION
 @dirrm share/sgml/stylesheets/sgmltools
+@dirrm share/sgml/stylesheets
 @dirrm share/sgml/dtd/sgmltools
+@dirrm share/sgml/misc/sgmltools/site-backends
 @dirrm share/sgml/misc/sgmltools/python/backends
 @dirrm share/sgml/misc/sgmltools/python
-@dirrm share/sgml/misc/sgmltools/site-backends
 @dirrm share/sgml/misc/sgmltools
 @unexec rmdir %D/etc/sgml 2>/dev/null || true