In light of the current "slow-down" state this is not pressing but since
I had it ready I'll send it around.
Update extlib to 1.7.0, the same version opam installs when asked.
Switches to github hosting. Deletes dead MASTER_SITES. Don't know if a
new one should be added.
One tweak to a dependent (dose) due to a structure change.
Survives building dependents on native and non-native amd64.
I dont' think we have a particularly active/large Ocaml user population
so I'm also happy to commit as the worst case seems contained.
:-)
.... Ken
Index: devel/cudf/Makefile
===================================================================
RCS file: /cvs/ports/devel/cudf/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/cudf/Makefile 23 Jun 2016 19:23:53 -0000 1.6
+++ devel/cudf/Makefile 5 Jul 2016 21:09:09 -0000
@@ -11,6 +11,7 @@ VERSION = 0.8
DISTNAME = cudf-${VERSION}
PKGNAME-ocaml = ocaml-cudf-${VERSION}
PKGNAME-main = libcudf-${VERSION}
+REVISION= 0
MASTER_SITES =
https://gforge.inria.fr/frs/download.php/latestfile/4606/
Index: devel/ocaml-dose/Makefile
===================================================================
RCS file: /cvs/ports/devel/ocaml-dose/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/ocaml-dose/Makefile 23 Jun 2016 19:23:53 -0000 1.4
+++ devel/ocaml-dose/Makefile 6 Jul 2016 16:17:55 -0000
@@ -6,7 +6,7 @@ CATEGORIES = devel
VERSION = 3.3
DISTNAME = dose3-${VERSION}
PKGNAME = ocaml-dose-${VERSION}
-REVISION = 1
+REVISION = 2
HOMEPAGE = http://dose.gforge.inria.fr/public_html/
Index: devel/ocaml-dose/patches/patch-doseparse_stdOptions_ml
===================================================================
RCS file: /cvs/ports/devel/ocaml-dose/patches/patch-doseparse_stdOptions_ml,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doseparse_stdOptions_ml
--- devel/ocaml-dose/patches/patch-doseparse_stdOptions_ml 30 Aug 2015
15:56:12 -0000 1.1
+++ devel/ocaml-dose/patches/patch-doseparse_stdOptions_ml 6 Jul 2016
12:56:00 -0000
@@ -1,7 +1,6 @@
-$OpenBSD: patch-doseparse_stdOptions_ml,v 1.1 2015/08/30 15:56:12 avsm Exp $
---- doseparse/stdOptions.ml.orig Tue Nov 18 11:42:46 2014
-+++ doseparse/stdOptions.ml Mon Aug 3 18:07:28 2015
-@@ -15,7 +15,7 @@
+--- doseparse/stdOptions.ml.orig Tue Nov 18 06:42:46 2014
++++ doseparse/stdOptions.ml Wed Jul 6 08:55:26 2016
+@@ -15,11 +15,12 @@
open ExtLib
open Common
@@ -10,3 +9,8 @@ $OpenBSD: patch-doseparse_stdOptions_ml,
module type Ot = sig
val options :
+ ?usage:string ->
++ ?status:int ->
+ ?version:string ->
+ ?suppress_usage:bool ->
+ ?suppress_help:bool ->
Index: devel/ocaml-extlib/Makefile
===================================================================
RCS file: /cvs/ports/devel/ocaml-extlib/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/ocaml-extlib/Makefile 26 Jan 2016 13:10:40 -0000 1.10
+++ devel/ocaml-extlib/Makefile 6 Jul 2016 18:20:20 -0000
@@ -1,44 +1,41 @@
# $OpenBSD: Makefile,v 1.10 2016/01/26 13:10:40 sthen Exp $
+CATEGORIES= devel
COMMENT= extended standard library for OCaml
-DISTNAME= extlib-1.6.1
-REVISION= 2
-PKGNAME= ocaml-${DISTNAME}
-CATEGORIES= devel
+VERSION= 1.7.0
+GH_ACCOUNT= ygrek
+GH_PROJECT= ocaml-extlib
+GH_TAGNAME= ${VERSION}
+DISTNAME = ${GH_PROJECT}-${VERSION}
+PKGNAME= ocaml-extlib-${VERSION}
HOMEPAGE= https://github.com/ygrek/ocaml-extlib
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= https://ocaml-extlib.googlecode.com/files/
-
MODULES= lang/ocaml
-BUILD_DEPENDS= sysutils/findlib \
- lang/ocaml-camlp4
+BUILD_DEPENDS= sysutils/findlib devel/ocaml-cppo
USE_GMAKE = Yes
NO_TEST= Yes
-ALL_TARGET = doc all
-
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mocaml_native}
-ALL_TARGET += opt
-. if ${PROPERTIES:Mocaml_native_dynlink}
-ALL_TARGET += cmxs
-. endif
+ALL_TARGET = build doc
+.else
+ALL_TARGET = all doc
.endif
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-extlib
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-extlib/html
- ${INSTALL_DATA} ${WRKDIST}/doc/* \
+ ${INSTALL_DATA} ${WRKDIST}/src/doc/* \
${PREFIX}/share/doc/ocaml-extlib/html/
- ${INSTALL_DATA} ${WRKDIST}/{README.txt,LICENSE} \
+ ${INSTALL_DATA} ${WRKDIST}/{README,LICENSE} \
${PREFIX}/share/doc/ocaml-extlib/
.include <bsd.port.mk>
Index: devel/ocaml-extlib/distinfo
===================================================================
RCS file: /cvs/ports/devel/ocaml-extlib/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/ocaml-extlib/distinfo 4 Sep 2014 07:43:56 -0000 1.2
+++ devel/ocaml-extlib/distinfo 6 Jul 2016 01:16:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (extlib-1.6.1.tar.gz) = iNSzY4y02k4E2BuhV+cjXnRDc8V4TPS5BlcNB7iQrso=
-SIZE (extlib-1.6.1.tar.gz) = 72780
+SHA256 (ocaml-extlib-1.7.0.tar.gz) =
PJ/RWaTsQBVZkF+W5XgxekkzRSztmn86T4n5xxMNmmM=
+SIZE (ocaml-extlib-1.7.0.tar.gz) = 83327
Index: devel/ocaml-extlib/pkg/PFRAG.native
===================================================================
RCS file: /cvs/ports/devel/ocaml-extlib/pkg/PFRAG.native,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.native
--- devel/ocaml-extlib/pkg/PFRAG.native 4 Sep 2014 07:43:56 -0000 1.2
+++ devel/ocaml-extlib/pkg/PFRAG.native 6 Jul 2016 18:21:59 -0000
@@ -7,6 +7,7 @@ lib/ocaml/extlib/dllist.cmx
lib/ocaml/extlib/dynArray.cmx
lib/ocaml/extlib/enum.cmx
lib/ocaml/extlib/extArray.cmx
+lib/ocaml/extlib/extBuffer.cmx
lib/ocaml/extlib/extHashtbl.cmx
lib/ocaml/extlib/extLib.a
lib/ocaml/extlib/extLib.cmx
Index: devel/ocaml-extlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ocaml-extlib/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/ocaml-extlib/pkg/PLIST 4 Sep 2014 07:43:56 -0000 1.3
+++ devel/ocaml-extlib/pkg/PLIST 6 Jul 2016 18:23:14 -0000
@@ -16,6 +16,10 @@ lib/ocaml/extlib/enum.cmi
lib/ocaml/extlib/enum.mli
lib/ocaml/extlib/extArray.cmi
lib/ocaml/extlib/extArray.mli
+lib/ocaml/extlib/extBuffer.cmi
+lib/ocaml/extlib/extBuffer.mli
+lib/ocaml/extlib/extBytes.cmi
+lib/ocaml/extlib/extBytes.mli
lib/ocaml/extlib/extHashtbl.cmi
lib/ocaml/extlib/extHashtbl.mli
lib/ocaml/extlib/extLib.cma
@@ -44,7 +48,7 @@ lib/ocaml/extlib/unzip.cmi
lib/ocaml/extlib/unzip.mli
share/doc/ocaml-extlib/
share/doc/ocaml-extlib/LICENSE
-share/doc/ocaml-extlib/README.txt
+share/doc/ocaml-extlib/README
share/doc/ocaml-extlib/html/
share/doc/ocaml-extlib/html/Base64.html
share/doc/ocaml-extlib/html/BitSet.html
@@ -53,9 +57,14 @@ share/doc/ocaml-extlib/html/DynArray.htm
share/doc/ocaml-extlib/html/Enum.html
share/doc/ocaml-extlib/html/ExtArray.Array.html
share/doc/ocaml-extlib/html/ExtArray.html
+share/doc/ocaml-extlib/html/ExtBuffer.Buffer.html
+share/doc/ocaml-extlib/html/ExtBuffer.html
+share/doc/ocaml-extlib/html/ExtBytes.Bytes.html
+share/doc/ocaml-extlib/html/ExtBytes.html
share/doc/ocaml-extlib/html/ExtHashtbl.Hashtbl.html
share/doc/ocaml-extlib/html/ExtHashtbl.html
share/doc/ocaml-extlib/html/ExtLib.Array.html
+share/doc/ocaml-extlib/html/ExtLib.Buffer.html
share/doc/ocaml-extlib/html/ExtLib.Hashtbl.html
share/doc/ocaml-extlib/html/ExtLib.List.html
share/doc/ocaml-extlib/html/ExtLib.String.html
@@ -104,9 +113,14 @@ share/doc/ocaml-extlib/html/type_DynArra
share/doc/ocaml-extlib/html/type_Enum.html
share/doc/ocaml-extlib/html/type_ExtArray.Array.html
share/doc/ocaml-extlib/html/type_ExtArray.html
+share/doc/ocaml-extlib/html/type_ExtBuffer.Buffer.html
+share/doc/ocaml-extlib/html/type_ExtBuffer.html
+share/doc/ocaml-extlib/html/type_ExtBytes.Bytes.html
+share/doc/ocaml-extlib/html/type_ExtBytes.html
share/doc/ocaml-extlib/html/type_ExtHashtbl.Hashtbl.html
share/doc/ocaml-extlib/html/type_ExtHashtbl.html
share/doc/ocaml-extlib/html/type_ExtLib.Array.html
+share/doc/ocaml-extlib/html/type_ExtLib.Buffer.html
share/doc/ocaml-extlib/html/type_ExtLib.Hashtbl.html
share/doc/ocaml-extlib/html/type_ExtLib.List.html
share/doc/ocaml-extlib/html/type_ExtLib.String.html
Index: sysutils/opam/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/opam/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- sysutils/opam/Makefile 5 Jul 2016 16:24:46 -0000 1.8
+++ sysutils/opam/Makefile 6 Jul 2016 13:54:24 -0000
@@ -12,7 +12,7 @@ GH_ACCOUNT = ocaml
GH_PROJECT = opam
GH_TAGNAME = ${V}
DISTNAME = ${GH_PROJECT}-${V}
-REVISION = 1
+REVISION = 2
PKGNAME-main = opam-${V}
PKGNAME-lib = opam-lib-${V}
