update to ocaml-net-3.6

- add pcre FLAVOR
- use the ocaml_native arch check
- remove old patches

From: Christopher Zimmermann <madroach@gmerlin.de>

devel/ocaml-net/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
+# $OpenBSD: Makefile,v 1.2 2012/08/18 22:19:21 avsm Exp $
 
 COMMENT =	the Ocamlnet internet protocol foundation library
 CATEGORIES =	devel www mail
 
-V =		3.5.1
+V =		3.6
 DISTNAME =	ocamlnet-${V}
 PKGNAME =	ocaml-net-${V}
 
@@ -20,32 +20,44 @@ PERMIT_DISTFILES_CDROM =	Yes
 
 MODULES =	lang/ocaml
 
-RUN_DEPENDS =	devel/ocaml-pcre
+FLAVORS =	pcre
-BUILD_DEPENDS =	${RUN_DEPENDS} sysutils/findlib
+FLAVOR ?=
-LIB_DEPENDS =	devel/pcre
-WANTLIB =	c curses m pthread pcre
 
-CONFIGURE_STYLE = simple
+BUILD_DEPENDS =		sysutils/findlib
-CONFIGURE_ARGS = -with-nethttpd
+WANTLIB =		c curses m pthread
+
+CONFIGURE_STYLE =	simple
+CONFIGURE_ARGS =	-with-nethttpd
+
+.if ${FLAVOR:Mpcre}
+RUN_DEPENDS +=		devel/ocaml-pcre
+BUILD_DEPENDS +=	devel/ocaml-pcre
+WANTLIB +=		pcre
+
+CONFIGURE_ARGS +=	-enable-pcre
+.endif
 
 NO_REGRESS =	Yes
 USE_GMAKE =	Yes
 
