Update to 2.1

PR:		ports/84766
Submitted by:	Jun Mukai, David Julien
Approved by:	maintainer timeout (2w)

3 files changed, 55 insertions, 46 deletions

diff --git a/devel/ocaml-equeue/Makefile b/devel/ocaml-equeue/Makefile
index 330203bd5919..a717c196eb0d 100644
--- a/devel/ocaml-equeue/Makefile
+++ b/devel/ocaml-equeue/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	equeue
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	david.julien@gmail.com
+MAINTAINER=	djulien.bsd@gmail.com
 COMMENT=	The Equeue library for OCaml
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
diff --git a/devel/ocaml-equeue/distinfo b/devel/ocaml-equeue/distinfo
index 682cd94922dc..95d7b1802222 100644
--- a/devel/ocaml-equeue/distinfo
+++ b/devel/ocaml-equeue/distinfo
@@ -1,2 +1,2 @@
-MD5 (equeue-2.0.1.tar.gz) = 2c0f9b9aa6de7bb1a3471027e3f915e8
-SIZE (equeue-2.0.1.tar.gz) = 248867
+MD5 (equeue-2.1.tar.gz) = afff1b0606e048992d3f00f5c65cdd1f
+SIZE (equeue-2.1.tar.gz) = 260912
diff --git a/devel/ocaml-equeue/pkg-plist b/devel/ocaml-equeue/pkg-plist
index e77574b9f616..013a1bd271d1 100644
--- a/devel/ocaml-equeue/pkg-plist
+++ b/devel/ocaml-equeue/pkg-plist
@@ -1,21 +1,20 @@
 lib/ocaml/site-lib/equeue/META
-lib/ocaml/site-lib/equeue-core/META
-lib/ocaml/site-lib/equeue-core/equeue.a
-lib/ocaml/site-lib/equeue-core/equeue.cma
-lib/ocaml/site-lib/equeue-core/equeue.cmi
-lib/ocaml/site-lib/equeue-core/equeue.cmxa
-lib/ocaml/site-lib/equeue-core/equeue.mli
-lib/ocaml/site-lib/equeue-core/unixqueue.cmi
-lib/ocaml/site-lib/equeue-core/unixqueue.mli
-lib/ocaml/site-lib/equeue-core/unixqueue_mt.cmi
-lib/ocaml/site-lib/equeue-core/unixqueue_mt.o
-lib/ocaml/site-lib/equeue-core/unixqueue_mt.cmx
-lib/ocaml/site-lib/equeue-core/unixqueue_mt.cmo
-lib/ocaml/site-lib/equeue-core/unixqueue_mt.mli
-lib/ocaml/site-lib/equeue-core/uq_engines.cmi
-lib/ocaml/site-lib/equeue-core/uq_engines.mli
-lib/ocaml/site-lib/equeue-core/uq_socks5.cmi
-lib/ocaml/site-lib/equeue-core/uq_socks5.mli
+lib/ocaml/site-lib/equeue/equeue.a
+lib/ocaml/site-lib/equeue/equeue.cma
+lib/ocaml/site-lib/equeue/equeue.cmi
+lib/ocaml/site-lib/equeue/equeue.cmxa
+lib/ocaml/site-lib/equeue/equeue.mli
+lib/ocaml/site-lib/equeue/unixqueue.cmi
+lib/ocaml/site-lib/equeue/unixqueue.mli
+lib/ocaml/site-lib/equeue/unixqueue_mt.cmi
+lib/ocaml/site-lib/equeue/unixqueue_mt.o
+lib/ocaml/site-lib/equeue/unixqueue_mt.cmx
+lib/ocaml/site-lib/equeue/unixqueue_mt.cmo
+lib/ocaml/site-lib/equeue/unixqueue_mt.mli
+lib/ocaml/site-lib/equeue/uq_engines.cmi
+lib/ocaml/site-lib/equeue/uq_engines.mli
+lib/ocaml/site-lib/equeue/uq_socks5.cmi
+lib/ocaml/site-lib/equeue/uq_socks5.mli
 lib/ocaml/site-lib/shell/META
 lib/ocaml/site-lib/shell/dllshell.so
 lib/ocaml/site-lib/shell/libshell.a
@@ -32,25 +31,17 @@ lib/ocaml/site-lib/shell/shell_uq.mli
 lib/ocaml/site-lib/shell/unix_exts.cmi
 lib/ocaml/site-lib/shell/unix_exts.mli
 @dirrm lib/ocaml/site-lib/equeue
-@dirrm lib/ocaml/site-lib/equeue-core
 @dirrm lib/ocaml/site-lib/shell
 @unexec ocamlfind remove equeue 2>/dev/null || true
