Update to 1.4.1 to fix build with current ocaml.

No (recent) changelog other than github commits.

4 files changed, 15 insertions, 41 deletions

diff --git a/devel/ocaml-yojson/Makefile b/devel/ocaml-yojson/Makefile
index 2408ab302f8..9b2dbece6f2 100644
--- a/devel/ocaml-yojson/Makefile
+++ b/devel/ocaml-yojson/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/01/10 16:53:11 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/11 03:40:12 dholland Exp $
 
 GITHUB_PROJECT=	yojson
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	${GITHUB_PROJECT}-1.3.3
+DISTNAME=	${GITHUB_PROJECT}-1.4.1
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mjambon/}
 
@@ -16,7 +15,7 @@ LICENSE=	modified-bsd
 MAKE_JOBS_SAFE=	no
 USE_TOOLS+=	gmake
 BUILD_TARGET=	META all
-OCAML_USE_FINDLIB=	yes
+OCAML_USE_JBUILDER=	yes
 INSTALLATION_DIRS+=	bin
 
 .include "../../mk/ocaml.mk"
diff --git a/devel/ocaml-yojson/PLIST b/devel/ocaml-yojson/PLIST
index 1f7cd4d824a..2bfc54c9c72 100644
--- a/devel/ocaml-yojson/PLIST
+++ b/devel/ocaml-yojson/PLIST
@@ -1,30 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2017/07/15 10:13:59 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/03/11 03:40:12 dholland Exp $
 ${PLIST.ocaml-opt}bin/ydump
 ${OCAML_SITELIB}/yojson/META
-${OCAML_SITELIB}/yojson/common.mli
-${OCAML_SITELIB}/yojson/pretty.mli
-${OCAML_SITELIB}/yojson/read.mli
-${OCAML_SITELIB}/yojson/safe.mli
-${OCAML_SITELIB}/yojson/util.mli
-${OCAML_SITELIB}/yojson/write.mli
-${OCAML_SITELIB}/yojson/write2.mli
-${OCAML_SITELIB}/yojson/ydump.cmi
-${OCAML_SITELIB}/yojson/ydump.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/ydump.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/ydump.o
+${OCAML_SITELIB}/yojson/opam
+${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson.a
+${OCAML_SITELIB}/yojson/yojson.cma
 ${OCAML_SITELIB}/yojson/yojson.cmi
-${OCAML_SITELIB}/yojson/yojson.cmo
 ${OCAML_SITELIB}/yojson/yojson.cmt
 ${OCAML_SITELIB}/yojson/yojson.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson.cmxs
 ${OCAML_SITELIB}/yojson/yojson.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson.o
 ${OCAML_SITELIB}/yojson/yojson_biniou.cmi
-${OCAML_SITELIB}/yojson/yojson_biniou.cmo
 ${OCAML_SITELIB}/yojson/yojson_biniou.cmt
 ${OCAML_SITELIB}/yojson/yojson_biniou.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson_biniou.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson_biniou.cmxs
 ${OCAML_SITELIB}/yojson/yojson_biniou.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson_biniou.o
+share/doc/yojson/LICENSE
+share/doc/yojson/README.md
diff --git a/devel/ocaml-yojson/distinfo b/devel/ocaml-yojson/distinfo
index d5e9faf9891..1e323b221b1 100644
--- a/devel/ocaml-yojson/distinfo
+++ b/devel/ocaml-yojson/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2017/07/15 10:13:59 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2018/03/11 03:40:12 dholland Exp $
 
-SHA1 (yojson-1.3.3.tar.gz) = 7b8cb2fff4142ac9aed0be5d3cdb32cc00fdd703
-RMD160 (yojson-1.3.3.tar.gz) = 3dda76543700b860deee42ab144e783c504f5eb0
-SHA512 (yojson-1.3.3.tar.gz) = 78d88d470bb64360d020ebc70d9faaa7abca6476fd20d0224e188b44d147c42cea8723adff0845e5444d684b2d0e186154cca288cb236de94a83a44229fcb426
-Size (yojson-1.3.3.tar.gz) = 26940 bytes
-SHA1 (patch-Makefile) = 5bd051290078ddbcf98b2024d3e2fda06de0dd23
+SHA1 (yojson-1.4.1.tar.gz) = 0b205a9c41f056161a22a4da641a166373c3c853
+RMD160 (yojson-1.4.1.tar.gz) = 2b24af1166701bbb585fc271ec5a9a9848afbd9d
+SHA512 (yojson-1.4.1.tar.gz) = 9175f2a26993467e587a44ef8af9dba767370536204f0ec56196769c206f92edc27bdfa89b543f90ed33c8a9abaad3342b5296ac5e49d3d7a27561c1cce818d0
+Size (yojson-1.4.1.tar.gz) = 25646 bytes
diff --git a/devel/ocaml-yojson/patches/patch-Makefile b/devel/ocaml-yojson/patches/patch-Makefile
deleted file mode 100644
index 1cd5bf88375..00000000000
--- a/devel/ocaml-yojson/patches/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2017/07/15 10:13:59 jaapb Exp $
-
-Install ydump properly
---- Makefile.orig	2016-10-26 23:44:34.000000000 +0000
-+++ Makefile
-@@ -30,7 +30,7 @@ META: META.in Makefile
- 	sed -e 's:@@VERSION@@:$(VERSION):' META.in > META
- 
- install: META install-lib
--	test ! -f ydump$(EXE) || cp ydump $(BINDIR)/
-+	test ! -f ydump$(EXE) || $(BSD_INSTALL_PROGRAM) ydump $(DESTDIR)$(BINDIR)/
- 
- install-lib:
- 	ocamlfind install yojson META \