-ALL_TARGET =	all ${MODOCAML_NATIVE:S/Yes/opt/:S/No//}
+ALL_TARGET =	all
+
+.include <bsd.port.arch.mk>
+.if ${PROPERTIES:Mocaml_native}
+ALL_TARGET +=	opt
+.endif
 
 pre-fake:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/site-lib
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/stublibs
-	ln -s ../stublibs ${PREFIX}/lib/ocaml/site-lib/
 
 EXAMPLEDIR =	${PREFIX}/share/examples/ocaml-net
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocamlnet/html
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-net/html
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/ocamlnet/
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/ocaml-net/
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/ocamlnet/
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/ocaml-net/
 	${INSTALL_DATA} \
 	    ${WRKSRC}/doc/html-main/* \
-	    ${PREFIX}/share/doc/ocamlnet/html/
+	    ${PREFIX}/share/doc/ocaml-net/html/
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 	cp -r ${WRKSRC}/examples/* ${EXAMPLEDIR}
 	chown -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLEDIR}

devel/ocaml-net/distinfo

@@ -1,5 +1,2 @@
-MD5 (ocamlnet-3.5.1.tar.gz) = n09HS/6ISWIgB54GeR/zHA==
+SHA256 (ocamlnet-3.6.tar.gz) = MGwgruZRK+NWTA85hytw+SnAbh6JPPz1KKxHrjXPemk=
-RMD160 (ocamlnet-3.5.1.tar.gz) = Ezolcunvilv2KICipmljkdCTigg=
+SIZE (ocamlnet-3.6.tar.gz) = 3322518
-SHA1 (ocamlnet-3.5.1.tar.gz) = fhwqs62mc1E5tH64Uklc1gnr/W4=
-SHA256 (ocamlnet-3.5.1.tar.gz) = EwTuqIqsvAiGTn/4/OWPq0lfQcmbY3l4QSH8npLKhCY=
-SIZE (ocamlnet-3.5.1.tar.gz) = 3290994

devel/ocaml-net/patches/patch-src_netcgi2_netcgi_ajp_ml

@@ -1,32 +0,0 @@
-$OpenBSD: patch-src_netcgi2_netcgi_ajp_ml,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
-
-Committed upstream:
-Netcgi connectors (SCGI, AJP, FCGI): unifying the ~sockaddr
-and ~port arguments. ~port now also assumes a loopback binding.
-(Suggested by Christopher Zimmermann).
---- src/netcgi2/netcgi_ajp.ml.orig	Wed Feb 29 19:02:53 2012
-+++ src/netcgi2/netcgi_ajp.ml	Wed May 30 10:46:32 2012
-@@ -776,10 +776,13 @@ let run
-     ?(output_type=(`Direct "": Netcgi.output_type))
-     ?(arg_store=(fun _ _ _ -> `Automatic))
-     ?(exn_handler=(fun _ f -> f()))
-+    ?sockaddr
-     ?(port=8009)
-     f =
-   (* Socket to listen to *)
--  let sockaddr = Unix.ADDR_INET(Unix.inet_addr_any, port) in
-+  let sockaddr = match sockaddr with
-+    | None -> Unix.ADDR_INET(Unix.inet_addr_loopback, port)
-+    | Some sockaddr -> sockaddr in
-   let sock =
-     Unix.socket (Unix.domain_of_sockaddr sockaddr) Unix.SOCK_STREAM 0 in
-   Unix.setsockopt sock Unix.SO_REUSEADDR true;
-@@ -787,7 +790,7 @@ let run
-   Unix.listen sock 5;
-   Netlog.Debug.track_fd
-     ~owner:"Netcgi_ajp"
--    ~descr:("master port " ^ string_of_int port)
-+    ~descr:("master " ^ Netsys.string_of_sockaddr sockaddr)
-     sock;
-   while true do
-     let (fd, server) = Unix.accept sock in

devel/ocaml-net/patches/patch-src_netcgi2_netcgi_ajp_mli

@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_netcgi2_netcgi_ajp_mli,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
-
-Committed upstream:
-Netcgi connectors (SCGI, AJP, FCGI): unifying the ~sockaddr
-and ~port arguments. ~port now also assumes a loopback binding.
-(Suggested by Christopher Zimmermann).
---- src/netcgi2/netcgi_ajp.mli.orig	Wed Feb 29 19:02:53 2012
-+++ src/netcgi2/netcgi_ajp.mli	Wed May 30 10:46:32 2012
-@@ -72,6 +72,7 @@ val run :
-   ?output_type:output_type ->
-   ?arg_store:arg_store ->
-   ?exn_handler:exn_handler ->
-+  ?sockaddr:Unix.sockaddr ->
-   ?port:int ->
-   (cgi -> unit) -> unit
-   (** [run f] executes [f cgi] for each AJP request.
-@@ -83,6 +84,7 @@ val run :
-       @param arg_store Default: [`Automatic] for all arguments.
-       @param port The port used by the web server to send the requests
-                   (Default: 8009).
-+      @param sockaddr The sockaddress (overrides [port])
-       @param exn_handler See {!Netcgi.exn_handler}.  Default: delegate
-       all exceptions to the default handler.  *)
- 

devel/ocaml-net/patches/patch-src_netcgi2_netcgi_fcgi_ml

@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_netcgi2_netcgi_fcgi_ml,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
-
-Committed upstream:
-Netcgi connectors (SCGI, AJP, FCGI): unifying the ~sockaddr
-and ~port arguments. ~port now also assumes a loopback binding.
-(Suggested by Christopher Zimmermann).
---- src/netcgi2/netcgi_fcgi.ml.orig	Wed May 30 10:46:13 2012
-+++ src/netcgi2/netcgi_fcgi.ml	Wed May 30 10:46:32 2012
-@@ -790,13 +790,18 @@ let run ?(config=Netcgi.default_config)
-     ?(arg_store=(fun _ _ _ -> `Automatic))
-     ?(exn_handler=(fun _ f -> f()))
-     ?sockaddr
-+    ?port
-     f =
-   (* FIXME: Under M$win, the web server communicates with a FCGI script
-      that it launches by means of a named pipe [fd] (contrarily to the
-      spec).  The requests are all sent through that pipe.  Thus there is
-      a single connection. *)
- 
--  let sock = match sockaddr with
-+  let sockaddr1 =
-+    match port with
-+      | None -> None
-+      | Some p -> Some(Unix.ADDR_INET(Unix.inet_addr_loopback,p)) in
-+  let sock = match sockaddr1 with
-     | None ->
- 	(* FastCGI launched by the web server *)
- 	fcgi_listensock

devel/ocaml-net/patches/patch-src_netcgi2_netcgi_fcgi_mli

@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_netcgi2_netcgi_fcgi_mli,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
-
-Committed upstream:
-Netcgi connectors (SCGI, AJP, FCGI): unifying the ~sockaddr
-and ~port arguments. ~port now also assumes a loopback binding.
-(Suggested by Christopher Zimmermann).
---- src/netcgi2/netcgi_fcgi.mli.orig	Wed May 30 10:46:18 2012
-+++ src/netcgi2/netcgi_fcgi.mli	Wed May 30 10:46:32 2012
-@@ -74,6 +74,7 @@ val run :
-   ?arg_store:arg_store ->
-   ?exn_handler:exn_handler ->
-   ?sockaddr:Unix.sockaddr ->
-+  ?port:int ->
-   (cgi -> unit) -> unit
-   (** [run f] register the function [f] as a main function of the
-       script.  Each call to the script will execute [f cgi].  The code
-@@ -99,6 +100,8 @@ val run :
-       on a different machine), set [sockaddr] to the address the web
-       server needs to connect to to talk to the script (this address
-       must also be specified in the wen server config file).
-+
-+      @param port alternative way to specify [sockaddr] for localhost
- 
-       Your application should be ready handle SIGUSR1, used to
-       resquest a "graceful" process shutdown, and SIGTERM to request a

devel/ocaml-net/patches/patch-src_netcgi2_netcgi_scgi_ml

@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_netcgi2_netcgi_scgi_ml,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
-
-Committed upstream:
-Netcgi connectors (SCGI, AJP, FCGI): unifying the ~sockaddr
-and ~port arguments. ~port now also assumes a loopback binding.
-(Suggested by Christopher Zimmermann).
---- src/netcgi2/netcgi_scgi.ml.orig	Wed Feb 29 19:02:53 2012
-+++ src/netcgi2/netcgi_scgi.ml	Wed May 30 10:46:32 2012
-@@ -217,17 +217,28 @@ let run
-     ?(output_type=(`Direct "":Netcgi.output_type))
-     ?(arg_store=(fun _ _ _ -> `Automatic))
-     ?(exn_handler=(fun _ f -> f()))
--    ~port (* no default in the spec *)
-+    ?sockaddr
-+    ?port (* no default in the spec *)
-     f =
-   (* Socket to listen to *)
--  let sockaddr = Unix.ADDR_INET(Unix.inet_addr_any, port) in
-+  let sockaddr = 
-+    match sockaddr with
-+      | None -> (
-+          match port with
-+              (* Either port or sockaddr need to be specified *)
-+            | None -> 
-+                invalid_arg "Netcgi_scgi.run: neither sockaddr not port passed"
-+            | Some port -> 
-+                Unix.ADDR_INET(Unix.inet_addr_loopback, port)
-+        )
-+      | Some sockaddr -> sockaddr in
-   let sock =
-     Unix.socket (Unix.domain_of_sockaddr sockaddr) Unix.SOCK_STREAM 0 in
-   Unix.setsockopt sock Unix.SO_REUSEADDR true;
-   Unix.bind sock sockaddr;
-   Unix.listen sock 5;
-   Netlog.Debug.track_fd
--    ~owner:"Netcgi_fcgi"
-+    ~owner:"Netcgi_scgi"
-     ~descr:("master " ^ Netsys.string_of_sockaddr sockaddr)
-     sock;
-   while true do

devel/ocaml-net/patches/patch-src_netcgi2_netcgi_scgi_mli

@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_netcgi2_netcgi_scgi_mli,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
-
-Committed upstream:
-Netcgi connectors (SCGI, AJP, FCGI): unifying the ~sockaddr
-and ~port arguments. ~port now also assumes a loopback binding.
-(Suggested by Christopher Zimmermann).
---- src/netcgi2/netcgi_scgi.mli.orig	Wed Feb 29 19:02:53 2012
-+++ src/netcgi2/netcgi_scgi.mli	Wed May 30 10:46:32 2012
-@@ -31,18 +31,24 @@ val run :
-   ?output_type:output_type ->
-   ?arg_store:arg_store ->
-   ?exn_handler:exn_handler ->
--  port:int ->
-+  ?sockaddr:Unix.sockaddr ->
-+  ?port:int ->
-   (cgi -> unit) -> unit
-   (** [run f] executes [f cgi] for each SCGI request.
- 
-       @param config Default: {!Netcgi.default_config}
-       @param allow Tells whether a connection from the socket is allowed.
--      Default: allow from all.
-+        Default: allow from all.
-       @param output_type Default: [`Direct ""]
-       @param arg_store Default: [`Automatic] for all arguments.
-       @param sockaddr The socket used by the web server to send the requests.
-       @param exn_handler See {!Netcgi.exn_handler}.  Default: delegate
--      all exceptions to the default handler.  *)
-+        all exceptions to the default handler.  
-+      @param sockaddr The sockaddr for listening. Overrides [port]
-+      @param port The port for listening. Needs to be specified if no
-+        [sockaddr] is passed.
-+
-+*)
- 
- val handle_request :
-   config -> output_type -> arg_store -> exn_handler ->

devel/ocaml-net/patches/patch-src_netstring_nethttp_mlp

@@ -1,73 +0,0 @@
-$OpenBSD: patch-src_netstring_nethttp_mlp,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
-
-Committed upstream:
-Improve Nethttp.Header.best_media_type: sort result by preference and
-specificness
---- src/netstring/nethttp.mlp.orig	Wed Feb 29 19:02:52 2012
-+++ src/netstring/nethttp.mlp	Sun Jun 17 14:59:40 2012
-@@ -988,43 +988,31 @@ module Header = struct
-     mh # update_field "Accept" s
- 
-   let best_media_type mh supp =
--    let supp' =
--      (* All of [supp] not mentioned in the [Accept] field *)
--      let toks = try get_accept mh with Not_found -> [] in
--      List.filter (fun supp_type -> 
--		     not (List.exists (fun (t,_,_) -> t=supp_type) toks)) supp
-+    let match_mime a b =
-+      let (main_type, sub_type) = Mimestring.split_mime_type b
-+      in
-+        sub_type = "*" (*Ignore non-wildcard types*) &&
-+        (main_type = "*" ||
-+        main_type = (fst (Mimestring.split_mime_type a)))
-     in
--    let rec find_best toks =
--      match toks with
--	| (tok, params, qparams) :: toks' ->
--	    ( if List.mem tok supp then
--		(tok, params)
--	      else
--		let (main_type, sub_type) = Mimestring.split_mime_type tok in
--		if sub_type = "*" then (
--		  try
--		    (List.find
--		       (fun supp_type ->
--			  (main_type = "*") || 
--			  (sub_type = "*" && 
--		              main_type = fst(Mimestring.split_mime_type supp_type))
--		       )
--		       supp',
--		     params)
--		  with
--		      Not_found -> find_best toks'
--		)
--		else find_best toks'
--	    )
--	| [] ->
--	    (* Nothing acceptable: *)
--	    ("", [])
-+    let filter p l =
-+      List.fold_right
-+        (fun ((tok, _, _) as e) l -> if p tok then e :: l else l)
-+        l
-+        []
-     in
--    try
--      let mt_list = sort_by_q' (get_accept mh) in  (* or Not_found *)
--      find_best mt_list
-+    let accept = try get_accept mh with Not_found -> [ "*/*",[],[] ] in
-+    match
-+      sort_by_q' (List.flatten (List.map
-+        (fun t ->
-+          filter ((=) t) accept
-+          @
-+          filter (match_mime t) accept
-+        )
-+        supp))
-     with
--	Not_found -> ("*/*", [])
-+        (tok, params, qparams) :: _ -> (tok, params)
-+      | [] -> ("", [])
- 
-   let get_accept_charset mh =
-     parse_parameterized_token_list mh

