Hi, I'd like to update devel/ocaml-net. The -pcre FLAVOR is no longer needed, since the -enable-pcre flag changed its meaning. Netstring_str will use the OCaml builtin Str module as backend while Netstring_pcre will us ocaml-pcre as backend. OK?
Christopher
Index: devel/ocaml-net/Makefile
===================================================================
RCS file: /cvs/ports/devel/ocaml-net/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/ocaml-net/Makefile 22 Aug 2014 22:21:53 -0000 1.6
+++ devel/ocaml-net/Makefile 1 Sep 2014 10:11:09 -0000
@@ -3,10 +3,9 @@
COMMENT = the Ocamlnet internet protocol foundation library
CATEGORIES = devel www mail
-V = 3.7.3
+V = 3.7.5
DISTNAME = ocamlnet-${V}
PKGNAME = ocaml-net-${V}
-REVISION = 0
MASTER_SITES = http://download.camlcity.org/download/
HOMEPAGE = http://projects.camlcity.org/projects/ocamlnet.html
@@ -14,26 +13,18 @@ HOMEPAGE = http://projects.camlcity.org/
MAINTAINER = Christopher Zimmermann <madro...@zakweb.de>
# Mostly zlib/png, http server module is GPL
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_CDROM = Yes
-MODULES = lang/ocaml
-
-FLAVORS = pcre
-FLAVOR ?=
+MODULES = lang/ocaml
BUILD_DEPENDS = sysutils/findlib
WANTLIB = c curses m pthread
CONFIGURE_STYLE = simple
-CONFIGURE_ARGS = -with-nethttpd
+CONFIGURE_ARGS = -with-nethttpd -enable-pcre
-.if ${FLAVOR:Mpcre}
RUN_DEPENDS += devel/ocaml-pcre
-BUILD_DEPENDS += devel/ocaml-pcre
-WANTLIB += pcre
-
-CONFIGURE_ARGS += -enable-pcre
-.endif
+BUILD_DEPENDS += devel/ocaml-pcre lang/ocaml-camlp4
NO_TEST = Yes
USE_GMAKE = Yes
Index: devel/ocaml-net/distinfo
===================================================================
RCS file: /cvs/ports/devel/ocaml-net/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- devel/ocaml-net/distinfo 25 Nov 2013 14:35:26 -0000 1.3
+++ devel/ocaml-net/distinfo 1 Sep 2014 10:11:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (ocamlnet-3.7.3.tar.gz) = TdxpKIVtV7YT3oiJcI8Ep7ugRXG3vxxSVBjPnj2LRGg=
-SIZE (ocamlnet-3.7.3.tar.gz) = 3352779
+SHA256 (ocamlnet-3.7.5.tar.gz) = QtD8yXDdUB5FOHrA6vJ/vg9QxzVI7umA3ypM/a36aAc=
+SIZE (ocamlnet-3.7.5.tar.gz) = 3425236
Index: devel/ocaml-net/pkg/PFRAG.native
===================================================================
RCS file: /cvs/ports/devel/ocaml-net/pkg/PFRAG.native,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.native
--- devel/ocaml-net/pkg/PFRAG.native 18 Aug 2012 22:19:21 -0000 1.2
+++ devel/ocaml-net/pkg/PFRAG.native 1 Sep 2014 10:11:09 -0000
@@ -43,6 +43,10 @@ lib/ocaml/netshm/netshm.a
lib/ocaml/netshm/netshm.cmxa
lib/ocaml/netshm/netshm.p.a
lib/ocaml/netshm/netshm.p.cmxa
+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
lib/ocaml/netstring/netbuffer.cmx
lib/ocaml/netstring/netbuffer.o
lib/ocaml/netstring/netbuffer.p.cmx
@@ -87,7 +91,6 @@ lib/ocaml/netstring/xdr.cmx
lib/ocaml/netstring/xdr.o
lib/ocaml/netstring/xdr.p.cmx
lib/ocaml/netstring/xdr.p.o
-%%pcre%%
lib/ocaml/netsys/libnetsys.p.a
lib/ocaml/netsys/netsys.a
lib/ocaml/netsys/netsys.cmxa
Index: devel/ocaml-net/pkg/PFRAG.pcre
===================================================================
RCS file: devel/ocaml-net/pkg/PFRAG.pcre
diff -N devel/ocaml-net/pkg/PFRAG.pcre
--- devel/ocaml-net/pkg/PFRAG.pcre 18 Aug 2012 22:19:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-@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
Index: devel/ocaml-net/pkg/PFRAG.pcre-native
===================================================================
RCS file: devel/ocaml-net/pkg/PFRAG.pcre-native
diff -N devel/ocaml-net/pkg/PFRAG.pcre-native
--- devel/ocaml-net/pkg/PFRAG.pcre-native 18 Aug 2012 22:19:21 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@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
Index: devel/ocaml-net/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/devel/ocaml-net/pkg/PFRAG.shared,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.shared
--- devel/ocaml-net/pkg/PFRAG.shared 18 Aug 2012 22:19:21 -0000 1.2
+++ devel/ocaml-net/pkg/PFRAG.shared 1 Sep 2014 10:11:09 -0000
@@ -1,5 +1,4 @@
@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
Index: devel/ocaml-net/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ocaml-net/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/ocaml-net/pkg/PLIST 25 Nov 2013 14:35:26 -0000 1.3
+++ devel/ocaml-net/pkg/PLIST 1 Sep 2014 10:11:14 -0000
@@ -197,6 +197,11 @@ lib/ocaml/netshm/netshm_data.mli
lib/ocaml/netshm/netshm_hashtbl.cmi
lib/ocaml/netshm/netshm_hashtbl.mli
lib/ocaml/netstring/
+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
lib/ocaml/netstring/META
lib/ocaml/netstring/cmapf.adobe_standard_encoding.netdb
lib/ocaml/netstring/cmapf.adobe_symbol_encoding.netdb
@@ -396,7 +401,6 @@ lib/ocaml/netstring/xdr.cmi
lib/ocaml/netstring/xdr.mli
lib/ocaml/netstring/xdr_mstring.cmi
lib/ocaml/netstring/xdr_mstring.mli
-%%pcre%%
lib/ocaml/netsys/
lib/ocaml/netsys/META
lib/ocaml/netsys/libnetsys.a
@@ -478,7 +482,6 @@ lib/ocaml/rpc-generator/rename.cmi
lib/ocaml/rpc-generator/rpc_generator.cma
lib/ocaml/rpc-generator/rpcgen-packlist
lib/ocaml/rpc-generator/syntax.cmi
-lib/ocaml/rpc-generator/test_aux.mli
lib/ocaml/rpc/META
lib/ocaml/rpc/rpc.cma
lib/ocaml/rpc/rpc.cmi
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
signature.asc
Description: PGP signature
