Update textproc/hevea to 1.10

version 1.10
     - corrected hacha that generated non-compliant HTML lists !
version 1.09+12
     - added cutflow* environment.
     - correct packages.hva
        Now package state is pushed/restored by RequirePackage
        [needed for proper saving of package options]
version 1.09+11
     - natbib being added nightmare. Should release soon.
version 1.09+10
     - restored extra argument to \text@accent, silly ?
     - added a bit of documentation on math accents
version 1.09+8
     - labels for indexes restricted to sectionning labels.
       (credit to Yevgeniy Makarov)
version 1.09+7
     - Some changes for active characters -, ', and `
         * -- not merged in entity if TT is on.
         * ' -> simple right quote, ` simple left quote
version 1.09+6
     - skip_blanks in save.mll -> also eat spaces after
       \n (-> \urldef more compatible ??)
     - \usepackage{hevea} -> execute \usepackage{comment} for LaTeX
        compatibility
     - Change \warning into \hva@warning
     - New \AtEndOfFile command, rediscovered Latexmacros.replace at
       the occasion!
version 1.09+5
     - Include documentation for Thai.
     - A few typos in doc.
     - A few correction in french.hva -> \@print@u + \og\fg.
     - '\r' '\n' is scanned while looking for \par
     - Add empty group after title in section (for \xspace ! -> no space)
     - Introduced \RequirePackage
version 1.09+4
     - thai support
     - add vertical magins to styles .part and .title
     - listings, added inputencoding key.
     - Corrected footnotes flushing (to follow documentation)
        and made documentation more precise.
     - listings,  *keywords* keys with correct interface
        (already here for *emph*).
version 1.09+3
     - UTF-8 support, hard to test.
     - abstract type for unicode + many less files for input encodings
     - Added input encodings koi8-r et cp1251 (Russian)
version 1.09+2
     - Correct some bugs for output to dir (imagen on absolute path).
     - And above all document that.
     - Produce doc in subdirectory doc/doc.
     - Document -toc{is,ter} options for hacha.
version 1.09+1
     - Simplified error messages for accents, too many
       problems in displaying argument.
     - hevea/hacha/imagen accept dir/file as input or output
      with sensible (?) behavior

4 files changed, 18 insertions, 122 deletions

diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 4b72b8809d7..e82792afdad 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2008/01/03 13:51:28 obache Exp $
+# $NetBSD: Makefile,v 1.18 2008/01/13 19:24:49 tonio Exp $
 
-DISTNAME=	hevea-1.09
+DISTNAME=	hevea-1.10
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/moscova/hevea/
 
diff --git a/textproc/hevea/PLIST b/textproc/hevea/PLIST
index a3fe0716345..39bad34406d 100644
--- a/textproc/hevea/PLIST
+++ b/textproc/hevea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/01/15 21:12:13 tonio Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/01/13 19:24:49 tonio Exp $
 bin/bibhva
 bin/esponja
 bin/hacha
@@ -17,6 +17,7 @@ share/hevea/contents_motif.gif
 share/hevea/czech.hva
 share/hevea/deepcut.hva
 share/hevea/english.hva
+share/hevea/epsfig.hva
 share/hevea/eurosym.hva
 share/hevea/figcut.hva
 share/hevea/french-common.hva
@@ -24,19 +25,13 @@ share/hevea/german-common.hva
 share/hevea/hevea.sty
 share/hevea/html/amsfonts.hva
 share/hevea/html/amssymb.hva
-share/hevea/html/ansinew.hva
-share/hevea/html/applemac.hva
 share/hevea/html/article.hva
-share/hevea/html/ascii.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/cp1250.hva
-share/hevea/html/cp1252.hva
-share/hevea/html/cp1257.hva
 share/hevea/html/fancysection.hva
 share/hevea/html/fancyvrb.hva
 share/hevea/html/french.hva
@@ -44,17 +39,6 @@ share/hevea/html/german.hva
 share/hevea/html/graphics.hva
 share/hevea/html/graphicx.hva
 share/hevea/html/hevea.hva