devel/ocaml-net/patches/patch-src_netsys_netsys_c_event_h

@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_netsys_netsys_c_event_h,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
---- src/netsys/netsys_c_event.h.orig	Wed Feb 29 19:02:52 2012
-+++ src/netsys/netsys_c_event.h	Mon Jun 11 17:11:57 2012
-@@ -6,6 +6,9 @@
- #ifdef NETSYS_INTERNAL
- 
- #include "netsys_c.h"
-+#ifdef HAVE_PTHREAD
-+#include <pthread.h>
-+#endif
- 
- enum not_event_type {
-     NE_PIPE = 0,

devel/ocaml-net/patches/patch-src_netsys_netsys_c_locale_c

@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_netsys_netsys_c_locale_c,v 1.1.1.1 2012/07/16 09:27:31 edd Exp $
-OpenBSD does not define the ERA_* ant ALT_DIGITS symbols. Therefore replace
-these symbols by -1. nl_langinfo(3) should return an empty string in those
-cases, which shouldn't be too bad for most programs.
---- src/netsys/netsys_c_locale.c.orig	Wed Feb 29 19:02:52 2012
-+++ src/netsys/netsys_c_locale.c	Mon Jun 11 17:11:57 2012
-@@ -19,7 +19,12 @@ static int locale_items_table[] = {
-   ABDAY_4, ABDAY_5, ABDAY_6, ABDAY_7, MON_1, MON_2, MON_3, MON_4, MON_5,
-   MON_6, MON_7, MON_8, MON_9, MON_10, MON_11, MON_12, ABMON_1, ABMON_2,
-   ABMON_3, ABMON_4, ABMON_5, ABMON_6, ABMON_7, ABMON_8, ABMON_9, ABMON_10,
--  ABMON_11, ABMON_12, ERA, ERA_D_FMT, ERA_D_T_FMT, ERA_T_FMT, ALT_DIGITS,
-+  ABMON_11, ABMON_12,
-+#ifndef __OpenBSD__
-+  ERA, ERA_D_FMT, ERA_D_T_FMT, ERA_T_FMT, ALT_DIGITS,
-+#else
-+  -1, -1, -1, -1, -1,
-+#endif
-   RADIXCHAR, THOUSEP, YESEXPR, NOEXPR, CRNCYSTR
- };
- #endif

devel/ocaml-net/pkg/PFRAG.native

@@ -1,137 +1,136 @@
-@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2012/07/16 09:27:32 edd Exp $
+@comment $OpenBSD: PFRAG.native,v 1.2 2012/08/18 22:19:21 avsm Exp $
-lib/ocaml/site-lib/equeue/equeue.a
+lib/ocaml/equeue/equeue.a
-lib/ocaml/site-lib/equeue/equeue.cmxa
+lib/ocaml/equeue/equeue.cmxa
-lib/ocaml/site-lib/equeue/equeue.p.a
+lib/ocaml/equeue/equeue.p.a
-lib/ocaml/site-lib/equeue/equeue.p.cmxa
+lib/ocaml/equeue/equeue.p.cmxa
-lib/ocaml/site-lib/netcamlbox/netcamlbox.a
+lib/ocaml/netcamlbox/netcamlbox.a
-lib/ocaml/site-lib/netcamlbox/netcamlbox.cmxa
+lib/ocaml/netcamlbox/netcamlbox.cmxa
-lib/ocaml/site-lib/netcamlbox/netcamlbox.p.a
+lib/ocaml/netcamlbox/netcamlbox.p.a
-lib/ocaml/site-lib/netcamlbox/netcamlbox.p.cmxa
+lib/ocaml/netcamlbox/netcamlbox.p.cmxa
-lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.a
+lib/ocaml/netcgi2-plex/netcgi2-plex.a
-lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.cmxa
+lib/ocaml/netcgi2-plex/netcgi2-plex.cmxa
-lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.p.a
+lib/ocaml/netcgi2-plex/netcgi2-plex.p.a
-lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.p.cmxa
+lib/ocaml/netcgi2-plex/netcgi2-plex.p.cmxa
-lib/ocaml/site-lib/netcgi2/netcgi.a
+lib/ocaml/netcgi2/netcgi.a
-lib/ocaml/site-lib/netcgi2/netcgi.cmxa
+lib/ocaml/netcgi2/netcgi.cmxa
-lib/ocaml/site-lib/netcgi2/netcgi.p.a
+lib/ocaml/netcgi2/netcgi.p.a
-lib/ocaml/site-lib/netcgi2/netcgi.p.cmxa
+lib/ocaml/netcgi2/netcgi.p.cmxa
-lib/ocaml/site-lib/netclient/netclient.a
+lib/ocaml/netclient/netclient.a
-lib/ocaml/site-lib/netclient/netclient.cmxa
+lib/ocaml/netclient/netclient.cmxa
-lib/ocaml/site-lib/netclient/netclient.p.a
+lib/ocaml/netclient/netclient.p.a
-lib/ocaml/site-lib/netclient/netclient.p.cmxa
+lib/ocaml/netclient/netclient.p.cmxa
-lib/ocaml/site-lib/netgssapi/netgssapi.a
+lib/ocaml/netgssapi/netgssapi.a
-lib/ocaml/site-lib/netgssapi/netgssapi.cmxa
+lib/ocaml/netgssapi/netgssapi.cmxa
-lib/ocaml/site-lib/netgssapi/netgssapi.p.a
+lib/ocaml/netgssapi/netgssapi.p.a
-lib/ocaml/site-lib/netgssapi/netgssapi.p.cmxa
+lib/ocaml/netgssapi/netgssapi.p.cmxa
-lib/ocaml/site-lib/nethttpd/nethttpd.a
+lib/ocaml/nethttpd/nethttpd.a
-lib/ocaml/site-lib/nethttpd/nethttpd.cmxa
+lib/ocaml/nethttpd/nethttpd.cmxa
-lib/ocaml/site-lib/nethttpd/nethttpd.p.a
+lib/ocaml/nethttpd/nethttpd.p.a
-lib/ocaml/site-lib/nethttpd/nethttpd.p.cmxa
+lib/ocaml/nethttpd/nethttpd.p.cmxa
-lib/ocaml/site-lib/netmulticore/netmulticore.a
+lib/ocaml/netmulticore/netmulticore.a
-lib/ocaml/site-lib/netmulticore/netmulticore.cmxa
+lib/ocaml/netmulticore/netmulticore.cmxa
-lib/ocaml/site-lib/netmulticore/netmulticore.p.a
+lib/ocaml/netmulticore/netmulticore.p.a
-lib/ocaml/site-lib/netmulticore/netmulticore.p.cmxa
+lib/ocaml/netmulticore/netmulticore.p.cmxa
-lib/ocaml/site-lib/netplex/netplex.a
+lib/ocaml/netplex/netplex.a
-lib/ocaml/site-lib/netplex/netplex.cmxa
+lib/ocaml/netplex/netplex.cmxa
-lib/ocaml/site-lib/netplex/netplex.p.a
+lib/ocaml/netplex/netplex.p.a
-lib/ocaml/site-lib/netplex/netplex.p.cmxa
+lib/ocaml/netplex/netplex.p.cmxa
-lib/ocaml/site-lib/netplex/netplex_mt.cmx
+lib/ocaml/netplex/netplex_mt.cmx
-lib/ocaml/site-lib/netplex/netplex_mt.o
+lib/ocaml/netplex/netplex_mt.o
-lib/ocaml/site-lib/netplex/netplex_mt.p.cmx
+lib/ocaml/netplex/netplex_mt.p.cmx
-lib/ocaml/site-lib/netplex/netplex_mt.p.o
+lib/ocaml/netplex/netplex_mt.p.o
-lib/ocaml/site-lib/netshm/netshm.a
+lib/ocaml/netshm/netshm.a
-lib/ocaml/site-lib/netshm/netshm.cmxa
+lib/ocaml/netshm/netshm.cmxa
-lib/ocaml/site-lib/netshm/netshm.p.a
+lib/ocaml/netshm/netshm.p.a
-lib/ocaml/site-lib/netshm/netshm.p.cmxa
+lib/ocaml/netshm/netshm.p.cmxa
-lib/ocaml/site-lib/netstring/netbuffer.cmx
+lib/ocaml/netstring/netbuffer.cmx
-lib/ocaml/site-lib/netstring/netbuffer.o
+lib/ocaml/netstring/netbuffer.o
-lib/ocaml/site-lib/netstring/netbuffer.p.cmx
+lib/ocaml/netstring/netbuffer.p.cmx
-lib/ocaml/site-lib/netstring/netbuffer.p.o
+lib/ocaml/netstring/netbuffer.p.o
-lib/ocaml/site-lib/netstring/netconversion.cmx
+lib/ocaml/netstring/netconversion.cmx
-lib/ocaml/site-lib/netstring/netconversion.o
+lib/ocaml/netstring/netconversion.o
-lib/ocaml/site-lib/netstring/netconversion.p.cmx
+lib/ocaml/netstring/netconversion.p.cmx
-lib/ocaml/site-lib/netstring/netconversion.p.o
+lib/ocaml/netstring/netconversion.p.o
-lib/ocaml/site-lib/netstring/netmappings_iso.cmx
+lib/ocaml/netstring/netmappings_iso.cmx
-lib/ocaml/site-lib/netstring/netmappings_iso.o
+lib/ocaml/netstring/netmappings_iso.o
-lib/ocaml/site-lib/netstring/netmappings_iso.p.cmx
+lib/ocaml/netstring/netmappings_iso.p.cmx
-lib/ocaml/site-lib/netstring/netmappings_iso.p.o
+lib/ocaml/netstring/netmappings_iso.p.o
-lib/ocaml/site-lib/netstring/netmappings_jp.cmx
+lib/ocaml/netstring/netmappings_jp.cmx
-lib/ocaml/site-lib/netstring/netmappings_jp.o
+lib/ocaml/netstring/netmappings_jp.o
-lib/ocaml/site-lib/netstring/netmappings_jp.p.cmx
+lib/ocaml/netstring/netmappings_jp.p.cmx
-lib/ocaml/site-lib/netstring/netmappings_jp.p.o
+lib/ocaml/netstring/netmappings_jp.p.o
-lib/ocaml/site-lib/netstring/netmappings_kr.cmx
+lib/ocaml/netstring/netmappings_kr.cmx
-lib/ocaml/site-lib/netstring/netmappings_kr.o
+lib/ocaml/netstring/netmappings_kr.o
-lib/ocaml/site-lib/netstring/netmappings_kr.p.cmx
+lib/ocaml/netstring/netmappings_kr.p.cmx
-lib/ocaml/site-lib/netstring/netmappings_kr.p.o
+lib/ocaml/netstring/netmappings_kr.p.o
-lib/ocaml/site-lib/netstring/netmappings_min.cmx
+lib/ocaml/netstring/netmappings_min.cmx
-lib/ocaml/site-lib/netstring/netmappings_min.o
+lib/ocaml/netstring/netmappings_min.o
-lib/ocaml/site-lib/netstring/netmappings_min.p.cmx
+lib/ocaml/netstring/netmappings_min.p.cmx
-lib/ocaml/site-lib/netstring/netmappings_min.p.o
+lib/ocaml/netstring/netmappings_min.p.o
-lib/ocaml/site-lib/netstring/netmappings_other.cmx
+lib/ocaml/netstring/netmappings_other.cmx
-lib/ocaml/site-lib/netstring/netmappings_other.o
+lib/ocaml/netstring/netmappings_other.o
-lib/ocaml/site-lib/netstring/netmappings_other.p.cmx
+lib/ocaml/netstring/netmappings_other.p.cmx
-lib/ocaml/site-lib/netstring/netmappings_other.p.o
+lib/ocaml/netstring/netmappings_other.p.o
-lib/ocaml/site-lib/netstring/netnumber.cmx
+lib/ocaml/netstring/netnumber.cmx
-lib/ocaml/site-lib/netstring/netnumber.o
+lib/ocaml/netstring/netnumber.o
-lib/ocaml/site-lib/netstring/netnumber.p.cmx
+lib/ocaml/netstring/netnumber.p.cmx
-lib/ocaml/site-lib/netstring/netnumber.p.o
+lib/ocaml/netstring/netnumber.p.o
-lib/ocaml/site-lib/netstring/netstring.a
+lib/ocaml/netstring/netstring.a
-lib/ocaml/site-lib/netstring/netstring.cmxa
+lib/ocaml/netstring/netstring.cmxa
-lib/ocaml/site-lib/netstring/netstring.p.a
+lib/ocaml/netstring/netstring.p.a
-lib/ocaml/site-lib/netstring/netstring.p.cmxa
+lib/ocaml/netstring/netstring.p.cmxa
-lib/ocaml/site-lib/netstring/rtypes.cmx
+lib/ocaml/netstring/rtypes.cmx
-lib/ocaml/site-lib/netstring/rtypes.o
+lib/ocaml/netstring/rtypes.o
-lib/ocaml/site-lib/netstring/rtypes.p.cmx
+lib/ocaml/netstring/rtypes.p.cmx
-lib/ocaml/site-lib/netstring/rtypes.p.o
+lib/ocaml/netstring/rtypes.p.o
-lib/ocaml/site-lib/netstring/xdr.cmx
+lib/ocaml/netstring/xdr.cmx
-lib/ocaml/site-lib/netstring/xdr.o
+lib/ocaml/netstring/xdr.o
-lib/ocaml/site-lib/netstring/xdr.p.cmx
+lib/ocaml/netstring/xdr.p.cmx
-lib/ocaml/site-lib/netstring/xdr.p.o
+lib/ocaml/netstring/xdr.p.o
-lib/ocaml/site-lib/netsys/libnetsys.p.a
+%%pcre%%
-lib/ocaml/site-lib/netsys/netsys.a
+lib/ocaml/netsys/libnetsys.p.a
-lib/ocaml/site-lib/netsys/netsys.cmxa
+lib/ocaml/netsys/netsys.a
-lib/ocaml/site-lib/netsys/netsys.p.a
+lib/ocaml/netsys/netsys.cmxa
-lib/ocaml/site-lib/netsys/netsys.p.cmxa
+lib/ocaml/netsys/netsys.p.a
-lib/ocaml/site-lib/netsys/netsys_c_gprof.o
+lib/ocaml/netsys/netsys.p.cmxa
-lib/ocaml/site-lib/netsys/netsys_gprof_init.cmi
+lib/ocaml/netsys/netsys_c_gprof.o
-lib/ocaml/site-lib/netsys/netsys_gprof_init.mli
+lib/ocaml/netsys/netsys_gprof_init.cmi
-lib/ocaml/site-lib/netsys/netsys_gprof_init.p.cmx
+lib/ocaml/netsys/netsys_gprof_init.p.cmx
-lib/ocaml/site-lib/netsys/netsys_gprof_init.p.o
+lib/ocaml/netsys/netsys_gprof_init.p.o
-lib/ocaml/site-lib/netsys/netsys_oothr.a
+lib/ocaml/netsys/netsys_oothr.a
-lib/ocaml/site-lib/netsys/netsys_oothr.cmxa
+lib/ocaml/netsys/netsys_oothr.cmxa
-lib/ocaml/site-lib/netsys/netsys_oothr.p.a
+lib/ocaml/netsys/netsys_oothr.p.a
-lib/ocaml/site-lib/netsys/netsys_oothr.p.cmxa
+lib/ocaml/netsys/netsys_oothr.p.cmxa
-lib/ocaml/site-lib/netsys/netsys_oothr_mt.a
+lib/ocaml/netsys/netsys_oothr_mt.a
-lib/ocaml/site-lib/netsys/netsys_oothr_mt.cmxa
+lib/ocaml/netsys/netsys_oothr_mt.cmxa
-lib/ocaml/site-lib/netsys/netsys_oothr_mt.p.a
+lib/ocaml/netsys/netsys_oothr_mt.p.a
-lib/ocaml/site-lib/netsys/netsys_oothr_mt.p.cmxa
+lib/ocaml/netsys/netsys_oothr_mt.p.cmxa
-lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.cmx
+lib/ocaml/netsys/netsys_oothr_mt_init.cmx
-lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.o
+lib/ocaml/netsys/netsys_oothr_mt_init.o
-lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.p.cmx
+lib/ocaml/netsys/netsys_oothr_mt_init.p.cmx
-lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.p.o
+lib/ocaml/netsys/netsys_oothr_mt_init.p.o
-lib/ocaml/site-lib/pop/pop.a
+lib/ocaml/pop/pop.a
-lib/ocaml/site-lib/pop/pop.cmxa
+lib/ocaml/pop/pop.cmxa
-lib/ocaml/site-lib/pop/pop.p.a
+lib/ocaml/pop/pop.p.a
-lib/ocaml/site-lib/pop/pop.p.cmxa
+lib/ocaml/pop/pop.p.cmxa
-lib/ocaml/site-lib/rpc-auth-local/librpc_auth_local.a
+lib/ocaml/rpc-auth-local/librpc_auth_local.p.a
-lib/ocaml/site-lib/rpc-auth-local/librpc_auth_local.p.a
+lib/ocaml/rpc-auth-local/rpc_auth_local.a
-lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.a
+lib/ocaml/rpc-auth-local/rpc_auth_local.cmxa
-lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.cmxa
+lib/ocaml/rpc-auth-local/rpc_auth_local.p.a
-lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.p.a
+lib/ocaml/rpc-auth-local/rpc_auth_local.p.cmxa
-lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.p.cmxa
+lib/ocaml/rpc-generator/rpc_generator.a
-lib/ocaml/site-lib/rpc-generator/rpc_generator.a
+lib/ocaml/rpc-generator/rpc_generator.cmxa
-lib/ocaml/site-lib/rpc-generator/rpc_generator.cmxa
+lib/ocaml/rpc-generator/rpc_generator.p.a
-lib/ocaml/site-lib/rpc-generator/rpc_generator.p.a
+lib/ocaml/rpc-generator/rpc_generator.p.cmxa
-lib/ocaml/site-lib/rpc-generator/rpc_generator.p.cmxa
+lib/ocaml/rpc/rpc.a
-lib/ocaml/site-lib/rpc/rpc.a
+lib/ocaml/rpc/rpc.cmxa
-lib/ocaml/site-lib/rpc/rpc.cmxa
+lib/ocaml/rpc/rpc.p.a
-lib/ocaml/site-lib/rpc/rpc.p.a
+lib/ocaml/rpc/rpc.p.cmxa
-lib/ocaml/site-lib/rpc/rpc.p.cmxa
+lib/ocaml/shell/shell.a
-lib/ocaml/site-lib/shell/shell.a
+lib/ocaml/shell/shell.cmxa
-lib/ocaml/site-lib/shell/shell.cmxa
+lib/ocaml/shell/shell.p.a
-lib/ocaml/site-lib/shell/shell.p.a
+lib/ocaml/shell/shell.p.cmxa
-lib/ocaml/site-lib/shell/shell.p.cmxa
+lib/ocaml/smtp/smtp.a
-lib/ocaml/site-lib/smtp/smtp.a
+lib/ocaml/smtp/smtp.cmxa
-lib/ocaml/site-lib/smtp/smtp.cmxa
+lib/ocaml/smtp/smtp.p.a
-lib/ocaml/site-lib/smtp/smtp.p.a
+lib/ocaml/smtp/smtp.p.cmxa
-lib/ocaml/site-lib/smtp/smtp.p.cmxa

devel/ocaml-net/pkg/PFRAG.pcre

@@ -0,0 +1,6 @@
+@comment $OpenBSD: PFRAG.pcre,v 1.1 2012/08/18 22:19:21 avsm Exp $
+lib/ocaml/netstring-pcre/
+lib/ocaml/netstring-pcre/META
+lib/ocaml/netstring-pcre/netstring-pcre.cma
+lib/ocaml/netstring-pcre/netstring_pcre.cmi
+lib/ocaml/netstring-pcre/netstring_pcre.mli

devel/ocaml-net/pkg/PFRAG.pcre-native

@@ -0,0 +1,5 @@
+@comment $OpenBSD: PFRAG.pcre-native,v 1.1 2012/08/18 22:19:21 avsm Exp $
+lib/ocaml/netstring-pcre/netstring-pcre.a
+lib/ocaml/netstring-pcre/netstring-pcre.cmxa
+lib/ocaml/netstring-pcre/netstring-pcre.p.a
+lib/ocaml/netstring-pcre/netstring-pcre.p.cmxa

devel/ocaml-net/pkg/PFRAG.shared

@@ -1,4 +1,8 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2012/07/16 09:27:32 edd Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2012/08/18 22:19:21 avsm Exp $
+@comment lib/ocaml/stublibs/
 lib/ocaml/stublibs/dllnetaccel_c.so
+@comment lib/ocaml/stublibs/dllnetaccel_c.so.owner
 lib/ocaml/stublibs/dllnetsys.so
+@comment lib/ocaml/stublibs/dllnetsys.so.owner
 lib/ocaml/stublibs/dllrpc_auth_local.so
+@comment lib/ocaml/stublibs/dllrpc_auth_local.so.owner