Update textproc/hevea to 1.08

This release introduces style sheets and uses more entities, and a ot of
bugfixes
The build do no more use m5, but sed

approved by wiz@

4 files changed, 94 insertions, 73 deletions

diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 1642b5e043c..f0211608bc1 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2005/05/16 05:09:21 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/09/29 13:20:46 tonio Exp $
 
-DISTNAME=	hevea-1.07
+DISTNAME=	hevea-1.08
 CATEGORIES=	textproc
 MASTER_SITES=	http://para.inria.fr/~maranget/hevea/distri/
 
@@ -10,9 +10,6 @@ COMMENT=	LaTeX to HTML translator
 
 BUILD_DEPENDS+=	ocaml>=3.07:../../lang/ocaml
 
-USE_TOOLS+=	m4
-MAKE_ENV+=	M4=${TOOLS_M4:Q}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
diff --git a/textproc/hevea/PLIST b/textproc/hevea/PLIST
index 9882c920da4..1f84df72936 100644
--- a/textproc/hevea/PLIST
+++ b/textproc/hevea/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2005/02/04 22:23:23 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/09/29 13:20:46 tonio Exp $
+bin/esponja
 bin/hacha
 bin/hevea
-bin/esponja
 bin/imagen
 share/hevea/alltt.hva
 share/hevea/amsmath.hva
@@ -11,23 +11,27 @@ share/hevea/bookcommon.hva
 share/hevea/comment.hva
 share/hevea/compat.hva
 share/hevea/contents_motif.gif
-share/hevea/cutfoot-eng.html
-share/hevea/cutfoot-fra.html
-share/hevea/footer.tex
+share/hevea/czech.hva
+share/hevea/english.hva
+share/hevea/french-common.hva
+share/hevea/german-common.hva
 share/hevea/hevea.sty
-share/hevea/multibib.hva
-share/hevea/natbib-common.hva
-share/hevea/xxcharset.exe
+share/hevea/html/amssymb.hva
 share/hevea/html/article.hva
+share/hevea/html/austrian.hva
 share/hevea/html/book.hva
 share/hevea/html/color.hva
 share/hevea/html/colortbl.hva
+share/hevea/html/common-math.hva
 share/hevea/html/commongraphic.hva
 share/hevea/html/fancysection.hva
 share/hevea/html/fancyvrb.hva
+share/hevea/html/french.hva
+share/hevea/html/german.hva
 share/hevea/html/graphics.hva
 share/hevea/html/graphicx.hva
 share/hevea/html/hevea.hva
+share/hevea/html/mathpartir.hva
 share/hevea/html/natbib.hva
 share/hevea/html/png.hva
 share/hevea/html/report.hva
@@ -43,6 +47,7 @@ share/hevea/html/urlhref.hva
 share/hevea/html/xypic.hva
 share/hevea/hyperref.hva
 share/hevea/ifthen.hva
+share/hevea/imagen
 share/hevea/index.hva
 share/hevea/info/article.hva
 share/hevea/info/book.hva
@@ -50,6 +55,7 @@ share/hevea/info/color.hva
 share/hevea/info/colortbl.hva
 share/hevea/info/fancysection.hva
 share/hevea/info/hevea.hva
+share/hevea/info/multind.hva
 share/hevea/info/report.hva
 share/hevea/info/seminar.hva
 share/hevea/iso-symb.hva
@@ -63,18 +69,25 @@ share/hevea/makeidx.hva
 share/hevea/mathaccents.hva
 share/hevea/mathop.hva
 share/hevea/moreverb.hva
+share/hevea/multibib.hva
 share/hevea/multind.hva
+share/hevea/natbib-common.hva
 share/hevea/next_motif.gif
 share/hevea/packages.hva
 share/hevea/plain.hva
 share/hevea/previous_motif.gif
 share/hevea/program.hva
+share/hevea/ragged2e.hva
 share/hevea/spaces.hva
+share/hevea/supertabular.hva
 share/hevea/text/article.hva
+share/hevea/text/austrian.hva
 share/hevea/text/book.hva
 share/hevea/text/color.hva
 share/hevea/text/colortbl.hva
 share/hevea/text/fancysection.hva