-share/hevea/html/inputenc.hva
-share/hevea/html/latin1.hva
-share/hevea/html/latin10.hva
-share/hevea/html/latin2.hva
-share/hevea/html/latin3.hva
-share/hevea/html/latin4.hva
-share/hevea/html/latin5.hva
-share/hevea/html/latin6.hva
-share/hevea/html/latin7.hva
-share/hevea/html/latin8.hva
-share/hevea/html/latin9.hva
 share/hevea/html/mathpartir.hva
 share/hevea/html/natbib.hva
 share/hevea/html/png.hva
@@ -78,6 +62,7 @@ share/hevea/info/book.hva
 share/hevea/info/hevea.hva
 share/hevea/info/report.hva
 share/hevea/info/seminar.hva
+share/hevea/inputenc.hva
 share/hevea/iso-html.hva
 share/hevea/iso-symb.hva
 share/hevea/iso-text.hva
@@ -106,9 +91,11 @@ share/hevea/mappings/ISO-8859-6.map
 share/hevea/mappings/ISO-8859-7.map
 share/hevea/mappings/ISO-8859-8.map
 share/hevea/mappings/ISO-8859-9.map
+share/hevea/mappings/KOI8-R.map
 share/hevea/mappings/US-ASCII.map
 share/hevea/mappings/macintosh.map
 share/hevea/mappings/windows-1250.map
+share/hevea/mappings/windows-1251.map
 share/hevea/mappings/windows-1252.map
 share/hevea/mappings/windows-1257.map
 share/hevea/mathop.hva
@@ -124,35 +111,20 @@ share/hevea/program.hva
 share/hevea/ragged2e.hva
 share/hevea/spaces.hva
 share/hevea/supertabular.hva
-share/hevea/text/ansinew.hva
-share/hevea/text/applemac.hva
 share/hevea/text/article.hva
-share/hevea/text/ascii.hva
 share/hevea/text/austrian.hva
 share/hevea/text/book.hva
 share/hevea/text/color.hva
 share/hevea/text/colortbl.hva
-share/hevea/text/cp1250.hva
-share/hevea/text/cp1252.hva
-share/hevea/text/cp1257.hva
 share/hevea/text/fancysection.hva
 share/hevea/text/french.hva
 share/hevea/text/german.hva
 share/hevea/text/hevea.hva
-share/hevea/text/inputenc.hva
-share/hevea/text/latin1.hva
-share/hevea/text/latin10.hva
-share/hevea/text/latin2.hva
-share/hevea/text/latin3.hva
-share/hevea/text/latin4.hva
-share/hevea/text/latin5.hva
-share/hevea/text/latin6.hva
-share/hevea/text/latin7.hva
-share/hevea/text/latin8.hva
-share/hevea/text/latin9.hva
+share/hevea/text/natbib.hva
 share/hevea/text/report.hva
 share/hevea/text/seminar.hva
 share/hevea/textcomp.hva
+share/hevea/thai.hva
 share/hevea/theorem.hva
 share/hevea/underscore.hva
 share/hevea/url.hva
diff --git a/textproc/hevea/distinfo b/textproc/hevea/distinfo
index 23e5fe6f66e..41232e4d93f 100644
--- a/textproc/hevea/distinfo
+++ b/textproc/hevea/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2007/01/15 21:12:13 tonio Exp $
+$NetBSD: distinfo,v 1.11 2008/01/13 19:24:49 tonio Exp $
 
-SHA1 (hevea-1.09/hevea-1.09.tar.gz) = 7df360c53f7f943e12c41cb27d569499be9c0215
-RMD160 (hevea-1.09/hevea-1.09.tar.gz) = a0b8e220db5d656a34ee5d3867b64a79139b47bd
-Size (hevea-1.09/hevea-1.09.tar.gz) = 294716 bytes
-SHA1 (patch-aa) = a0d85c8a1d837a4227a0b76b675bef778d55b952
+SHA1 (hevea-1.10/hevea-1.10.tar.gz) = d3b07ad59b815899d953d18b480faa856b77077b
+RMD160 (hevea-1.10/hevea-1.10.tar.gz) = 651e8799bc4e8ca0c893cf7668df4ff1bf15d9d7
+Size (hevea-1.10/hevea-1.10.tar.gz) = 305269 bytes
+SHA1 (patch-aa) = 74bfb1c1b797bf1cbee90e035d53755695c3a190
diff --git a/textproc/hevea/patches/patch-aa b/textproc/hevea/patches/patch-aa
index 14282932b0d..a3090305464 100644
--- a/textproc/hevea/patches/patch-aa
+++ b/textproc/hevea/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.8 2007/01/15 21:12:13 tonio Exp $
+$NetBSD: patch-aa,v 1.9 2008/01/13 19:24:49 tonio Exp $
 
