diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile
index d88f368c3509..7ba5ff4b58f7 100644
--- a/devel/ocaml-pomap/Makefile
+++ b/devel/ocaml-pomap/Makefile
@@ -1,51 +1,40 @@
 # Created by: Stanislav Sedov <ssedov@mbsd.msk.ru>
 
 PORTNAME=	pomap
-PORTVERSION=	3.0.7
-DISTVERSIONPREFIX=	v
+PORTVERSION=	4.1.1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml library to maintain a list of partially ordered elements
 
-LICENSE=	LGPL20+ # source says LGPL20+, COPYING says LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING.txt
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
+BUILD_DEPENDS=	dune:devel/ocaml-dune
 
+USE_OCAML=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmottl
 
-USE_OCAML=	yes
-USE_OCAML_FINDLIB=yes
-USE_OCAMLFIND_PLIST=yes
-USE_OCAML_WASH=	yes
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples
-MAKE_JOBS_UNSAFE=yes
-
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
 
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
+do-build:
+	cd ${BUILD_WRKSRC} && dune build --verbose
+
+do-install:
+	cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \
+		--libdir=${OCAML_SITELIBDIR}
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/pomap/pomap.cmxs
 
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in AUTHORS.txt CHANGES.txt README.md
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-pomap/distinfo b/devel/ocaml-pomap/distinfo
index afe09c4d552a..b7451784de48 100644
--- a/devel/ocaml-pomap/distinfo
+++ b/devel/ocaml-pomap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490892782
-SHA256 (mmottl-pomap-v3.0.7_GH0.tar.gz) = a67e25d2e7cb80ab52f18cf9bb6cbf098c25ff28dfd01e7bab8d7d0e50266464
-SIZE (mmottl-pomap-v3.0.7_GH0.tar.gz) = 80880
+TIMESTAMP = 1540494266
+SHA256 (mmottl-pomap-4.1.1_GH0.tar.gz) = 3e22f7a5272b6319f24127fe22b93a589652512223666d625508bd5ef541a000
+SIZE (mmottl-pomap-4.1.1_GH0.tar.gz) = 32792
diff --git a/devel/ocaml-pomap/pkg-plist b/devel/ocaml-pomap/pkg-plist
new file mode 100644
index 000000000000..72e231cc5f0e
--- /dev/null
+++ b/devel/ocaml-pomap/pkg-plist
@@ -0,0 +1,55 @@
+%%OCAML_SITELIBDIR%%/pomap/META
+%%OCAML_SITELIBDIR%%/pomap/display_hasse_impl.ml
+%%OCAML_SITELIBDIR%%/pomap/display_hasse_impl.mli
+%%OCAML_SITELIBDIR%%/pomap/display_hasse_intf.ml
+%%OCAML_SITELIBDIR%%/pomap/dune-package
+%%OCAML_SITELIBDIR%%/pomap/opam
+%%OCAML_SITELIBDIR%%/pomap/pomap.a
+%%OCAML_SITELIBDIR%%/pomap/pomap.cma
+%%OCAML_SITELIBDIR%%/pomap/pomap.cmi
+%%OCAML_SITELIBDIR%%/pomap/pomap.cmt
+%%OCAML_SITELIBDIR%%/pomap/pomap.cmx
+%%OCAML_SITELIBDIR%%/pomap/pomap.cmxa
+%%OCAML_SITELIBDIR%%/pomap/pomap.cmxs
+%%OCAML_SITELIBDIR%%/pomap/pomap.ml
+%%OCAML_SITELIBDIR%%/pomap/pomap__Display_hasse_impl.cmi
+%%OCAML_SITELIBDIR%%/pomap/pomap__Display_hasse_impl.cmt
+%%OCAML_SITELIBDIR%%/pomap/pomap__Display_hasse_impl.cmti
+%%OCAML_SITELIBDIR%%/pomap/pomap__Display_hasse_impl.cmx
+%%OCAML_SITELIBDIR%%/pomap/pomap__Display_hasse_intf.cmi
+%%OCAML_SITELIBDIR%%/pomap/pomap__Display_hasse_intf.cmt
+%%OCAML_SITELIBDIR%%/pomap/pomap__Display_hasse_intf.cmx
+%%OCAML_SITELIBDIR%%/pomap/pomap__Pomap_impl.cmi
+%%OCAML_SITELIBDIR%%/pomap/pomap__Pomap_impl.cmt
+%%OCAML_SITELIBDIR%%/pomap/pomap__Pomap_impl.cmti
+%%OCAML_SITELIBDIR%%/pomap/pomap__Pomap_impl.cmx
+%%OCAML_SITELIBDIR%%/pomap/pomap__Pomap_intf.cmi
+%%OCAML_SITELIBDIR%%/pomap/pomap__Pomap_intf.cmt
+%%OCAML_SITELIBDIR%%/pomap/pomap__Pomap_intf.cmx
+%%OCAML_SITELIBDIR%%/pomap/pomap__Ptset.cmi
+%%OCAML_SITELIBDIR%%/pomap/pomap__Ptset.cmt
+%%OCAML_SITELIBDIR%%/pomap/pomap__Ptset.cmti
+%%OCAML_SITELIBDIR%%/pomap/pomap__Ptset.cmx
+%%OCAML_SITELIBDIR%%/pomap/pomap__Store_impl.cmi
+%%OCAML_SITELIBDIR%%/pomap/pomap__Store_impl.cmt
+%%OCAML_SITELIBDIR%%/pomap/pomap__Store_impl.cmti
+%%OCAML_SITELIBDIR%%/pomap/pomap__Store_impl.cmx
+%%OCAML_SITELIBDIR%%/pomap/pomap__Store_intf.cmi
+%%OCAML_SITELIBDIR%%/pomap/pomap__Store_intf.cmt
+%%OCAML_SITELIBDIR%%/pomap/pomap__Store_intf.cmx
+%%OCAML_SITELIBDIR%%/pomap/pomap_impl.ml
+%%OCAML_SITELIBDIR%%/pomap/pomap_impl.mli
+%%OCAML_SITELIBDIR%%/pomap/pomap_intf.ml
+%%OCAML_SITELIBDIR%%/pomap/ptset.ml
+%%OCAML_SITELIBDIR%%/pomap/ptset.mli
+%%OCAML_SITELIBDIR%%/pomap/store_impl.ml
+%%OCAML_SITELIBDIR%%/pomap/store_impl.mli
+%%OCAML_SITELIBDIR%%/pomap/store_intf.ml
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hasse/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hasse/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hasse/dune
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hasse/hasse.ml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hasse/po_examples.ml