diff options
| -rw-r--r-- | textproc/hevea/Makefile | 7 | ||||
| -rw-r--r-- | textproc/hevea/PLIST | 7 | ||||
| -rw-r--r-- | textproc/hevea/distinfo | 8 | ||||
| -rw-r--r-- | textproc/hevea/patches/patch-aa | 58 |
4 files changed, 34 insertions, 46 deletions
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile index 8cbbab63156..c532e3b9977 100644 --- a/textproc/hevea/Makefile +++ b/textproc/hevea/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2004/05/03 23:45:56 danw Exp $ +# $NetBSD: Makefile,v 1.9 2005/02/04 22:23:23 adrianp Exp $ -DISTNAME= hevea-1.06 -PKGREVISION= 1 +DISTNAME= hevea-1.07 CATEGORIES= textproc MASTER_SITES= http://para.inria.fr/~maranget/hevea/distri/ @@ -9,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://para.inria.fr/~maranget/hevea/ COMMENT= LaTeX to HTML translator -BUILD_DEPENDS+= ocaml>=3.00:../../lang/ocaml +BUILD_DEPENDS+= ocaml>=3.07:../../lang/ocaml MAKE_ENV+= M4="${M4}" diff --git a/textproc/hevea/PLIST b/textproc/hevea/PLIST index 5d13c6d039e..9882c920da4 100644 --- a/textproc/hevea/PLIST +++ b/textproc/hevea/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/06/29 22:57:14 jtb Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/02/04 22:23:23 adrianp Exp $ bin/hacha bin/hevea bin/esponja @@ -15,6 +15,9 @@ share/hevea/cutfoot-eng.html share/hevea/cutfoot-fra.html share/hevea/footer.tex share/hevea/hevea.sty +share/hevea/multibib.hva +share/hevea/natbib-common.hva +share/hevea/xxcharset.exe share/hevea/html/article.hva share/hevea/html/book.hva share/hevea/html/color.hva @@ -25,6 +28,7 @@ share/hevea/html/fancyvrb.hva share/hevea/html/graphics.hva share/hevea/html/graphicx.hva share/hevea/html/hevea.hva +share/hevea/html/natbib.hva share/hevea/html/png.hva share/hevea/html/report.hva share/hevea/html/seminar.hva @@ -36,6 +40,7 @@ share/hevea/html/symb-mathml.hva share/hevea/html/symb-text.hva share/hevea/html/symb.hva share/hevea/html/urlhref.hva +share/hevea/html/xypic.hva share/hevea/hyperref.hva share/hevea/ifthen.hva share/hevea/index.hva diff --git a/textproc/hevea/distinfo b/textproc/hevea/distinfo index 55a5a2bb59a..5ad5c462a27 100644 --- a/textproc/hevea/distinfo +++ b/textproc/hevea/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2004/05/03 23:45:56 danw Exp $ +$NetBSD: distinfo,v 1.6 2005/02/04 22:23:23 adrianp Exp $ -SHA1 (hevea-1.06.tar.gz) = e973ed329287adbf64703c578401ad0287c895f7 -Size (hevea-1.06.tar.gz) = 231094 bytes -SHA1 (patch-aa) = 2bbd2a20767e9c15b54ddfd61077a38cf85649d4 +SHA1 (hevea-1.07.tar.gz) = 04cbd526e8458f8535c166e367e1ee5856f1815e +Size (hevea-1.07.tar.gz) = 234342 bytes +SHA1 (patch-aa) = fbfd42da2d372fe2fa44821811aaa0cc179b49b5 diff --git a/textproc/hevea/patches/patch-aa b/textproc/hevea/patches/patch-aa index 235f89f10f0..4d045d45956 100644 --- a/textproc/hevea/patches/patch-aa +++ b/textproc/hevea/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2004/05/03 23:45:56 danw Exp $ +$NetBSD: patch-aa,v 1.6 2005/02/04 22:23:23 adrianp Exp $ ---- Makefile.orig Fri Feb 15 10:47:09 2002 -+++ Makefile +--- Makefile.orig 2005-01-13 20:27:38.000000000 +0000 ++++ Makefile 2005-01-13 20:39:04.000000000 +0000 @@ -1,12 +1,12 @@ ################## Configuration parameters # Compile using ocamlopt, to use ocamlc set TARGET=byte @@ -13,42 +13,44 @@ $NetBSD: patch-aa,v 1.5 2004/05/03 23:45:56 danw Exp $ # Where to install programms -BINDIR=/usr/local/bin +BINDIR=${PREFIX}/bin - # A replacement for /lib/cpp --CPP=gcc -E -P -x c + # C preprocessor with proper options (don't ask) +-CPP=cpp -E -P +CPP=${M4} - ############### End of configuration parameters - SUF= - #DIR=/usr/bin/ -@@ -18,7 +18,7 @@ OCAMLFLAGS= - OCAMLCI=${DIR}ocamlc$(SUF) + #Some alternatives... + #CPP=/lib/cpp -E -P (Old fashioned Unix) + #CPP=gcc -E -P -x c (If you have gcc) +@@ -21,8 +21,8 @@ + OCAMLCI=$(OCAMLC) OCAMLOPT=${DIR}ocamlopt$(SUF) OCAMLLEX=${DIR}ocamllex$(SUF) -INSTALL=cp +-MKDIR=mkdir -p +INSTALL=${BSD_INSTALL_DATA} ++MKDIR=${MKDIR} ONLYESPONJA=emisc.cmo buff.cmo htmllex.cmo htmlparse.cmo htmltext.cmo pp.cmo util.cmo explode.cmo ultra.cmo esponja.cmo -@@ -46,30 +46,30 @@ byte: +@@ -50,30 +50,30 @@ $(MAKE) $(MFLAGS) TARGET=byte hevea.byte hacha.byte esponja.byte cutfoot-fra.html cutfoot-eng.html install-lib: -- -mkdir $(LIBDIR) +- - $(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 +- - $(MKDIR) $(LIBDIR)/html - cd html ; $(INSTALL) $(HTMLLIB) $(LIBDIR)/html -- -mkdir $(LIBDIR)/text +- - $(MKDIR) $(LIBDIR)/text - cd text ; $(INSTALL) $(TEXTLIB) $(LIBDIR)/text -- -mkdir $(LIBDIR)/info +- - $(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) 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 ++ $(BSD_INSTALL_DATA_DIR) $(LIBDIR)/html + cd html ; $(BSD_INSTALL_DATA) $(HTMLLIB) $(LIBDIR)/html -+ $(BSD_INSTALL_DATA_DIR) $(LIBDIR)/text ++ $(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 @@ -77,21 +79,3 @@ $NetBSD: patch-aa,v 1.5 2004/05/03 23:45:56 danw Exp $ hevea.byte: ${OBJS} -@@ -103,7 +103,7 @@ cutfoot-eng.html: cutfoot.tex html/hevea - HEVEADIR=. ; export HEVEADIR ; ${HEVEA} < cutfoot.tex | ${ESPONJA}> $@ - - .SUFFIXES: --.SUFFIXES: .ml .cmo .mli .cmi .c .mll .cmx -+.SUFFIXES: .ml .cmo .mli .cmi .c .mll .cmx - - .mll.ml: - ${OCAMLLEX} $< -@@ -128,7 +128,7 @@ clean: cleanbyte - rm -f *.byte *.opt - rm -f $(GENSRC) - rm -f *.o *.cmi *.cmo *.cmx *.o *.ppo *.ppi -- rm -f *~ #*# html/*~ html/#*# text/*~ text/#*# info/*~ info/#*# -+ rm -f *~ #*# html/*~ html/#*# text/*~ text/#*# info/*~ info/#*# - rm -f cutfoot-fra.html cutfoot-eng.html - - depend: $(GENSRC) |