+share/hevea/text/french.hva
+share/hevea/text/german.hva
 share/hevea/text/hevea.hva
 share/hevea/text/report.hva
 share/hevea/text/seminar.hva
@@ -82,7 +95,6 @@ share/hevea/text/symb.hva
 share/hevea/underscore.hva
 share/hevea/url.hva
 share/hevea/verbatim.hva
-share/hevea/xxdate.exe
 @dirrm share/hevea/text
 @dirrm share/hevea/info
 @dirrm share/hevea/html
diff --git a/textproc/hevea/distinfo b/textproc/hevea/distinfo
index b4d05685f4c..d7e07e71877 100644
--- a/textproc/hevea/distinfo
+++ b/textproc/hevea/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 14:48:42 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/09/29 13:20:46 tonio Exp $
 
-SHA1 (hevea-1.07.tar.gz) = 04cbd526e8458f8535c166e367e1ee5856f1815e
-RMD160 (hevea-1.07.tar.gz) = c55c72c908988ce26728a90f5ada60cc69123cd6
-Size (hevea-1.07.tar.gz) = 234342 bytes
-SHA1 (patch-aa) = fbfd42da2d372fe2fa44821811aaa0cc179b49b5
+SHA1 (hevea-1.08.tar.gz) = 96eecea8b8c44554d8c26cdc54daf005b9bb0165
+RMD160 (hevea-1.08.tar.gz) = bbe0f0e96f92ff0d6c8f37a7f05d9c2c2b86f730
+Size (hevea-1.08.tar.gz) = 256485 bytes
+SHA1 (patch-aa) = 6f064f1572e8c78d250c8fdd6f480ef898a9c755
diff --git a/textproc/hevea/patches/patch-aa b/textproc/hevea/patches/patch-aa
index 4d045d45956..2f95be93c06 100644
--- a/textproc/hevea/patches/patch-aa
+++ b/textproc/hevea/patches/patch-aa
@@ -1,28 +1,32 @@
-$NetBSD: patch-aa,v 1.6 2005/02/04 22:23:23 adrianp Exp $
+$NetBSD: patch-aa,v 1.7 2005/09/29 13:20:46 tonio Exp $
 
---- Makefile.orig	2005-01-13 20:27:38.000000000 +0000
-+++ Makefile	2005-01-13 20:39:04.000000000 +0000
-@@ -1,12 +1,12 @@
+--- Makefile.orig	2005-05-13 16:08:47.000000000 +0200
++++ Makefile
+@@ -1,16 +1,16 @@
  ################## Configuration parameters
  # Compile using ocamlopt, to use ocamlc set TARGET=byte
 -TARGET=opt
 +#TARGET=opt
+ # Install prefix
+-PREFIX=/usr/local
++#PREFIX=/usr/local
  # Library directory of hevea
--LIBDIR=/usr/local/lib/hevea
-+LIBDIR=${PREFIX}/share/hevea
+-LIBDIR=$(PREFIX)/lib/hevea
++LIBDIR=$(PREFIX)/share/hevea
  # Where to install programms
--BINDIR=/usr/local/bin
-+BINDIR=${PREFIX}/bin
- # C preprocessor with proper options (don't ask)
--CPP=cpp -E -P
-+CPP=${M4}
- #Some alternatives...
- #CPP=/lib/cpp -E -P  (Old fashioned Unix)
- #CPP=gcc -E -P -x c  (If you have gcc)
-@@ -21,8 +21,8 @@
+ BINDIR=$(PREFIX)/bin
+ # Install prefix prefix
+ DESTDIR=
+ #Where to install hevea.sty
+-LATEXLIBDIR=$(PREFIX)/lib/hevea
++LATEXLIBDIR=$(LIBDIR)
+ ############### End of configuration parameters
+ SUF=
+ DIR=
+@@ -22,8 +22,8 @@ OCAMLFLAGS=
  OCAMLCI=$(OCAMLC)
  OCAMLOPT=${DIR}ocamlopt$(SUF)
- OCAMLLEX=${DIR}ocamllex$(SUF)
+ OCAMLLEX=${DIR}ocamllex$(SUF) -q
 -INSTALL=cp
 -MKDIR=mkdir -p
 +INSTALL=${BSD_INSTALL_DATA}
