git: 5e8a5384cf90 - main - devel/ocaml-cmdliner: fix installation + other minor changes

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5e8a5384cf90a310e4deeaa11a2d71d025c0ffc0

commit 5e8a5384cf90a310e4deeaa11a2d71d025c0ffc0
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-09-17 17:12:06 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-09-17 17:12:08 +0000

    devel/ocaml-cmdliner: fix installation + other minor changes
    
    - Chase HTTP/1.1 301 redirection when fetching the distfile
    - Reword the COMMENT and assume maintainership of the port
    - Packages are installed in their dedicated subdirectory under
      ${OCAML_SITELIBDIR}, not the ${OCAML_SITELIBDIR} itself
---
 devel/ocaml-cmdliner/Makefile  |  9 +++++----
 devel/ocaml-cmdliner/pkg-plist | 40 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile
index 9a47cf5b5bbb..4a7211db04c9 100644
--- a/devel/ocaml-cmdliner/Makefile
+++ b/devel/ocaml-cmdliner/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	cmdliner
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://erratique.ch/software/cmdliner/releases/
+MASTER_SITES=	https://erratique.ch/software/cmdliner/releases/
 PKGNAMEPREFIX=	ocaml-
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	OCaml module for handling of command line interfaces
+MAINTAINER=	danfe at FreeBSD.org
+COMMENT=	OCaml module for handling command-line interfaces
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
@@ -15,7 +16,7 @@ USE_OCAML=		yes
 USE_OCAML_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	tes
 MAKE_ARGS=	DOCDIR=${STAGEDIR}${OCAML_DOCSDIR}/${PORTNAME} \
-		LIBDIR=${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
+		LIBDIR=${STAGEDIR}${PREFIX}/${OCAML_LDLIBS}
 INSTALL_TARGET=	install
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/ocaml-cmdliner/pkg-plist b/devel/ocaml-cmdliner/pkg-plist
index 23bcc1230969..da30a14a730a 100644
--- a/devel/ocaml-cmdliner/pkg-plist
+++ b/devel/ocaml-cmdliner/pkg-plist
@@ -1,23 +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
+%%OCAML_SITELIBDIR%%/cmdliner/META
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner.a
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner.cma
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner.cmi
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner.cmti
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner.cmxa
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner.cmxs
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner.mli
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_arg.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_base.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_cline.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_docgen.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_info.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_manpage.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_msg.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_suggest.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_term.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/cmdliner_trie.cmx
+%%OCAML_SITELIBDIR%%/cmdliner/opam
 %%PORTDOCS%%share/doc/ocaml/cmdliner/CHANGES.md
 %%PORTDOCS%%share/doc/ocaml/cmdliner/LICENSE.md
 %%PORTDOCS%%share/doc/ocaml/cmdliner/README.md