head	1.2;
access;
symbols
	RELEASE_8_3_0:1.2
	RELEASE_9_0_0:1.2
	RELEASE_7_4_0:1.2
	RELEASE_8_2_0:1.2
	RELEASE_6_EOL:1.2
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2
	RELEASE_5_EOL:1.2
	RELEASE_7_0_0:1.2
	RELEASE_6_3_0:1.2
	PRE_XORG_7:1.2
	RELEASE_4_EOL:1.2
	RELEASE_6_2_0:1.2
	RELEASE_6_1_0:1.2
	RELEASE_5_5_0:1.2
	RELEASE_6_0_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2005.09.14.15.20.36;	author barner;	state Exp;
branches;
next	1.1;

1.1
date	2005.06.27.14.05.52;	author jylefort;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update metaocaml to 3.08.a23
- Remove CONFLICTS with lang/ocaml

Submitted by:	Geoffrey Mainland (metaocaml maintainer)
PR:		ports/85236
@
text
@--- stdlib/Makefile.orig	Sat Aug 20 02:39:05 2005
+++ stdlib/Makefile	Sat Aug 20 02:39:27 2005
@@@@ -47,7 +47,7 @@@@
 	rm -f std_exit.p.cmi
 
 install:
-	cp stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
+	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
            $(LIBDIR)
 
 installopt: installopt-default installopt-$(PROFILING)
@


1.1
log
@Add metaocaml.

MetaOCaml is a multi-stage extension of the OCaml programming language, and
provides three basic constructs called Brackets, Escape, and Run for building,
combining, and executing future-stage computations, respectively. MetaOCaml
is a compiled dialect of MetaML.

WWW: http://www.metaocaml.org/

PR:		ports/82330
Submitted by:	Geoffrey Mainland <mainland@@apeiron.net>
@
text
@d1 3
a3 3
--- stdlib/Makefile.bak	Fri Apr 22 05:04:24 2005
+++ stdlib/Makefile	Fri Apr 22 05:13:40 2005
@@@@ -47,8 +47,7 @@@@
d7 3
a9 3
-	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
-           $(LIBDIR)
+	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR)
a11 1
 
@

