From b7fe612047aed8fdffdcb3c945ed99e6ee800210 Mon Sep 17 00:00:00 2001
From: jtb <jtb>
Date: Mon, 23 Jun 2003 20:36:13 +0000
Subject: Build with native code compilers on systems where they're available,
 which now includes powerpc and sparc. Bump PKGREVISION.

---
 lang/coq/Makefile               |  5 +++--
 net/unison/Makefile             |  6 +++---
 textproc/hevea/Makefile         |  9 ++++++++-
 textproc/hevea/distinfo         |  4 ++--
 textproc/hevea/patches/patch-aa | 17 +++++++----------
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index ffa2ddd4602..f8d29c436af 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/22 20:21:16 kristerw Exp $
+# $NetBSD: Makefile,v 1.2 2003/06/23 20:36:13 jtb Exp $
 #
 
 DISTNAME=	coq-7.4
+PKGREVISION=	1
 CATEGORIES=	lang math
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/coq/V7.4/
 
@@ -19,7 +20,7 @@ ALL_TARGET=	world
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} == "i386")
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
 PLIST_SRC=	${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST
 .endif
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 238ad78abee..2fba6f5ba04 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/06/18 09:22:24 agc Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/23 20:36:14 jtb Exp $
 #
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/
@@ -23,8 +24,7 @@ MAKE_ENV+=	HOME=${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} != "i386")
-# we don't have ocamlopt on non-i386 so don't try and use it
+.if (${MACHINE_ARCH} != "i386") || (${MACHINE_ARCH} != "powerpc") || (${MACHINE_ARCH} != "sparc")
 MAKE_FLAGS+=	NATIVE=false
 .endif
 
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index ca30f1961c5..660f9e5f6a4 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/06/02 01:16:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/23 20:36:14 jtb Exp $
 
 DISTNAME=	hevea-1.05
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/para/hevea/
 
@@ -10,4 +11,10 @@ COMMENT=	LaTeX to HTML translator
 
 DEPENDS+=	ocaml>=3.00:../../lang/ocaml
 
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+ALL_TARGET=opt
+.else
+ALL_TARGET=byte
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hevea/distinfo b/textproc/hevea/distinfo
index 161ca7d6428..70d50678fd3 100644
--- a/textproc/hevea/distinfo
+++ b/textproc/hevea/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/17 14:36:40 jtb Exp $
+$NetBSD: distinfo,v 1.2 2003/06/23 20:36:15 jtb Exp $
 
 SHA1 (hevea-1.05.tar.gz) = 1e4236491717cbdbb9fa9c01ecf5d21e892513ba
 Size (hevea-1.05.tar.gz) = 148837 bytes
-SHA1 (patch-aa) = 5ed03d085c086153ec949cfad12fc56106ad2b9e
+SHA1 (patch-aa) = fee12ad55489bd252be8456abe002bde2e733c66
diff --git a/textproc/hevea/patches/patch-aa b/textproc/hevea/patches/patch-aa
index 1143282316f..45927d6b593 100644
--- a/textproc/hevea/patches/patch-aa
+++ b/textproc/hevea/patches/patch-aa
@@ -1,15 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/17 14:36:42 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2003/06/23 20:36:15 jtb Exp $
 
---- Makefile.orig	Fri May  5 07:52:04 2000
+--- Makefile.orig
 +++ Makefile
-@@ -1,12 +1,16 @@
+@@ -1,12 +1,12 @@
  ################## Configuration parameters
  # Compile using ocamlopt, to use ocamlc set TARGET=byte
-+.if (${MACHINE_ARCH} == "i386")
- TARGET=opt
-+.else
-+TARGET=byte
-+.endif
+-TARGET=opt
++#TARGET=opt
  # Library directory of hevea
 -LIBDIR=/usr/local/lib/hevea
 +LIBDIR=${PREFIX}/share/hevea
@@ -22,7 +19,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/17 14:36:42 jtb Exp $
  ############### End of configuration parameters
  
  HEVEA=./hevea.$(TARGET)
-@@ -14,7 +18,7 @@
+@@ -14,7 +14,7 @@
  OCAMLCI=ocamlc
  OCAMLOPT=ocamlopt
  OCAMLLEX=ocamllex
@@ -31,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/17 14:36:42 jtb Exp $
  OBJS=version.cmo stack.cmo location.cmo misc.cmo out.cmo table.cmo parse_opts.cmo mylib.cmo myfiles.cmo symb.cmo save.cmo auxx.cmo  lexstate.cmo subst.cmo latexmacros.cmo counter.cmo noimage.cmo image.cmo length.cmo  get.cmo tabular.cmo htmlCommon.cmo htmlMath.cmo mathML.cmo html.cmo  text.cmo infoRef.cmo info.cmo section.cmo foot.cmo entry.cmo index.cmo colscan.cmo color.cmo hot.cmo package.cmo videoc.cmo verb.cmo latexscan.cmo zyva.cmo latexmain.cmo
  OBJSCUT=version.cmo stack.cmo location.cmo misc.cmo  out.cmo thread.cmo cross.cmo mylib.cmo section.cmo length.cmo save.cmo cut.cmo cutmain.cmo
  GENSRC=colscan.ml cut.ml entry.ml get.ml latexscan.ml length.ml save.ml tabular.ml videoc.ml verb.ml infoRef.ml subst.ml
-@@ -36,28 +40,28 @@
+@@ -36,28 +36,28 @@
  	$(MAKE) $(MFLAGS) TARGET=byte hevea.byte hacha.byte cutfoot-fra.html cutfoot-eng.html
  
  install-lib:
-- 
cgit v1.2.3