update to hevea-1.10

* use new PROPERTY ocaml_native
* patch Makefile / config.sh to respect environment variables

From: Christopher Zimmermann <madroach@gmerlin.de>
This commit is contained in:
avsm 2012-08-18 22:47:00 +00:00
parent 3262fe6634
commit dda70b738c
5 changed files with 159 additions and 42 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2012/08/04 16:30:04 espie Exp $
# $OpenBSD: Makefile,v 1.19 2012/08/18 22:47:00 avsm Exp $
COMMENT= LaTeX to html translator
@ -11,30 +11,33 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= c m
DISTNAME= hevea-1.06
REVISION= 2
MASTER_SITES= ftp://ftp.inria.fr/INRIA/moscova/hevea/
BUILD_DEPENDS= lang/ocaml
DISTNAME = hevea-1.10
MASTER_SITES = http://para.inria.fr/~maranget/hevea/distri/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-manual${EXTRACT_SUFX}
MAINTAINER= Marc Espie <espie@openbsd.org>
HOMEPAGE= http://para.inria.fr/%7Emaranget/hevea/
MAKE_FLAGS=LIBDIR='${PREFIX}/lib/hevea' BINDIR='${PREFIX}/bin'
FAKE_FLAGS=LIBDIR='${WRKINST}${PREFIX}/lib/hevea' BINDIR='${WRKINST}${PREFIX}/bin'
NO_REGRESS = Yes
MODULES += lang/ocaml
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mocaml_native}
MAKE_FLAGS += TARGET=opt
FAKE_FLAGS += TARGET=opt
.else
MAKE_FLAGS += TARGET=byte
FAKE_FLAGS += TARGET=byte
.endif
# Beware! this works only because the manual is flat
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hevea
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}-manual/* ${PREFIX}/share/doc/hevea
NO_REGRESS= Yes
.include <bsd.port.mk>
.if ${MODOCAML_NATIVE:L} == "no"
MAKE_FLAGS+= TARGET='byte'
FAKE_FLAGS+= TARGET='byte'
.endif
.include <bsd.port.mk>

View File

@ -1,10 +1,4 @@
MD5 (hevea-1.06-manual.tar.gz) = +Dj9jbZMfqy3wbQlmCINaw==
MD5 (hevea-1.06.tar.gz) = eWHPBdEszqL9ydV5GFZKcg==
RMD160 (hevea-1.06-manual.tar.gz) = tB6+Hk408pdUEZ6YEdgEOKH5Mi4=
RMD160 (hevea-1.06.tar.gz) = GrpiAYpiFpOlXCY27qPneiY7Cfc=
SHA1 (hevea-1.06-manual.tar.gz) = RTtV8YKNWbJAg9fEx4+TuBS/czY=
SHA1 (hevea-1.06.tar.gz) = 6XPtMpKHrb9kcDxXhAGtAofIlfc=
SHA256 (hevea-1.06-manual.tar.gz) = vwd4ajUdl9VV7eJEOZ6qf66HC11318c2+MDvX5qylnY=
SHA256 (hevea-1.06.tar.gz) = xSR6CzOr3KBvxXQQaVfIrjC04PeB0S8+rOMXCKIsd+0=
SIZE (hevea-1.06-manual.tar.gz) = 113756
SIZE (hevea-1.06.tar.gz) = 231094
SHA256 (hevea-1.10-manual.tar.gz) = CXCOlAnoXt7VMrAaWzJytCWY1MkwPke7rMUsjKeqK/Y=
SHA256 (hevea-1.10.tar.gz) = wgBcJzeiBCDlrsU18ngg4g8tNvmoHStQfJNzf+Hnb/M=
SIZE (hevea-1.10-manual.tar.gz) = 150330
SIZE (hevea-1.10.tar.gz) = 305269

View File

@ -0,0 +1,45 @@
$OpenBSD: patch-Makefile,v 1.3 2012/08/18 22:47:00 avsm Exp $
--- Makefile.orig Sun Aug 5 16:03:59 2012
+++ Makefile Sun Aug 5 16:04:44 2012
@@ -1,26 +1,26 @@
#### Standard 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=$(PREFIX)/lib/hevea
+LIBDIR?=$(PREFIX)/lib/hevea
# Where to install programms
-BINDIR=$(PREFIX)/bin
+BINDIR?=$(PREFIX)/bin
# Install prefix prefix
-DESTDIR=
+DESTDIR?=
#Where to install hevea.sty
-LATEXLIBDIR=$(PREFIX)/lib/hevea
+LATEXLIBDIR?=$(PREFIX)/lib/hevea
##### Advanced configuration parameters
-SUF=
-DIR=
-OCAMLC=$(DIR)ocamlc$(SUF)
-OCAMLFLAGS=
-OCAMLFLAGS=-w ZY
-OCAMLCI=$(OCAMLC)
-OCAMLOPT=$(DIR)ocamlopt$(SUF)
-OCAMLLEX=$(DIR)ocamllex$(SUF) -q
-OCBFLAGS=-j 4 -classic-display
+SUF?=
+DIR?=
+OCAMLC?=$(DIR)ocamlc$(SUF)
+OCAMLFLAGS?=
+OCAMLFLAGS?=-w ZY
+OCAMLCI?=$(OCAMLC)
+OCAMLOPT?=$(DIR)ocamlopt$(SUF)
+OCAMLLEX?=$(DIR)ocamllex$(SUF) -q
+OCBFLAGS?=-j 4 -classic-display
#### End of configuration parameters
#### The Makefile uses ocamlbuild if present.

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-config_sh,v 1.1 2012/08/18 22:47:00 avsm Exp $
--- config.sh.orig Tue Aug 21 14:29:05 2007
+++ config.sh Sun Aug 5 21:49:03 2012
@@ -1,11 +1,11 @@
PGM="hevea.byte hacha.byte esponja.byte bibhva.byte"
PGMNATIVE="hevea.native hacha.native esponja.native bibhva.native"
-BINDIR=/usr/local/bin
-LIBDIR=/usr/local/lib/hevea
-DESTDIR=
-LATEXLIBDIR=/usr/local/lib/hevea
-OCAMLFLAGS="-w ZY"
-OCBFLAGS="-j 4 -classic-display"
+BINDIR=${BINDIR:-'/usr/local/bin'}
+LIBDIR=${LIBDIR:-'/usr/local/lib/hevea'}
+LATEXLIBDIR=${LATEXLIBDIR:-'/usr/local/lib/hevea'}
+DESTDIR=${DESTDIR:-'/usr/local/bin'}
+OCAMLFLAGS=${OCAMLFLAGS:-''}
+OCBFLAGS=${OCBFLAGS:-'-j 4 -classic-display'}
ALLLIB="alltt.hva amsmath.hva articlecommon.hva babel.hva bookcommon.hva comment.hva compat.hva hyperref.hva ifthen.hva index.hva iso-symb.hva keyval.hva latexcommon.hva listings.hva lstlang1.hva lstlang2.hva lstlang3.hva makeidx.hva mathop.hva moreverb.hva multibib.hva multind.hva natbib-common.hva packages.hva plain.hva program.hva spaces.hva supertabular.hva underscore.hva url.hva verbatim.hva french-common.hva german-common.hva english.hva czech.hva ragged2e.hva chapterbib.hva deepcut.hva figcut.hva longtable.hva eurosym.hva isolatin1.hva textcomp.hva chngcntr.hva ifpdf.hva theorem.hva xspace.hva latexsym.hva iso-html.hva iso-text.hva winstyles.hva winfonts.hva epsfig.hva inputenc.hva thai.hva"
HTMLLIB="amssymb.hva amsfonts.hva article.hva austrian.hva book.hva color.hva colortbl.hva commongraphic.hva fancysection.hva fancyvrb.hva french.hva german.hva graphics.hva graphicx.hva hevea.hva common-math.hva mathpartir.hva natbib.hva png.hva report.hva seminar.hva sword.hva symb-eng.hva symb-ent.hva symb-fra.hva symb-mathml.hva symb-text.hva urlhref.hva xypic.hva"
TEXTLIB="article.hva book.hva color.hva colortbl.hva fancysection.hva hevea.hva report.hva seminar.hva french.hva austrian.hva german.hva natbib.hva"

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:44:01 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2012/08/18 22:47:00 avsm Exp $
bin/bibhva
bin/esponja
bin/hacha
bin/hevea
@ -9,24 +10,39 @@ lib/hevea/amsmath.hva
lib/hevea/articlecommon.hva
lib/hevea/babel.hva
lib/hevea/bookcommon.hva
lib/hevea/chapterbib.hva
lib/hevea/chngcntr.hva
lib/hevea/comment.hva
lib/hevea/compat.hva
lib/hevea/contents_motif.gif
lib/hevea/cutfoot-eng.html
lib/hevea/cutfoot-fra.html
lib/hevea/footer.tex
lib/hevea/czech.hva
lib/hevea/deepcut.hva
lib/hevea/english.hva
lib/hevea/epsfig.hva
lib/hevea/eurosym.hva
lib/hevea/figcut.hva
lib/hevea/french-common.hva
lib/hevea/german-common.hva
lib/hevea/hevea.sty
lib/hevea/html/
lib/hevea/html/amsfonts.hva
lib/hevea/html/amssymb.hva
lib/hevea/html/article.hva
lib/hevea/html/austrian.hva
lib/hevea/html/book.hva
lib/hevea/html/color.hva
lib/hevea/html/colortbl.hva
lib/hevea/html/common-math.hva
lib/hevea/html/commongraphic.hva
lib/hevea/html/fancysection.hva
lib/hevea/html/fancyvrb.hva
lib/hevea/html/french.hva
lib/hevea/html/german.hva
lib/hevea/html/graphics.hva
lib/hevea/html/graphicx.hva
lib/hevea/html/hevea.hva
lib/hevea/html/mathpartir.hva
lib/hevea/html/natbib.hva
lib/hevea/html/png.hva
lib/hevea/html/report.hva
lib/hevea/html/seminar.hva
@ -36,51 +52,92 @@ lib/hevea/html/symb-ent.hva
lib/hevea/html/symb-fra.hva
lib/hevea/html/symb-mathml.hva
lib/hevea/html/symb-text.hva
lib/hevea/html/symb.hva
lib/hevea/html/urlhref.hva
lib/hevea/html/xypic.hva
lib/hevea/hyperref.hva
lib/hevea/ifpdf.hva
lib/hevea/ifthen.hva
lib/hevea/imagen
lib/hevea/index.hva
lib/hevea/info/
lib/hevea/info/article.hva
lib/hevea/info/book.hva
lib/hevea/info/color.hva
lib/hevea/info/colortbl.hva
lib/hevea/info/fancysection.hva
lib/hevea/info/hevea.hva
lib/hevea/info/report.hva
lib/hevea/info/seminar.hva
lib/hevea/inputenc.hva
lib/hevea/iso-html.hva
lib/hevea/iso-symb.hva
lib/hevea/iso-text.hva
lib/hevea/isolatin1.hva
lib/hevea/keyval.hva
lib/hevea/latexcommon.hva
lib/hevea/latexsym.hva
lib/hevea/listings.hva
lib/hevea/longtable.hva
lib/hevea/lstlang1.hva
lib/hevea/lstlang2.hva
lib/hevea/lstlang3.hva
lib/hevea/makeidx.hva
lib/hevea/mathaccents.hva
lib/hevea/mappings/
lib/hevea/mappings/ISO-8859-1.map
lib/hevea/mappings/ISO-8859-10.map
lib/hevea/mappings/ISO-8859-11.map
lib/hevea/mappings/ISO-8859-13.map
lib/hevea/mappings/ISO-8859-14.map
lib/hevea/mappings/ISO-8859-15.map
lib/hevea/mappings/ISO-8859-16.map
lib/hevea/mappings/ISO-8859-2.map
lib/hevea/mappings/ISO-8859-3.map
lib/hevea/mappings/ISO-8859-4.map
lib/hevea/mappings/ISO-8859-5.map
lib/hevea/mappings/ISO-8859-6.map
lib/hevea/mappings/ISO-8859-7.map
lib/hevea/mappings/ISO-8859-8.map
lib/hevea/mappings/ISO-8859-9.map
lib/hevea/mappings/KOI8-R.map
lib/hevea/mappings/US-ASCII.map
lib/hevea/mappings/macintosh.map
lib/hevea/mappings/windows-1250.map
lib/hevea/mappings/windows-1251.map
lib/hevea/mappings/windows-1252.map
lib/hevea/mappings/windows-1257.map
lib/hevea/mathop.hva
lib/hevea/moreverb.hva
lib/hevea/multibib.hva
lib/hevea/multind.hva
lib/hevea/natbib-common.hva
lib/hevea/next_motif.gif
lib/hevea/packages.hva
lib/hevea/plain.hva
lib/hevea/previous_motif.gif
lib/hevea/program.hva
lib/hevea/ragged2e.hva
lib/hevea/spaces.hva
lib/hevea/supertabular.hva
lib/hevea/text/
lib/hevea/text/article.hva
lib/hevea/text/austrian.hva
lib/hevea/text/book.hva
lib/hevea/text/color.hva
lib/hevea/text/colortbl.hva
lib/hevea/text/fancysection.hva
lib/hevea/text/french.hva
lib/hevea/text/german.hva
lib/hevea/text/hevea.hva
lib/hevea/text/natbib.hva
lib/hevea/text/report.hva
lib/hevea/text/seminar.hva
lib/hevea/text/symb.hva
lib/hevea/textcomp.hva
lib/hevea/thai.hva
lib/hevea/theorem.hva
lib/hevea/underscore.hva
lib/hevea/url.hva
lib/hevea/verbatim.hva
lib/hevea/winfonts.hva
lib/hevea/winstyles.hva
lib/hevea/xspace.hva
lib/hevea/xxcharset.exe
lib/hevea/xxdate.exe
share/doc/hevea/
share/doc/hevea/browser.html
@ -88,7 +145,8 @@ share/doc/hevea/contents_motif.gif
share/doc/hevea/cutname.html
share/doc/hevea/fddl.html
share/doc/hevea/index.html
share/doc/hevea/iso.html
share/doc/hevea/manual-packages.html
share/doc/hevea/manual.css
share/doc/hevea/manual001.gif
share/doc/hevea/manual001.html
share/doc/hevea/manual002.gif
@ -106,8 +164,8 @@ share/doc/hevea/manual007.html
share/doc/hevea/manual008.gif
share/doc/hevea/manual008.html
share/doc/hevea/manual009.gif
share/doc/hevea/manual009.html
share/doc/hevea/manual010.gif
share/doc/hevea/manual010.html
share/doc/hevea/manual011.gif
share/doc/hevea/manual011.html
share/doc/hevea/manual012.html
@ -137,19 +195,15 @@ share/doc/hevea/manual035.html
share/doc/hevea/manual036.html
share/doc/hevea/manual037.html
share/doc/hevea/manual038.html
share/doc/hevea/manual039.html
share/doc/hevea/manual040.html
share/doc/hevea/manual041.html
share/doc/hevea/manual042.html
share/doc/hevea/manual043.html
share/doc/hevea/manual044.html
share/doc/hevea/manual045.html
share/doc/hevea/manual046.html
share/doc/hevea/manual047.html
share/doc/hevea/manual048.html
share/doc/hevea/manual049.html
share/doc/hevea/manual050.html
share/doc/hevea/next_motif.gif
share/doc/hevea/previous_motif.gif
share/doc/hevea/symbol.html
share/doc/hevea/urlhref.hva
share/doc/hevea/xfd.gif
share/doc/hevea/thaihevea.html
share/doc/hevea/thaihevea001.gif