-@unexec ocamlfind remove equeue-core 2>/dev/null || true
 @unexec ocamlfind remove shell 2>/dev/null || true
 %%TCL%%lib/ocaml/site-lib/equeue-tcl/META
 %%TCL%%lib/ocaml/site-lib/equeue-tcl/dlltclqueue.so
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/equeue.a
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/equeue.cma
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/equeue.cmi
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/equeue.cmxa
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/equeue.mli
 %%TCL%%lib/ocaml/site-lib/equeue-tcl/libtclqueue.a
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/unixqueue.cmi
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/unixqueue.mli
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/uq_engines.cmi
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/uq_engines.mli
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/uq_socks5.cmi
-%%TCL%%lib/ocaml/site-lib/equeue-tcl/uq_socks5.mli
+%%TCL%%lib/ocaml/site-lib/equeue-tcl/equeue_tcl.a
+%%TCL%%lib/ocaml/site-lib/equeue-tcl/equeue_tcl.cma
+%%TCL%%lib/ocaml/site-lib/equeue-tcl/equeue_tcl.cmxa
+%%TCL%%lib/ocaml/site-lib/equeue-tcl/uq_tcl.cmi
+%%TCL%%lib/ocaml/site-lib/equeue-tcl/uq_tcl.mli
 %%TCL%%@dirrm lib/ocaml/site-lib/equeue-tcl
 %%TCL%%@unexec ocamlfind remove equeue-tcl 2>/dev/null || true
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT-FINDLIB
@@ -59,7 +50,10 @@ lib/ocaml/site-lib/shell/unix_exts.mli
 %%PORTDOCS%%%%DOCSDIR%%/SHELL
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Equeue.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Unixqueue.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Unixqueue.unix_event_system.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Unixqueue.event_system.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Unixqueue_mt.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.async_in_channel.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.async_out_channel.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.client_socket_connector.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.const_engine.html
@@ -72,14 +66,19 @@ lib/ocaml/site-lib/shell/unix_exts.mli
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.poll_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.poll_process_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.receiver.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.sender.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.seq_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.server_socket_acceptor.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.server_socket_listener.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.sync_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.watchdog.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_engines.wrapped_datagram_socket.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_gtk.gtk_event_system.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_gtk.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_socks5.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_socks5.proxy_client.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_tcl.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/Uq_tcl.tcl_event_system.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/index_attributes.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/index_class_types.html
@@ -92,8 +91,11 @@ lib/ocaml/site-lib/shell/unix_exts.mli
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/index_values.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/style.css
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Equeue.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Unixqueue.event_system.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Unixqueue.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Unixqueue.unix_event_system.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Unixqueue_mt.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.async_in_channel.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.async_out_channel.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.client_socket_connector.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.const_engine.html
@@ -106,16 +108,20 @@ lib/ocaml/site-lib/shell/unix_exts.mli
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.poll_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.poll_process_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.receiver.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.sender.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.seq_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.server_socket_acceptor.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.server_socket_listener.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.sync_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.watchdog.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_engines.wrapped_datagram_socket.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_gtk.gtk_event_system.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_gtk.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_socks5.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_socks5.proxy_client.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_tcl.tcl_event_system.html
+%%PORTDOCS%%%%DOCSDIR%%/refman-equeue/html/type_Uq_tcl.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/Shell.html
-%%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/Shell_mt.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/Shell_sys.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/Shell_uq.call_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/Shell_uq.html
@@ -135,7 +141,6 @@ lib/ocaml/site-lib/shell/unix_exts.mli
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/index_values.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/style.css
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/type_Shell.html
-%%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/type_Shell_mt.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/type_Shell_sys.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/type_Shell_uq.call_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/type_Shell_uq.html
@@ -145,21 +150,21 @@ lib/ocaml/site-lib/shell/unix_exts.mli
 %%PORTDOCS%%%%DOCSDIR%%/refman-shell/html/type_Unix_exts.html
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/html/TIMESTAMP
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c140.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c310.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c321.html
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c34.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c483.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c504.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c517.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c494.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c515.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c528.html
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/html/c83.html
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/html/equeue.css
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x130.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x236.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x338.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x364.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x384.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x446.html
-%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x458.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x247.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x349.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x375.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x395.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x457.html
+%%PORTDOCS%%%%DOCSDIR%%/users-guide/html/x469.html
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/ps/equeue.ps
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/src/equeue.css
 %%PORTDOCS%%%%DOCSDIR%%/users-guide/src/equeue.dsl
@@ -172,6 +177,9 @@ lib/ocaml/site-lib/shell/unix_exts.mli
 %%PORTDOCS%%%%EXAMPLESDIR%%/filecopy_labltk/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/filecopy_labltk/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/filecopy_labltk/filecopy.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/filecopy_lablgtk/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/filecopy_lablgtk/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/filecopy_lablgtk/filecopy.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/multi-threaded/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/multi-threaded/sample.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/preliminary/Makefile
@@ -182,6 +190,7 @@ lib/ocaml/site-lib/shell/unix_exts.mli
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/simple
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/preliminary
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/multi-threaded
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/filecopy_lablgtk
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/filecopy_labltk
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/filecopy
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/engines