5 files changed, 190 insertions, 14 deletions

diff --git a/lang/nml/Makefile b/lang/nml/Makefile
index b8180854ee71..557ae1bfffcc 100644
--- a/lang/nml/Makefile
+++ b/lang/nml/Makefile
@@ -6,12 +6,29 @@
 #
 
 PORTNAME=	nml
-PORTVERSION=	0.91
+PORTVERSION=	0.92
 CATEGORIES=	lang
 MASTER_SITES=	http://ropas.kaist.ac.kr/n/
 
 MAINTAINER=	netj@ropas.kaist.ac.kr
 
-HAS_CONFIGURE= yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=	\
+		-prefix ${PREFIX}
+
+USE_GMAKE=	yes
+ALL_TARGET=	all opt opt.opt
+INSTALL_TARGET=	install installopt
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Changes ${WRKSRC}/LICENSE ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${DATADIR}/contrib/emacs
+	${MKDIR} ${DATADIR}/contrib/vim
+	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/* ${DATADIR}/contrib/emacs
+	${INSTALL_DATA} ${WRKSRC}/contrib/vim/* ${DATADIR}/contrib/vim
+.endif
+	@strip ${PREFIX}/bin/ncamlrun
 
 .include <bsd.port.mk>
diff --git a/lang/nml/distinfo b/lang/nml/distinfo
index f7d8fcfbc9d9..88480a97ed95 100644
--- a/lang/nml/distinfo
+++ b/lang/nml/distinfo
@@ -1 +1 @@
-MD5 (nml-0.91.tar.gz) = 5167d5a0eb7f2fa8170c5fe8bb694f96
+MD5 (nml-0.92.tar.gz) = 0b4304e318342abcb4b9c5ca866f73ec
diff --git a/lang/nml/pkg-comment b/lang/nml/pkg-comment
index 76596eadc793..1280eae9cc22 100644
--- a/lang/nml/pkg-comment
+++ b/lang/nml/pkg-comment
@@ -1 +1 @@
-A dialect/harmony of Standard ML and OCaml
+A dialect/harmony of Standard ML of New Jersey and Objective Caml.
diff --git a/lang/nml/pkg-descr b/lang/nml/pkg-descr
index 53cd708ad945..193daf1256ba 100644
--- a/lang/nml/pkg-descr
+++ b/lang/nml/pkg-descr
@@ -1,10 +1,14 @@
-nML is a dialect/harmony of Standard ML and OCaml. 
-nML is a higher-order and typed programming language. 
-nML compiler system drives the static analysis technologies to the limit. 
-nML compiler system will embody the result(s) of the LET project. 
-nML does not stand against the C programming convention. 
+- nML is a dialect/harmony of Standard ML of New Jersey and Objective Caml.
+- nML is a higher-order and typed programming language.
+- nML does not stand against the C programming convention.
 
-WWW: http://ropas.kaist.ac.kr/n/
+- nML compiler is a compiler of the nML language 
+  using the Objective Caml compiler:
+    nML parser + nML type-checker +
+        nML-to-OCaml translator + the OCaml compiler.
+
+- For more information of the nML, please visit
+  WWW: http://ropas.kaist.ac.kr/n
 
 - Jaeho Shin
 netj@ropas.kaist.ac.kr
diff --git a/lang/nml/pkg-plist b/lang/nml/pkg-plist
index 87ee64e84ea2..63ac2ab9f44c 100644
--- a/lang/nml/pkg-plist
+++ b/lang/nml/pkg-plist
@@ -1,83 +1,144 @@
 bin/ncamlrun
 bin/nlex
+bin/nmakegen
 bin/nml
 bin/nmlc
-bin/nmlmake
+bin/nmlo
+bin/ntopgen
 bin/nyacc
 lib/nml/_n_setmaphash.cmi
+lib/nml/_n_setmaphash.cmx
 lib/nml/_n_setmaphash.ml
+lib/nml/_n_setmaphash.p.cmx
 lib/nml/_n_typing.cmi
+lib/nml/_n_typing.cmx
 lib/nml/_n_typing.ml
+lib/nml/_n_typing.p.cmx
 lib/nml/arg.cmi
+lib/nml/arg.cmx
 lib/nml/arg.ml
 lib/nml/arg.mli
+lib/nml/arg.p.cmx
 lib/nml/array.cmi
+lib/nml/array.cmx
 lib/nml/array.ml
 lib/nml/array.mli
+lib/nml/array.p.cmx
+lib/nml/arrayLabels.cmi
+lib/nml/arrayLabels.cmx
+lib/nml/arrayLabels.ml
+lib/nml/arrayLabels.mli
+lib/nml/arrayLabels.p.cmx
+lib/nml/bigarray.a
 lib/nml/bigarray.cma
 lib/nml/bigarray.cmi
+lib/nml/bigarray.cmx
+lib/nml/bigarray.cmxa
 lib/nml/bigarray.mli
 lib/nml/buffer.cmi
+lib/nml/buffer.cmx
 lib/nml/buffer.ml
 lib/nml/buffer.mli
+lib/nml/buffer.p.cmx
 lib/nml/callback.cmi
+lib/nml/callback.cmx
 lib/nml/callback.ml
 lib/nml/callback.mli
+lib/nml/callback.p.cmx
 lib/nml/caml/alloc.h
 lib/nml/caml/bigarray.h
 lib/nml/caml/callback.h
 lib/nml/caml/config.h
 lib/nml/caml/custom.h
 lib/nml/caml/fail.h
+lib/nml/caml/intext.h
 lib/nml/caml/memory.h
 lib/nml/caml/misc.h
 lib/nml/caml/mlvalues.h
 lib/nml/camlheader
 lib/nml/camlheader_ur
 lib/nml/char.cmi
+lib/nml/char.cmx
 lib/nml/char.ml
 lib/nml/char.mli
+lib/nml/char.p.cmx
 lib/nml/condition.mli
+lib/nml/dbm.a
 lib/nml/dbm.cma
 lib/nml/dbm.cmi
+lib/nml/dbm.cmx
+lib/nml/dbm.cmxa
 lib/nml/dbm.mli
 lib/nml/digest.cmi
+lib/nml/digest.cmx
 lib/nml/digest.ml
 lib/nml/digest.mli
+lib/nml/digest.p.cmx
+lib/nml/dllbigarray.so
+lib/nml/dllmldbm.so
+lib/nml/dllstr.so
+lib/nml/dllthreads.so
+lib/nml/dllunix.so
 lib/nml/dynlink.cma
 lib/nml/dynlink.cmi
 lib/nml/dynlink.mli
 lib/nml/event.mli
+lib/nml/expunge
 lib/nml/extract_crc
 lib/nml/filename.cmi
+lib/nml/filename.cmx
 lib/nml/filename.ml
 lib/nml/filename.mli
+lib/nml/filename.p.cmx
 lib/nml/format.cmi
+lib/nml/format.cmx
 lib/nml/format.ml
 lib/nml/format.mli
+lib/nml/format.p.cmx
 lib/nml/gc.cmi
+lib/nml/gc.cmx
 lib/nml/gc.ml
 lib/nml/gc.mli
+lib/nml/gc.p.cmx
 lib/nml/genlex.cmi
+lib/nml/genlex.cmx
 lib/nml/genlex.ml
 lib/nml/genlex.mli
+lib/nml/genlex.p.cmx
 lib/nml/hashtbl.cmi
+lib/nml/hashtbl.cmx
 lib/nml/hashtbl.ml
 lib/nml/hashtbl.mli
+lib/nml/hashtbl.p.cmx
 lib/nml/int32.cmi
+lib/nml/int32.cmx
 lib/nml/int32.ml
 lib/nml/int32.mli
+lib/nml/int32.p.cmx
 lib/nml/int64.cmi
+lib/nml/int64.cmx
 lib/nml/int64.ml
 lib/nml/int64.mli
+lib/nml/int64.p.cmx
 lib/nml/interop.cmi
+lib/nml/interop.cmx
 lib/nml/interop.ml
+lib/nml/interop.p.cmx
+lib/nml/labelled.cmx
+lib/nml/labelled.p.cmx
 lib/nml/lazy.cmi
+lib/nml/lazy.cmx
 lib/nml/lazy.ml
 lib/nml/lazy.mli
+lib/nml/lazy.p.cmx
+lib/nml/ld.conf
 lib/nml/lexing.cmi
+lib/nml/lexing.cmx
 lib/nml/lexing.ml
 lib/nml/lexing.mli
+lib/nml/lexing.p.cmx
+lib/nml/libasmrun.a
+lib/nml/libasmrunp.a
 lib/nml/libbigarray.a
 lib/nml/libcamlrun.a
 lib/nml/libmldbm.a
@@ -85,70 +146,140 @@ lib/nml/libstr.a
 lib/nml/libthreads.a
 lib/nml/libunix.a
 lib/nml/list.cmi
+lib/nml/list.cmx
 lib/nml/list.ml
 lib/nml/list.mli
+lib/nml/list.p.cmx
+lib/nml/listLabels.cmi
+lib/nml/listLabels.cmx
+lib/nml/listLabels.ml
+lib/nml/listLabels.mli
+lib/nml/listLabels.p.cmx
 lib/nml/map.cmi
+lib/nml/map.cmx
 lib/nml/map.ml
 lib/nml/map.mli
+lib/nml/map.p.cmx
 lib/nml/marshal.cmi
+lib/nml/marshal.cmx
 lib/nml/marshal.ml
 lib/nml/marshal.mli
+lib/nml/marshal.p.cmx
+lib/nml/moreLabels.cmi
+lib/nml/moreLabels.cmx
+lib/nml/moreLabels.ml
+lib/nml/moreLabels.mli
+lib/nml/moreLabels.p.cmx
 lib/nml/mutex.mli
 lib/nml/nativeint.cmi
+lib/nml/nativeint.cmx
 lib/nml/nativeint.ml
 lib/nml/nativeint.mli
+lib/nml/nativeint.p.cmx
+lib/nml/ntopmain.cmo
 lib/nml/obj.cmi
+lib/nml/obj.cmx
 lib/nml/obj.ml
 lib/nml/obj.mli
+lib/nml/obj.p.cmx
 lib/nml/oo.cmi
+lib/nml/oo.cmx
 lib/nml/oo.ml
 lib/nml/oo.mli
+lib/nml/oo.p.cmx
 lib/nml/otherlibs.nty
+lib/nml/outcometree.cmi
+lib/nml/outcometree.mli
 lib/nml/parsing.cmi
+lib/nml/parsing.cmx
 lib/nml/parsing.ml
 lib/nml/parsing.mli
+lib/nml/parsing.p.cmx
 lib/nml/pervasives.cmi
+lib/nml/pervasives.cmx
 lib/nml/pervasives.ml
 lib/nml/pervasives.mli
 lib/nml/pervasives.nty
+lib/nml/pervasives.p.cmx
 lib/nml/printexc.cmi
+lib/nml/printexc.cmx
 lib/nml/printexc.ml
 lib/nml/printexc.mli
+lib/nml/printexc.p.cmx
 lib/nml/printf.cmi
+lib/nml/printf.cmx
 lib/nml/printf.ml
 lib/nml/printf.mli
+lib/nml/printf.p.cmx
 lib/nml/queue.cmi
+lib/nml/queue.cmx
 lib/nml/queue.ml
 lib/nml/queue.mli
+lib/nml/queue.p.cmx
 lib/nml/random.cmi
+lib/nml/random.cmx
 lib/nml/random.ml
 lib/nml/random.mli
+lib/nml/random.p.cmx
 lib/nml/set.cmi
+lib/nml/set.cmx
 lib/nml/set.ml
 lib/nml/set.mli
+lib/nml/set.p.cmx
 lib/nml/sort.cmi
+lib/nml/sort.cmx
 lib/nml/sort.ml
 lib/nml/sort.mli
+lib/nml/sort.p.cmx
 lib/nml/stack.cmi
+lib/nml/stack.cmx
 lib/nml/stack.ml
 lib/nml/stack.mli
+lib/nml/stack.p.cmx
+lib/nml/stdLabels.cmi
+lib/nml/stdLabels.cmx
+lib/nml/stdLabels.ml
+lib/nml/stdLabels.mli
+lib/nml/stdLabels.p.cmx
 lib/nml/std_exit.cmi
 lib/nml/std_exit.cmo
+lib/nml/std_exit.cmx
 lib/nml/std_exit.ml
+lib/nml/std_exit.o
+lib/nml/std_exit.p.cmx
+lib/nml/std_exit.p.o
+lib/nml/stdlib.a
 lib/nml/stdlib.cma
+lib/nml/stdlib.cmxa
 lib/nml/stdlib.nty
+lib/nml/stdlib.p.a
+lib/nml/stdlib.p.cmxa
+lib/nml/str.a
 lib/nml/str.cma
 lib/nml/str.cmi
+lib/nml/str.cmx
+lib/nml/str.cmxa
 lib/nml/str.mli
 lib/nml/stream.cmi
+lib/nml/stream.cmx
 lib/nml/stream.ml
 lib/nml/stream.mli
+lib/nml/stream.p.cmx
 lib/nml/string.cmi
+lib/nml/string.cmx
 lib/nml/string.ml
 lib/nml/string.mli
+lib/nml/string.p.cmx
+lib/nml/stringLabels.cmi
+lib/nml/stringLabels.cmx
+lib/nml/stringLabels.ml
+lib/nml/stringLabels.mli
+lib/nml/stringLabels.p.cmx
 lib/nml/sys.cmi
+lib/nml/sys.cmx
 lib/nml/sys.ml
 lib/nml/sys.mli
+lib/nml/sys.p.cmx
 lib/nml/thread.mli
 lib/nml/threadUnix.mli
 lib/nml/threads/condition.cmi
@@ -158,16 +289,40 @@ lib/nml/threads/stdlib.cma
 lib/nml/threads/thread.cmi
 lib/nml/threads/threadUnix.cmi
 lib/nml/threads/threads.cma
-lib/nml/topvalue.cmi
-lib/nml/topvalue.ml
-lib/nml/topvalue.mli
+lib/nml/threads/unix.cma
+lib/nml/topdirs.cmi
+lib/nml/toplevellib.cma
+lib/nml/toploop.cmi
+lib/nml/unix.a
 lib/nml/unix.cma
 lib/nml/unix.cmi
+lib/nml/unix.cmx
+lib/nml/unix.cmxa
 lib/nml/unix.mli
 lib/nml/unix.nty
+lib/nml/unixLabels.cmi
+lib/nml/unixLabels.cmx
+lib/nml/unixLabels.mli
 lib/nml/weak.cmi
+lib/nml/weak.cmx
 lib/nml/weak.ml
 lib/nml/weak.mli
+lib/nml/weak.p.cmx
+share/doc/nml/Changes
+share/doc/nml/LICENSE
+share/doc/nml/README
+share/nml/contrib/emacs/Makefile
+share/nml/contrib/emacs/README
+share/nml/contrib/emacs/inf-n.el
+share/nml/contrib/emacs/n-compat.el
+share/nml/contrib/emacs/n-font.el
+share/nml/contrib/emacs/n.el
+share/nml/contrib/vim/nml.vim
 @dirrm lib/nml/caml
 @dirrm lib/nml/threads
 @dirrm lib/nml
+@dirrm share/doc/nml
+@dirrm share/nml/contrib/emacs
+@dirrm share/nml/contrib/vim
+@dirrm share/nml/contrib
+@dirrm share/nml