Update textproc/hevea to 2.23

Patch kindly provided by J. Lewis Muir

Changes include:
- a huge pile of bugfixes
- support for more latex packages (cleverref, comment,...)
- html 5.0 output

5 files changed, 39 insertions, 28 deletions

diff --git a/textproc/hevea/DESCR b/textproc/hevea/DESCR
index da8e900af55..7eef18b1022 100644
--- a/textproc/hevea/DESCR
+++ b/textproc/hevea/DESCR
@@ -1,18 +1,16 @@
     HEVEA is a LaTeX to HTML translator.  The input language is a fairly
     complete subset of LaTeX2e (old LaTeX style is also accepted) and the
     output language is HTML that is (hopefully) correct with respect to
-    version 4.0 (transitional)
+    version 5.
 
-    Exotic symbols are translated into symbols pertaining to the
-    symbol font of the HTML browser, using the FACE attribute of the FONT
-    tag. This allows the translation to HTML of quite a lot of the symbols
-    used in LaTeX.
+    Exotic symbols are translated into the so-called HTML 'entities',
+    in other words into references to UNICODE chararacters.
 
     HEVEA understands LaTeX macro definitions. Simple user style
     files are understood with little or no modifications.
     Furthermore, HEVEA customization is done by writing LaTeX code.
 
-    HEVEA is written in Objective Caml, as many lexers. It is quite fast
+    HEVEA is written in OCaml, as many lexers. It is quite fast
     and flexible. Using HEVEA it is possible to translate large documents
     such as manuals, books, etc. very quickly. All documents are
     translated as one single HTML file. Then, the output file can be cut
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 1aded1c718b..ed4382416a4 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.20 2012/10/25 06:55:53 asau Exp $
+# $NetBSD: Makefile,v 1.21 2015/05/06 20:45:43 tonio Exp $
 
-DISTNAME=	hevea-1.10
+DISTNAME=	hevea-2.23
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/moscova/hevea/
+MASTER_SITES=	http://hevea.inria.fr/distri/
 
 MAINTAINER=	tonio@NetBSD.org
-HOMEPAGE=	http://pauillac.inria.fr/~maranget/hevea/
+HOMEPAGE=	http://hevea.inria.fr/
 COMMENT=	LaTeX to HTML translator
+LICENSE=	qpl-v1.0
 
-BUILD_DEPENDS+=	ocaml>=3.07:../../lang/ocaml
 MAKE_ENV+=	DESTDIR=${DESTDIR}
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+BUILD_DEPENDS+=	ocaml>=3.12:../../lang/ocaml
 MAKE_ENV+=	TARGET=opt
 .else
+DEPENDS+=	ocaml>=3.12:../../lang/ocaml
 MAKE_ENV+=	TARGET=byte
 .endif
 
diff --git a/textproc/hevea/PLIST b/textproc/hevea/PLIST
index fc46d8437ff..ecbafae1a36 100644
--- a/textproc/hevea/PLIST
+++ b/textproc/hevea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:17:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/05/06 20:45:43 tonio Exp $
 bin/bibhva
 bin/esponja
 bin/hacha
@@ -9,11 +9,14 @@ share/hevea/amsmath.hva
 share/hevea/articlecommon.hva
 share/hevea/babel.hva
 share/hevea/bookcommon.hva
+share/hevea/booktabs.hva
 share/hevea/chapterbib.hva
 share/hevea/chngcntr.hva
+share/hevea/cleveref.hva
 share/hevea/comment.hva
 share/hevea/compat.hva
 share/hevea/contents_motif.gif
+share/hevea/crlang.hva
 share/hevea/czech.hva
 share/hevea/deepcut.hva
 share/hevea/english.hva
@@ -22,7 +25,9 @@ share/hevea/eurosym.hva
 share/hevea/figcut.hva
 share/hevea/french-common.hva
 share/hevea/german-common.hva
+share/hevea/hanging.hva
 share/hevea/hevea.sty
+share/hevea/hrlang.hva
 share/hevea/html/amsfonts.hva
 share/hevea/html/amssymb.hva
 share/hevea/html/article.hva
@@ -36,6 +41,7 @@ share/hevea/html/fancysection.hva
 share/hevea/html/fancyvrb.hva
 share/hevea/html/french.hva
 share/hevea/html/german.hva
+share/hevea/html/gif.hva
 share/hevea/html/graphics.hva
 share/hevea/html/graphicx.hva
 share/hevea/html/hevea.hva