@@ -30,52 +34,60 @@ $NetBSD: patch-aa,v 1.6 2005/02/04 22:23:23 adrianp Exp $
  
  ONLYESPONJA=emisc.cmo buff.cmo htmllex.cmo htmlparse.cmo htmltext.cmo pp.cmo util.cmo explode.cmo ultra.cmo esponja.cmo
  
-@@ -50,30 +50,30 @@
- 	$(MAKE) $(MFLAGS) TARGET=byte hevea.byte hacha.byte esponja.byte cutfoot-fra.html cutfoot-eng.html
+@@ -51,34 +51,34 @@ byte:
+ 	$(MAKE) $(MFLAGS) TARGET=byte hevea.byte hacha.byte esponja.byte
  
  install-lib:
--	- $(MKDIR) $(LIBDIR)
--	$(INSTALL) hevea.sty cutfoot-fra.html cutfoot-eng.html footer.tex ${LIBDIR}
--	$(INSTALL) contents_motif.gif next_motif.gif previous_motif.gif ${LIBDIR}
--	$(INSTALL) $(ALLLIB) $(LIBDIR)
--	- $(MKDIR)  $(LIBDIR)/html
--	cd html ; $(INSTALL) $(HTMLLIB) $(LIBDIR)/html
--	- $(MKDIR)  $(LIBDIR)/text
--	cd text ; $(INSTALL) $(TEXTLIB) $(LIBDIR)/text
--	- $(MKDIR) $(LIBDIR)/info
--	cd info ; $(INSTALL) $(INFOLIB) $(LIBDIR)/info
-+	$(BSD_INSTALL_DATA_DIR) $(LIBDIR)
-+	$(BSD_INSTALL_DATA) hevea.sty cutfoot-fra.html cutfoot-eng.html footer.tex ${LIBDIR}
-+	$(BSD_INSTALL_DATA) contents_motif.gif next_motif.gif previous_motif.gif ${LIBDIR}
-+	$(BSD_INSTALL_DATA) $(ALLLIB) $(LIBDIR)
-+	$(BSD_INSTALL_DATA_DIR)  $(LIBDIR)/html
-+	cd html ; $(BSD_INSTALL_DATA) $(HTMLLIB) $(LIBDIR)/html
-+	$(BSD_INSTALL_DATA_DIR)  $(LIBDIR)/text
-+	cd text ; $(BSD_INSTALL_DATA) $(TEXTLIB) $(LIBDIR)/text
-+	$(BSD_INSTALL_DATA_DIR) $(LIBDIR)/info
-+	cd info ; $(BSD_INSTALL_DATA) $(INFOLIB) $(LIBDIR)/info
+-	- $(MKDIR) $(DESTDIR)/$(LATEXLIBDIR)
+-	$(INSTALL)  hevea.sty $(DESTDIR)/$(LATEXLIBDIR)
+-	- $(MKDIR) $(DESTDIR)/$(LIBDIR)
+-	$(INSTALL) contents_motif.gif next_motif.gif previous_motif.gif $(DESTDIR)/$(LIBDIR)
+-	$(INSTALL) $(ALLLIB) $(DESTDIR)/$(LIBDIR)
+-	- $(MKDIR)  $(DESTDIR)/$(LIBDIR)/html
+-	cd html ; $(INSTALL) $(HTMLLIB) $(DESTDIR)/$(LIBDIR)/html
+-	- $(MKDIR)  $(DESTDIR)/$(LIBDIR)/text
+-	cd text ; $(INSTALL) $(TEXTLIB) $(DESTDIR)/$(LIBDIR)/text
+-	- $(MKDIR) $(DESTDIR)/$(LIBDIR)/info
+-	cd info ; $(INSTALL) $(INFOLIB) $(DESTDIR)/$(LIBDIR)/info
+-	$(INSTALL) imagen $(DESTDIR)/$(LIBDIR)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(LATEXLIBDIR)
++	$(BSD_INSTALL_DATA)  hevea.sty $(DESTDIR)/$(LATEXLIBDIR)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(LIBDIR)
++	$(BSD_INSTALL_DATA) contents_motif.gif next_motif.gif previous_motif.gif $(DESTDIR)/$(LIBDIR)
++	$(BSD_INSTALL_DATA) $(ALLLIB) $(DESTDIR)/$(LIBDIR)
++	$(BSD_INSTALL_DATA_DIR)  $(DESTDIR)/$(LIBDIR)/html
++	cd html ; $(BSD_INSTALL_DATA) $(HTMLLIB) $(DESTDIR)/$(LIBDIR)/html
++	$(BSD_INSTALL_DATA_DIR)  $(DESTDIR)/$(LIBDIR)/text
++	cd text ; $(BSD_INSTALL_DATA) $(TEXTLIB) $(DESTDIR)/$(LIBDIR)/text
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(LIBDIR)/info
++	cd info ; $(BSD_INSTALL_DATA) $(INFOLIB) $(DESTDIR)/$(LIBDIR)/info
++	$(BSD_INSTALL_DATA) imagen $(DESTDIR)/$(LIBDIR)
  
  
  
  install-opt: install-lib
