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
@--- Makefile.orig	Sat Aug 20 02:14:36 2005
+++ Makefile	Sat Aug 20 02:14:56 2005
@@@@ -299,7 +299,7 @@@@
 	cp ocaml $(BINDIR)/ocaml$(EXE)
 # XXO added lines from here
 	cp metaocaml $(BINDIR)/metaocaml$(EXE)
-	cp parsing/asttypes.cmi parsing/parsetree.cmi \
+	${BSD_INSTALL_DATA} parsing/asttypes.cmi parsing/parsetree.cmi \
            parsing/location.cmi \
            parsing/longident.cmi  \
 	       bytecomp/cabs.cmi bytecomp/cprint.cmi \
@


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 11
a11 12
--- ./Makefile.orig	Thu Jun  9 16:59:57 2005
+++ ./Makefile	Thu Jun  9 17:00:05 2005
@@@@ -133,8 +133,7 @@@@
   asmcomp/schedgen.cmx asmcomp/scheduling.cmx \
   asmcomp/emitaux.cmx asmcomp/emit.cmx asmcomp/asmgen.cmx \
   asmcomp/asmlink.cmx asmcomp/asmlibrarian.cmx asmcomp/asmpackager.cmx \
-driver/pparse.cmx driver/opterrors.cmx driver/optcompile.cmx \
-stdlib/hookdynlink.cmx
+driver/pparse.cmx driver/opterrors.cmx driver/optcompile.cmx
 
 TOPLEVEL=driver/pparse.cmo driver/errors.cmo driver/compile.cmo \
   toplevel/genprintval.cmo toplevel/toploop.cmo \
@

