devel/ocaml-findlib: the port had been updated to version 1.8.1

- This is not the latest version, but this step lubricates coming
  next phase of our OCaml stack update
- Since we're post-4.06 now, remove support for Num library which
  is a separate port/package
- Detect optionally installed libraries and adjust the packaging
  list accordingly
- Spell `Tk' correctly in the TOOLBOX option description

PR:	238904, 262791

5 files changed, 13 insertions, 30 deletions

diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index e9d8817fd437..89149dcb09d3 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,7 +1,7 @@
 # Created by: ijliao
 
 PORTNAME=	findlib
-PORTVERSION=	1.7.3
+PORTVERSION=	1.8.1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
@@ -27,18 +27,11 @@ MAKE_JOBS_UNSAFE=	yes
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 PORTDOCS=	*
 
-# Num library is not part of OCaml core since v4.06
-.if exists(${LOCALBASE}/lib/ocaml/num.cmi)
-PLIST_SUB+=	NUM=""
-.else
-PLIST_SUB+=	NUM="@comment "
-.endif
-
 OPTIONS_DEFINE=	TOOLBOX DOCS
 OPTIONS_DEFAULT=TOOLBOX
 OPTIONS_SUB=	yes
 
-TOOLBOX_DESC=	Include toolbox interface (requires OCaml with TK)
+TOOLBOX_DESC=	Include toolbox interface (requires OCaml with Tk)
 TOOLBOX_CONFIGURE_ON=	-with-toolbox
 TOOLBOX_RUN_DEPENDS=	labltk:x11-toolkits/ocaml-labltk
 TOOLBOX_BUILD_DEPENDS=	${TOOLBOX_RUN_DEPENDS}
@@ -51,6 +44,12 @@ post-install:
 	    ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \
 	    ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \
 	    ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs
+.if !exists(${LOCALBASE}/lib/ocaml/graphics.cmi)
+	@${REINPLACE_CMD} -e '/graphics\/META/d' ${TMPPLIST}
+.endif
+.if !exists(${LOCALBASE}/lib/ocaml/ocamlbuild/ocamlbuildlib.cma)
+	@${REINPLACE_CMD} -e '/ocamlbuild\/META/d' ${TMPPLIST}
+.endif
 # Spacetime profiling is only available for native code on 64-bit targets
 .if ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpcspe
 	@${REINPLACE_CMD} -e '/raw_spacetime/d' ${TMPPLIST}
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index 967f18478c77..f83e1fbb2219 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496673173
-SHA256 (findlib-1.7.3.tar.gz) = d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b
-SIZE (findlib-1.7.3.tar.gz) = 257703
+TIMESTAMP = 1564402014
+SHA256 (findlib-1.8.1.tar.gz) = 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
+SIZE (findlib-1.8.1.tar.gz) = 261544
diff --git a/devel/ocaml-findlib/files/patch-configure b/devel/ocaml-findlib/files/patch-configure
deleted file mode 100644
index 4b41a7aba575..000000000000
--- a/devel/ocaml-findlib/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	2016-11-18 13:04:45 UTC
-+++ configure
-@@ -516,7 +516,8 @@ fi
- 
- # bytes?
- 
--if [ -f "${ocaml_core_stdlib}/bytes.cmi" ]; then
-+if [ -f "${ocaml_core_stdlib}/bytes.cmi" -o \
-+     -f "${ocaml_core_stdlib}/stdlib__bytes.cmi" ]; then
-     echo "bytes: found, installing fake library"
-     lbytes="bytes"
-     cbytes=0
diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile
index ed355991105d..b370954773a3 100644
--- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile
+++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile
@@ -18,7 +18,7 @@
 +	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
 +	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
- 	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
+ 	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
 -	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +	cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
  	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist
index f9614c2d3703..fe8db7125078 100644
--- a/devel/ocaml-findlib/pkg-plist
+++ b/devel/ocaml-findlib/pkg-plist
@@ -35,11 +35,7 @@ bin/safe_camlp4
 %%OCAML_SITELIBDIR%%/findlib/topfind.mli
 %%OCAML_SITELIBDIR%%/graphics/META
 %%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META
-%%NUM%%%%OCAML_SITELIBDIR%%/num-top/META
-%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cma
-%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cmi
-%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
-%%NUM%%%%OCAML_SITELIBDIR%%/num/META
+%%OCAML_SITELIBDIR%%/ocamlbuild/META
 %%OCAML_SITELIBDIR%%/ocamldoc/META
 %%OCAML_SITELIBDIR%%/raw_spacetime/META
 %%OCAML_SITELIBDIR%%/stdlib/META