--	$(INSTALL) hevea.opt $(BINDIR)/hevea
--	$(INSTALL) hacha.opt $(BINDIR)/hacha
--	$(INSTALL) esponja.opt $(BINDIR)/esponja
--	$(INSTALL) imagen $(BINDIR)
-+	$(BSD_INSTALL_PROGRAM) hevea.opt $(BINDIR)/hevea
-+	$(BSD_INSTALL_PROGRAM) hacha.opt $(BINDIR)/hacha
-+	$(BSD_INSTALL_PROGRAM) esponja.opt $(BINDIR)/esponja
-+	$(BSD_INSTALL_SCRIPT) imagen $(BINDIR)
+-	- $(MKDIR) $(DESTDIR)/$(BINDIR)
+-	$(INSTALL) hevea.opt $(DESTDIR)/$(BINDIR)/hevea
+-	$(INSTALL) hacha.opt $(DESTDIR)/$(BINDIR)/hacha
+-	$(INSTALL) esponja.opt $(DESTDIR)/$(BINDIR)/esponja
+-	$(INSTALL) imagen $(DESTDIR)/$(BINDIR)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(BINDIR)
++	$(BSD_INSTALL_PROGRAM) hevea.opt $(DESTDIR)/$(BINDIR)/hevea
++	$(BSD_INSTALL_PROGRAM) hacha.opt $(DESTDIR)/$(BINDIR)/hacha
++	$(BSD_INSTALL_PROGRAM) esponja.opt $(DESTDIR)/$(BINDIR)/esponja
++	$(BSD_INSTALL_SCRIPT) imagen $(DESTDIR)/$(BINDIR)
  
  install-byte: install-lib
--	$(INSTALL) hevea.byte $(BINDIR)/hevea
--	$(INSTALL) hacha.byte $(BINDIR)/hacha
--	$(INSTALL) esponja.byte $(BINDIR)/esponja
--	$(INSTALL) imagen $(BINDIR)
-+	$(BSD_INSTALL_SCRIPT) hevea.byte $(BINDIR)/hevea
-+	$(BSD_INSTALL_SCRIPT) hacha.byte $(BINDIR)/hacha
-+	$(BSD_INSTALL_SCRIPT) esponja.byte $(BINDIR)/esponja
-+	$(BSD_INSTALL_SCRIPT) imagen $(BINDIR)
+-	- $(MKDIR) $(DESTDIR)/$(BINDIR)
+-	$(INSTALL) hevea.byte $(DESTDIR)/$(BINDIR)/hevea
+-	$(INSTALL) hacha.byte $(DESTDIR)/$(BINDIR)/hacha
+-	$(INSTALL) esponja.byte $(DESTDIR)/$(BINDIR)/esponja
+-	$(INSTALL) imagen $(DESTDIR)/$(BINDIR)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(BINDIR)
++	$(BSD_INSTALL_SCRIPT) hevea.byte $(DESTDIR)/$(BINDIR)/hevea
++	$(BSD_INSTALL_SCRIPT) hacha.byte $(DESTDIR)/$(BINDIR)/hacha
++	$(BSD_INSTALL_SCRIPT) esponja.byte $(DESTDIR)/$(BINDIR)/esponja
++	$(BSD_INSTALL_SCRIPT) imagen $(DESTDIR)/$(BINDIR)
  
  
  hevea.byte: ${OBJS}