Add dependency on lang/ocaml for those systems which ocamlopt is supported

on.

Addresses PR pkg/28410 by sutre at labri dot fr.  Some patches were supplied
in the PR, the PLIST fix is from me.

4 files changed, 71 insertions, 3 deletions

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 2f4904c7d9a..e4e25dcd07e 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2004/10/03 00:12:57 tv Exp $
+# $NetBSD: Makefile,v 1.57 2004/11/29 22:05:08 dmcmahill Exp $
 #
 
 DISTNAME=	${SCIBASE}.src
 PKGNAME=	${SCIBASE}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Scilab/distributions/
 
@@ -91,6 +91,7 @@ post-install:
 	${RM} -f ${PREFIX}/lib/${SCIBASE}/macros/util/scipad.sci.orig
 	${RM} -f ${PREFIX}/lib/${SCIBASE}/libtool
 	${LN} -s ${LOCALBASE}/bin/libtool ${PREFIX}/lib/${SCIBASE}/libtool
+	${RM} -f ${PREFIX}/lib/${SCIBASE}/config/*.subst.sav
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=		2.95.3
@@ -106,6 +107,16 @@ do-test:
 		${MAKE_ENV} ${MAKE_PROGRAM} tests 2>&1 | \
 		${TEE} ${WRKDIR}/examples.log
 
+# scilab wants ocamlopt so use the same list here as in the
+# lang/ocaml package
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc")
+PLIST_SRC=	${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST
+.include "../../lang/ocaml/buildlink3.mk"
+.else
+PLIST_SRC=	${PKGDIR}/PLIST
+CONFIGURE_ARGS+=	--without-ocaml
+.endif
 .include "../../parallel/pvm3/buildlink3.mk"
 .include "../../textproc/sablotron/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/math/scilab/PLIST.opt b/math/scilab/PLIST.opt
new file mode 100644
index 00000000000..7fa5e198073
--- /dev/null
+++ b/math/scilab/PLIST.opt
@@ -0,0 +1,28 @@
+@comment $NetBSD: PLIST.opt,v 1.1 2004/11/29 22:05:08 dmcmahill Exp $
+lib/${PKGNAME}/bin/modelicac
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/Capacitor.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/ConstantVoltage.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/CurrentSensor.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/Diode.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/Ground.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/InPutPort.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/Inductor.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/NPN.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/OutPort.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/OutPutPort.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/Pin.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/PotentialSensor.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/Resistor.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/VVsourceAC.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/VariableResistor.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/VoltageSensor.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/VsourceAC.moc
+lib/${PKGNAME}/macros/scicos_blocks/Electrical/VsourceDC.moc
+lib/${PKGNAME}/macros/scicos_blocks/Hydraulics/Bache.moc
+lib/${PKGNAME}/macros/scicos_blocks/Hydraulics/PerteDP.moc
+lib/${PKGNAME}/macros/scicos_blocks/Hydraulics/PortPHQ1.moc
+lib/${PKGNAME}/macros/scicos_blocks/Hydraulics/PortPHQ2.moc
+lib/${PKGNAME}/macros/scicos_blocks/Hydraulics/Puits.moc
+lib/${PKGNAME}/macros/scicos_blocks/Hydraulics/Source.moc
+lib/${PKGNAME}/macros/scicos_blocks/Hydraulics/ThermoCarre.moc
+lib/${PKGNAME}/macros/scicos_blocks/Hydraulics/VanneReglante.moc
diff --git a/math/scilab/distinfo b/math/scilab/distinfo
index 201ab4842f3..53f93582de8 100644
--- a/math/scilab/distinfo
+++ b/math/scilab/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2004/07/15 14:39:05 dmcmahill Exp $
+$NetBSD: distinfo,v 1.16 2004/11/29 22:05:08 dmcmahill Exp $
 
 SHA1 (scilab-3.0.src.tar.gz) = 73465add3c1b6640172e885b29fcfd8a3dc426a7
 Size (scilab-3.0.src.tar.gz) = 10988126 bytes
@@ -16,3 +16,4 @@ SHA1 (patch-ak) = a59ff16c0e7eab5c37d93abcdc9499ec49663080
 SHA1 (patch-al) = 371078078036436c72868eadd9f40532d9d2916f
 SHA1 (patch-am) = 7dc94f3d41aff5c508256361e15aab6cd0c4924a
 SHA1 (patch-an) = 75b9c531dcc39e82a9cfc3e5352afbe57f826310
+SHA1 (patch-ao) = 1dae172657b3852db6c14b9a791858f704528aba
diff --git a/math/scilab/patches/patch-ao b/math/scilab/patches/patch-ao
new file mode 100644
index 00000000000..124c39a9cab
--- /dev/null
+++ b/math/scilab/patches/patch-ao
@@ -0,0 +1,28 @@
+$NetBSD: patch-ao,v 1.8 2004/11/29 22:05:08 dmcmahill Exp $
+
+--- ocaml/Makefile.orig	Tue Mar 30 13:30:26 2004
++++ ocaml/Makefile
+@@ -26,7 +26,7 @@ PLATFORM=$(shell uname -s)
+ EXE=modelicac
+ 
+ 
+-.SUFFIXES: .ml .mli .cmo .cmi .cmx .mlp .mpi
++.SUFFIXES: .ml .mli .cmo .cmi .cmx .mlp .mpi .mll .mly
+ 
+ 
+ 
+@@ -60,12 +60,12 @@ EXE=modelicac
+ 	@$(OCAMLOPT) $(OCAMLOPTFLAGS) -c $(<)
+ 
+ 
+-%.ml %.mli: %.mly
++.mly.ml:
+ 	@ocamlyacc $(<)
+ 	@$(RM) -f $(<:.mly=.mli)
+ 
+ 
+-%.ml: %.mll
++.mll.ml:
+ 	@ocamllex $(<)
+ 
+