@@ -50,12 +56,14 @@ share/hevea/html/symb-ent.hva
 share/hevea/html/symb-fra.hva
 share/hevea/html/symb-mathml.hva
 share/hevea/html/symb-text.hva
+share/hevea/html/undersection.hva
 share/hevea/html/urlhref.hva
 share/hevea/html/xypic.hva
 share/hevea/hyperref.hva
 share/hevea/ifpdf.hva
 share/hevea/ifthen.hva
 share/hevea/imagen
+share/hevea/import.hva
 share/hevea/index.hva
 share/hevea/info/article.hva
 share/hevea/info/book.hva
@@ -68,13 +76,17 @@ share/hevea/iso-symb.hva
 share/hevea/iso-text.hva
 share/hevea/isolatin1.hva
 share/hevea/keyval.hva
+share/hevea/labeltype.hva
 share/hevea/latexcommon.hva
 share/hevea/latexsym.hva
 share/hevea/listings.hva
 share/hevea/longtable.hva
 share/hevea/lstlang1.hva
+share/hevea/lstlang1.sty
 share/hevea/lstlang2.hva
+share/hevea/lstlang2.sty
 share/hevea/lstlang3.hva
+share/hevea/lstlang3.sty
 share/hevea/makeidx.hva
 share/hevea/mappings/ISO-8859-1.map
 share/hevea/mappings/ISO-8859-10.map
@@ -106,6 +118,7 @@ share/hevea/natbib-common.hva
 share/hevea/next_motif.gif
 share/hevea/packages.hva
 share/hevea/plain.hva
+share/hevea/portuguese.hva
 share/hevea/previous_motif.gif
 share/hevea/program.hva
 share/hevea/ragged2e.hva
diff --git a/textproc/hevea/distinfo b/textproc/hevea/distinfo
index 04103ed6b40..35ad63103b7 100644
--- a/textproc/hevea/distinfo
+++ b/textproc/hevea/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2010/03/15 21:00:56 tonio Exp $
+$NetBSD: distinfo,v 1.13 2015/05/06 20:45:43 tonio Exp $
 
-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) = fb4ce715523f9092122d143670cf382237c73e1f
+SHA1 (hevea-2.23.tar.gz) = f3b60029849ec7509f68ec0ec7e2bbb166940d7a
+RMD160 (hevea-2.23.tar.gz) = 8b6080f775de7d47a67a117c600e3f9a7bccbd44
+Size (hevea-2.23.tar.gz) = 968938 bytes
+SHA1 (patch-Makefile) = 5a3f1a76d055d892a66db9fe73cc7912a2f09b43
diff --git a/textproc/hevea/patches/patch-aa b/textproc/hevea/patches/patch-Makefile
index d954f06a5e5..d0b0d25dc57 100644
--- a/textproc/hevea/patches/patch-aa
+++ b/textproc/hevea/patches/patch-Makefile
@@ -1,23 +1,22 @@
-$NetBSD: patch-aa,v 1.10 2010/03/15 21:00:57 tonio Exp $
+$NetBSD: patch-Makefile,v 1.1 2015/05/06 20:45:43 tonio Exp $
 
---- Makefile.orig	2007-06-11 15:23:08.000000000 +0000
-+++ Makefile
-@@ -1,16 +1,16 @@
+Modify Makefile appropriately for pkgsrc.
+
+--- Makefile.orig	2014-09-23 07:03:10.000000000 +0000
++++ Makefile	2015-05-06 15:27:05.000000000 +0000
+@@ -1,14 +1,14 @@
  #### Standard configuration parameters
  # Compile using ocamlopt, to use ocamlc set TARGET=byte
 -TARGET=opt
 +#TARGET=opt
  # Install prefix
--PREFIX=/usr/local
-+#PREFIX=/usr/local
+-PREFIX?=/usr/local
++#PREFIX?=/usr/local
  # Library directory of hevea
 -LIBDIR=$(PREFIX)/lib/hevea
 +LIBDIR=$(PREFIX)/share/hevea
  # Where to install programms
  BINDIR=$(PREFIX)/bin
- # Install prefix prefix
--DESTDIR=
-+#DESTDIR=
  #Where to install hevea.sty
 -LATEXLIBDIR=$(PREFIX)/lib/hevea
 +LATEXLIBDIR=$(LIBDIR)