Import of pkgsrc-2014Q1

net/ocamlnet/Makefile

@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2013/06/24 15:11:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2014/02/12 23:18:24 tron Exp $
 #
 
-DISTNAME=		ocamlnet-3.6.5
+DISTNAME=		ocamlnet-3.7.3
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://download.camlcity.org/download/
 
-MAINTAINER=		jaapb@kerguelen.org
+MAINTAINER=		jaapb@NetBSD.org
 HOMEPAGE=		http://projects.camlcity.org/projects/ocamlnet.html
 COMMENT=		Library focusing on application-level network protocols (OCaml)
 LICENSE=		zlib AND gnu-gpl-v2

net/ocamlnet/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2013/06/24 15:11:38 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/11/01 11:11:18 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/equeue
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netcgi2-plex
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netplex
@@ -504,7 +504,9 @@ ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys.cmxa
 lib/ocaml/site-lib/netsys/netsys.mli
 ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys.p.a
 ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys.p.cmxa
+lib/ocaml/site-lib/netsys/netsys_c_event.h
 ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_c_gprof.o
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_c_outofheap.o
 lib/ocaml/site-lib/netsys/netsys_conf.cmi
 ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_gprof_init.cmi
 ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_gprof_init.mli
@@ -636,6 +638,7 @@ ${PLIST.opt}lib/ocaml/site-lib/rpc-generator/rpc_generator.p.a
 ${PLIST.opt}lib/ocaml/site-lib/rpc-generator/rpc_generator.p.cmxa
 lib/ocaml/site-lib/rpc-generator/rpcgen-packlist
 lib/ocaml/site-lib/rpc-generator/syntax.cmi
+lib/ocaml/site-lib/rpc-generator/test_aux.mli
 ${PLIST.ssl}lib/ocaml/site-lib/rpc-ssl/META
 ${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.a
 ${PLIST.ssl}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.cma

net/ocamlnet/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2013/06/11 14:50:43 jaapb Exp $
+$NetBSD: distinfo,v 1.14 2013/12/12 18:13:17 jperkin Exp $
 
-SHA1 (ocamlnet-3.6.5.tar.gz) = 74b2cc1a71d59063a156f70d0e8a25066209264f
-RMD160 (ocamlnet-3.6.5.tar.gz) = 7983dd005f3de1c8ad7aaad3fd0d512402e23e02
-Size (ocamlnet-3.6.5.tar.gz) = 3339680 bytes
+SHA1 (ocamlnet-3.7.3.tar.gz) = 8d5def2a162b772727b5af8f66a31a5c750656b0
+RMD160 (ocamlnet-3.7.3.tar.gz) = 915ecf92b81e871d600fad3647e0927abdab0045
+Size (ocamlnet-3.7.3.tar.gz) = 3352779 bytes
 SHA1 (patch-Makefile.rules) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a
-SHA1 (patch-src_netsys_netsys__c.c) = 0d188b95cae496cb0c535de5cfb2e0935c5ee0c0
+SHA1 (patch-src_netsys_netsys__c.c) = 046fdca6cb9c38ecb96696196bd13fb084d4ba2e

net/ocamlnet/patches/patch-src_netsys_netsys__c.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-src_netsys_netsys__c.c,v 1.3 2013/01/19 20:37:44 riastradh Exp $
+$NetBSD: patch-src_netsys_netsys__c.c,v 1.4 2013/12/12 18:13:17 jperkin Exp $
 
 DragonFly doesn't define AT_SYMLINK_FOLLOW.  The added patch will
 at least unbreak the build for some code that obviously won't work.
@@ -6,7 +6,7 @@ https://sourceforge.net/tracker/?func=detail&aid=3545170&group_id=19774&atid=319
 
 Also work around absence of AT_REMOVEDIR, as on NetBSD 6.0.
 
---- src/netsys/netsys_c.c.orig	2012-07-19 23:25:25.000000000 +0000
+--- src/netsys/netsys_c.c.orig	2013-08-30 18:38:26.000000000 +0000
 +++ src/netsys/netsys_c.c
 @@ -428,6 +428,10 @@ CAMLprim value netsys_at_fdcwd(value dum
  #define AT_SYMLINK_NOFOLLOW 0
@@ -19,7 +19,18 @@ Also work around absence of AT_REMOVEDIR, as on NetBSD 6.0.
  static int at_flags_table[] = {
      AT_EACCESS, AT_SYMLINK_NOFOLLOW, AT_REMOVEDIR
  };
-@@ -528,7 +532,7 @@ CAMLprim value netsys_renameat(value old
+@@ -479,8 +483,8 @@ CAMLprim value netsys_openat(value dirfd
+     if (ret == -1) uerror("openat", path);
+ #if defined(NEED_CLOEXEC_EMULATION) && defined(FD_CLOEXEC)
+     if (convert_flag_list(flags, open_cloexec_table) != 0) {
+-        int flags = fcntl(fd, F_GETFD, 0);
+-        if (flags == -1 || fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1)
++        int flags = fcntl(dirfd, F_GETFD, 0);
++        if (flags == -1 || fcntl(dirfd, F_SETFD, flags | FD_CLOEXEC) == -1)
+           uerror("openat", path);
+     }
+ #endif
+@@ -545,7 +549,7 @@ CAMLprim value netsys_renameat(value old
  CAMLprim value netsys_linkat(value olddirfd, value oldpath,
  			     value newdirfd, value newpath, value flags)
  {