diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile
index f3cad26e7a20..9a47cf5b5bbb 100644
--- a/devel/ocaml-cmdliner/Makefile
+++ b/devel/ocaml-cmdliner/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cmdliner
-PORTVERSION=	0.9.8
+PORTVERSION=	1.0.4
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/cmdliner/releases/
 PKGNAMEPREFIX=	ocaml-
@@ -7,23 +7,18 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml module for handling of command line interfaces
 
-LICENSE=	BSD3CLAUSE
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
-
-USES=			tar:tbz
+USES=		gmake tar:tbz
 USE_OCAML=		yes
-USE_OCAML_FINDLIB=	yes
-USE_OCAMLFIND_PLIST=	yes
 USE_OCAML_LDCONFIG=	yes
+MAKE_JOBS_UNSAFE=	tes
+MAKE_ARGS=	DOCDIR=${STAGEDIR}${OCAML_DOCSDIR}/${PORTNAME} \
+		LIBDIR=${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
+INSTALL_TARGET=	install
 
-do-build:
-	cd ${WRKSRC} && ocamlbuild cmdliner.cmxs cmdliner.cma cmdliner.a
-
-do-install:
-	${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}/cmdliner
-	cd ${WRKSRC} && ocamlfind install -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib cmdliner pkg/META _build/src/cmdliner.a _build/src/cmdliner.cma _build/src/cmdliner.cmi _build/src/cmdliner.cmx _build/src/cmdliner.cmxa _build/src/cmdliner.cmxs _build/src/cmdliner.mli
-	${INSTALL_LIB} ${WRKSRC}/_build/src/cmdliner.cmxs \
-		${STAGEDIR}${OCAMLFIND_DESTDIR}/cmdliner
+OPTIONS_DEFINE=	DOCS
+DOCS_INSTALL_TARGET=	install-doc
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-cmdliner/distinfo b/devel/ocaml-cmdliner/distinfo
index 55a0c8525b4b..d6e2a89a5fb9 100644
--- a/devel/ocaml-cmdliner/distinfo
+++ b/devel/ocaml-cmdliner/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cmdliner-0.9.8.tbz) = 7dfaafdd88ec9d96abf8ded4c0ea7111948194400220a56e4bb44a1edfa4bd41
-SIZE (cmdliner-0.9.8.tbz) = 53249
+TIMESTAMP = 1602549970
+SHA256 (cmdliner-1.0.4.tbz) = 5c2a93d44af8a38996a2c0f80fbd7970fe4751f104be470cafa069353fc004c0
+SIZE (cmdliner-1.0.4.tbz) = 49558
diff --git a/devel/ocaml-cmdliner/pkg-plist b/devel/ocaml-cmdliner/pkg-plist
new file mode 100644
index 000000000000..23bcc1230969
--- /dev/null
+++ b/devel/ocaml-cmdliner/pkg-plist
@@ -0,0 +1,23 @@
+%%OCAML_SITELIBDIR%%/META
+%%OCAML_SITELIBDIR%%/cmdliner.a
+%%OCAML_SITELIBDIR%%/cmdliner.cma
+%%OCAML_SITELIBDIR%%/cmdliner.cmi
+%%OCAML_SITELIBDIR%%/cmdliner.cmti
+%%OCAML_SITELIBDIR%%/cmdliner.cmx
+%%OCAML_SITELIBDIR%%/cmdliner.cmxa
+%%OCAML_SITELIBDIR%%/cmdliner.cmxs
+%%OCAML_SITELIBDIR%%/cmdliner.mli
+%%OCAML_SITELIBDIR%%/cmdliner_arg.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_base.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_cline.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_docgen.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_info.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_manpage.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_msg.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_suggest.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_term.cmx
+%%OCAML_SITELIBDIR%%/cmdliner_trie.cmx
+%%OCAML_SITELIBDIR%%/opam
+%%PORTDOCS%%share/doc/ocaml/cmdliner/CHANGES.md
+%%PORTDOCS%%share/doc/ocaml/cmdliner/LICENSE.md
+%%PORTDOCS%%share/doc/ocaml/cmdliner/README.md