Fix build with current ocaml.

While here update to latest version - 1.96

ersion 1.96, September 29, 2010
================================
 o option -debug now prints the exact BibTeX commmand which is run
 o new option --note-html similar to --note but assuming a bibtex
   field already in HTML format
 o various little changes in the Makefile requested by the Debian maintainer

Version 1.95, March 23, 2010
============================
 o bib2bib: option "--php-output" to produce output as a PHP 2D array
 o bib2bib: options "--remove" and "--rename", to remove or rename fields
 o new headers with proper copyright
 o bib2bib: option "--no-comment", to prevent generation of extra
   comments
 o fixed support for DOI links: when field "doi" is already an URL, the
   DOI prefix is not prepended
 o tags "bibtexnumber" and "bibtexitem" are now inserted to ease the
   customization using CSS

Version 1.94, 07/05/09
======================
 o support for arXiv preprints links: a field "eprint = {xxx}" will be
   recognized, if any, and a link to http://arxiv.org/abs/ will be displayed;
   option -noeprint turns it off and option -eprintf-prefix <url> sets a
   different prefix for the urls (contributed by Ari Stern)

Version 1.93, 12/12/08
======================
 o bib2bib: giving '$date' as argument of option -s allows to sort from
   oldest to newest entry
 o bib2bib: field names in conditions may contain digits and '-' (usefull for
   custom fields)

Version 1.92, 08/07/08
======================
 o Windows installer (using NSIS nsis.sourceforge.net)
 o new bib2bib option --expand-xrefs to perform crossrefs expansion
 o option -m (reading macros from a file):
   - fixed macro definition with \def
   - macros with arguments are now supported
 o added accents conversion for tilda, and fixed accents conversion
   for \"i, \"\i and such (patch by Samuel Colin)
 o fixed bib2bib command line options to accept --warn-error and
   --quiet (as described in the manual)

Version 1.91, 20/02/2008
========================
 o fixed bug in bib2bib and bibtex2html when quotes (") are used in fields
 o fixed bug with -nobibsource and -multiple (bib links on the separate pages)

Version 1.90, 01/02/2008
========================
 o bib2bib: = and <> are now case insensitive; use == and != instead
   to perform case sensitive comparison
 o correctly support $x$$y$ where the central $$ is not passing into
   display math mode
 o more cases for accent macros \' \~ \. \u \v (patch by John Kewley)

4 files changed, 26 insertions, 10 deletions

diff --git a/converters/bibtex2html/Makefile b/converters/bibtex2html/Makefile
index f537c2162d9..89e795b4316 100644
--- a/converters/bibtex2html/Makefile
+++ b/converters/bibtex2html/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.26 2009/02/21 15:53:04 tonio Exp $
+# $NetBSD: Makefile,v 1.27 2011/04/01 21:14:53 markd Exp $
 
-DISTNAME=	bibtex2html-1.89
-PKGREVISION=	1
+DISTNAME=	bibtex2html-1.96
 CATEGORIES=	converters
 MASTER_SITES=	http://www.lri.fr/~filliatr/ftp/bibtex2html/
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.lri.fr/~filliatr/bibtex2html/
 COMMENT=	Collection of tools for translating from BibTeX to HTML
+LICENSE=	gnu-gpl-v2
 
 BUILD_DEPENDS+=	hevea-[0-9]*:../../textproc/hevea
 BUILD_DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
@@ -43,7 +43,7 @@ do-install:
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/aux2bib.1
 	${INSTALL_DATA} ${WRKSRC}/manual.html \
 		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/manual.ps \
+	${INSTALL_DATA} ${WRKSRC}/manual.pdf \
 		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/converters/bibtex2html/PLIST b/converters/bibtex2html/PLIST
index 683f07702ed..f33fe8a2bda 100644
--- a/converters/bibtex2html/PLIST
+++ b/converters/bibtex2html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:39:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/04/01 21:14:53 markd Exp $
 bin/aux2bib
 bin/bib2bib
 bin/bibtex2html
@@ -6,4 +6,4 @@ man/man1/aux2bib.1
 man/man1/bib2bib.1
 man/man1/bibtex2html.1
 share/doc/${PKGBASE}/manual.html
-share/doc/${PKGBASE}/manual.ps
+share/doc/${PKGBASE}/manual.pdf
diff --git a/converters/bibtex2html/distinfo b/converters/bibtex2html/distinfo
index a4fcb86b68a..70412d76b2d 100644
--- a/converters/bibtex2html/distinfo
+++ b/converters/bibtex2html/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2008/01/10 18:15:29 tonio Exp $
+$NetBSD: distinfo,v 1.13 2011/04/01 21:14:53 markd Exp $
 
-SHA1 (bibtex2html-1.89.tar.gz) = 9d76d7c789f2703d25549522133f8995ab819a6b
-RMD160 (bibtex2html-1.89.tar.gz) = a8d230436980f3d2c76068f7cf3a26c0396a2ca2
-Size (bibtex2html-1.89.tar.gz) = 68203 bytes
+SHA1 (bibtex2html-1.96.tar.gz) = ce447520fde0a66bbbda0db247f06afb5e53907c
+RMD160 (bibtex2html-1.96.tar.gz) = c6b847edb6d9ac09280177aa94ba3d8c1d9fa837
+Size (bibtex2html-1.96.tar.gz) = 90178 bytes
+SHA1 (patch-Makefile.in) = 5d6b05a72108e584ef522ddc0e0a914940f5c409
diff --git a/converters/bibtex2html/patches/patch-Makefile.in b/converters/bibtex2html/patches/patch-Makefile.in
new file mode 100644
index 00000000000..11e12511f03
--- /dev/null
+++ b/converters/bibtex2html/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2011/04/01 21:14:53 markd Exp $
+
+rename str lib for newer ocaml - from gentoo portage
+
+--- Makefile.in.orig	2010-09-29 06:56:25.000000000 +0000
++++ Makefile.in
+@@ -45,7 +45,7 @@ DEBUG    =
+ FLAGS    = $(ZLIBS) $(DEBUG)
+ PROFILE  =
+ 
+-STRLIB = -cclib -lstr
++STRLIB = -cclib -lcamlstr
+ 
+ OBJS =  options.cmx html.cmx latexmacros.cmx latexscan.cmx bbl_lexer.cmx \
+ 	bibtex.cmx bibtex_parser.cmx bibtex_lexer.cmx \