diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2003-11-10 23:15:21 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2003-11-10 23:15:21 +0000 |
| commit | c8d179afc0e4179649f37d92d1f4f078c94bc447 (patch) | |
| tree | 7d9a21fd49deac3305861620b8ac82da73f6a0c9 | |
| parent | 0e25f843b1fc966dc6341262869872b1f389e650 (diff) | |
| download | pkgsrc-c8d179afc0e4179649f37d92d1f4f078c94bc447.tar.gz | |
actually use the TARGET setting from MAKE_ENV. Fixes build problems
on alpha which doesn't have the optimizing ocaml compiler. Noted in
recent alpha bulk build.
| -rw-r--r-- | textproc/hevea/distinfo | 4 | ||||
| -rw-r--r-- | textproc/hevea/patches/patch-aa | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/textproc/hevea/distinfo b/textproc/hevea/distinfo index 166b95155d0..821ded439f8 100644 --- a/textproc/hevea/distinfo +++ b/textproc/hevea/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2003/06/29 22:57:15 jtb Exp $ +$NetBSD: distinfo,v 1.4 2003/11/10 23:15:21 dmcmahill Exp $ SHA1 (hevea-1.06.tar.gz) = e973ed329287adbf64703c578401ad0287c895f7 Size (hevea-1.06.tar.gz) = 231094 bytes -SHA1 (patch-aa) = 55e5ea6f48e434c162d7c08a47ef3903346ac6ec +SHA1 (patch-aa) = e79ae6d0a7ed4929d57483ff5dcf8b325606cbed diff --git a/textproc/hevea/patches/patch-aa b/textproc/hevea/patches/patch-aa index 7d66a9f1a19..bdd80d79e4e 100644 --- a/textproc/hevea/patches/patch-aa +++ b/textproc/hevea/patches/patch-aa @@ -1,10 +1,12 @@ -$NetBSD: patch-aa,v 1.3 2003/06/29 22:57:15 jtb Exp $ +$NetBSD: patch-aa,v 1.4 2003/11/10 23:15:21 dmcmahill Exp $ ---- Makefile.orig +--- Makefile.orig Fri Feb 15 15:47:09 2002 +++ Makefile -@@ -2,11 +2,11 @@ +@@ -1,12 +1,12 @@ + ################## Configuration parameters # Compile using ocamlopt, to use ocamlc set TARGET=byte - TARGET=opt +-TARGET=opt ++#TARGET=opt # Library directory of hevea -LIBDIR=/usr/local/lib/hevea +LIBDIR=${PREFIX}/share/hevea @@ -17,7 +19,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/29 22:57:15 jtb Exp $ ############### End of configuration parameters SUF= #DIR=/usr/bin/ -@@ -18,7 +18,7 @@ +@@ -18,7 +18,7 @@ OCAMLFLAGS= OCAMLCI=${DIR}ocamlc$(SUF) OCAMLOPT=${DIR}ocamlopt$(SUF) OCAMLLEX=${DIR}ocamllex$(SUF) @@ -26,7 +28,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/29 22:57:15 jtb Exp $ 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 @@ +@@ -46,30 +46,30 @@ byte: $(MAKE) $(MFLAGS) TARGET=byte hevea.byte hacha.byte esponja.byte cutfoot-fra.html cutfoot-eng.html install-lib: @@ -75,7 +77,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/29 22:57:15 jtb Exp $ hevea.byte: ${OBJS} -@@ -103,7 +103,7 @@ +@@ -103,7 +103,7 @@ cutfoot-eng.html: cutfoot.tex html/hevea HEVEADIR=. ; export HEVEADIR ; ${HEVEA} < cutfoot.tex | ${ESPONJA}> $@ .SUFFIXES: @@ -84,7 +86,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/29 22:57:15 jtb Exp $ .mll.ml: ${OCAMLLEX} $< -@@ -128,7 +128,7 @@ +@@ -128,7 +128,7 @@ clean: cleanbyte rm -f *.byte *.opt rm -f $(GENSRC) rm -f *.o *.cmi *.cmo *.cmx *.o *.ppo *.ppi |