---- Makefile.orig	2006-10-16 11:06:56.000000000 +0200
+--- Makefile.orig	2007-06-11 17:23:08.000000000 +0200
 +++ Makefile
 @@ -1,16 +1,16 @@
- ################## Configuration parameters
+ #### Standard configuration parameters
  # Compile using ocamlopt, to use ocamlc set TARGET=byte
 -TARGET=opt
 +#TARGET=opt
@@ -20,82 +20,6 @@ $NetBSD: patch-aa,v 1.8 2007/01/15 21:12:13 tonio Exp $
  #Where to install hevea.sty
 -LATEXLIBDIR=$(PREFIX)/lib/hevea
 +LATEXLIBDIR=$(LIBDIR)
- ############### End of configuration parameters
+ ##### Advanced configuration parameters
  SUF=
  DIR=
-@@ -20,8 +20,8 @@ OCAMLFLAGS=
- OCAMLCI=$(OCAMLC)
- OCAMLOPT=${DIR}ocamlopt$(SUF)
- OCAMLLEX=${DIR}ocamllex$(SUF) -q
--INSTALL=cp
--MKDIR=mkdir -p
-+INSTALL=${BSD_INSTALL_DATA}
-+MKDIR=${MKDIR}
- 
- ONLYESPONJA=emisc.cmo buff.cmo pp.cmo htmllex.cmo htmlparse.cmo htmltext.cmo util.cmo explode.cmo ultra.cmo esponja.cmo
- 
-@@ -50,37 +50,37 @@ byte:
- 	$(MAKE) $(MFLAGS) TARGET=byte hevea.byte hacha.byte esponja.byte bibhva.byte
- 
- install-lib:
--	- $(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)
--	$(INSTALL) xxcharset.exe xxdate.exe $(DESTDIR)/$(LIBDIR)
--	- $(MKDIR)  $(DESTDIR)/$(LIBDIR)/mappings
--	cp mappings/*.map $(DESTDIR)/$(LIBDIR)/mappings
-+	$(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)
-+	$(BSD_INSTALL_DATA) xxcharset.exe xxdate.exe $(DESTDIR)/$(LIBDIR)
-+	$(BSD_INSTALL_DATA_DIR)  $(DESTDIR)/$(LIBDIR)/mappings
-+	$(BSD_INSTALL_DATA) mappings/*.map $(DESTDIR)/$(LIBDIR)/mappings
- 
- install-opt: install-lib
--	- $(MKDIR) $(DESTDIR)/$(BINDIR)
--	$(INSTALL) hevea.opt $(DESTDIR)/$(BINDIR)/hevea
--	$(INSTALL) hacha.opt $(DESTDIR)/$(BINDIR)/hacha
--	$(INSTALL) esponja.opt $(DESTDIR)/$(BINDIR)/esponja
--	$(INSTALL) bibhva.opt $(DESTDIR)/$(BINDIR)/bibhva
--	$(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_PROGRAM) bibhva.opt $(DESTDIR)/$(BINDIR)/bibhva
-+	$(BSD_INSTALL_SCRIPT) imagen $(DESTDIR)/$(BINDIR)
- 
- install-byte: install-lib
--	- $(MKDIR) $(DESTDIR)/$(BINDIR)
--	$(INSTALL) hevea.byte $(DESTDIR)/$(BINDIR)/hevea
--	$(INSTALL) hacha.byte $(DESTDIR)/$(BINDIR)/hacha
--	$(INSTALL) esponja.byte $(DESTDIR)/$(BINDIR)/esponja
--	$(INSTALL) bibhva.byte $(DESTDIR)/$(BINDIR)/bibhva
--	$(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) bibhva.byte $(DESTDIR)/$(BINDIR)/bibhva
-+	$(BSD_INSTALL_SCRIPT) imagen $(DESTDIR)/$(BINDIR)
- 
- 
- hevea.byte: ${OBJS}