darwin is anal about cpp being a *C* preprocessor, so use m4 here

instead.

Also fix a braino in the Makefile that resulted in it always using the
bytecode compiler rather than the native compiler. PKGREVISION++
This commit is contained in:
danw 2004-05-03 23:45:56 +00:00
parent 15ce4acfee
commit 7b824eb04a
3 changed files with 11 additions and 6 deletions

View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.7 2003/07/24 16:18:38 jtb Exp $ # $NetBSD: Makefile,v 1.8 2004/05/03 23:45:56 danw Exp $
DISTNAME= hevea-1.06 DISTNAME= hevea-1.06
PKGREVISION= 1
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= http://para.inria.fr/~maranget/hevea/distri/ MASTER_SITES= http://para.inria.fr/~maranget/hevea/distri/
@ -10,6 +11,10 @@ COMMENT= LaTeX to HTML translator
BUILD_DEPENDS+= ocaml>=3.00:../../lang/ocaml BUILD_DEPENDS+= ocaml>=3.00:../../lang/ocaml
MAKE_ENV+= M4="${M4}"
.include "../../mk/bsd.prefs.mk"
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc") .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
MAKE_ENV+= TARGET=opt MAKE_ENV+= TARGET=opt
.else .else

View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.4 2003/11/10 23:15:21 dmcmahill Exp $ $NetBSD: distinfo,v 1.5 2004/05/03 23:45:56 danw Exp $
SHA1 (hevea-1.06.tar.gz) = e973ed329287adbf64703c578401ad0287c895f7 SHA1 (hevea-1.06.tar.gz) = e973ed329287adbf64703c578401ad0287c895f7
Size (hevea-1.06.tar.gz) = 231094 bytes Size (hevea-1.06.tar.gz) = 231094 bytes
SHA1 (patch-aa) = e79ae6d0a7ed4929d57483ff5dcf8b325606cbed SHA1 (patch-aa) = 2bbd2a20767e9c15b54ddfd61077a38cf85649d4

View file

@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.4 2003/11/10 23:15:21 dmcmahill Exp $ $NetBSD: patch-aa,v 1.5 2004/05/03 23:45:56 danw Exp $
--- Makefile.orig Fri Feb 15 15:47:09 2002 --- Makefile.orig Fri Feb 15 10:47:09 2002
+++ Makefile +++ Makefile
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
################## Configuration parameters ################## Configuration parameters
@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.4 2003/11/10 23:15:21 dmcmahill Exp $
+BINDIR=${PREFIX}/bin +BINDIR=${PREFIX}/bin
# A replacement for /lib/cpp # A replacement for /lib/cpp
-CPP=gcc -E -P -x c -CPP=gcc -E -P -x c
+#CPP=gcc -E -P -x c +CPP=${M4}
############### End of configuration parameters ############### End of configuration parameters
SUF= SUF=
#DIR=/usr/bin/ #DIR=/usr/bin/