From owner-dev-commits-ports-main@freebsd.org Sun Sep 26 11:15:16 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4359D676409; Sun, 26 Sep 2021 11:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HHNTw16bXz3l7H; Sun, 26 Sep 2021 11:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 05FE71C931; Sun, 26 Sep 2021 11:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18QBFFKv036389; Sun, 26 Sep 2021 11:15:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18QBFFSx036388; Sun, 26 Sep 2021 11:15:15 GMT (envelope-from git) Date: Sun, 26 Sep 2021 11:15:15 GMT Message-Id: <202109261115.18QBFFSx036388@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 2dd72cdfb1bf - main - converters/ocaml-jsonm: update the port to version 1.0.1 and MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2dd72cdfb1bf63935b02d047b626ff4ce60012ba Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Sep 2021 11:15:16 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=2dd72cdfb1bf63935b02d047b626ff4ce60012ba commit 2dd72cdfb1bf63935b02d047b626ff4ce60012ba Author: Alexey Dokuchaev AuthorDate: 2021-09-26 11:14:08 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-09-26 11:14:09 +0000 converters/ocaml-jsonm: update the port to version 1.0.1 and - Chase HTTP/1.1 301 redirection when fetching the distfile - Update license (ISCL), assume maintainership of the port - Use provided build scripts instead of performing it manually - Convert to static pkg-plist, 16 lines don't warrant dynamic devel/ocaml-uutf: (required) update the port to version 1.0.2 and make changes similar to the above; devel/ocaml-topkg: call `do-build' recipe in ${BUILD_WRKSRC}. --- converters/ocaml-jsonm/Makefile | 32 +++++++++++++++++++------------- converters/ocaml-jsonm/distinfo | 5 +++-- converters/ocaml-jsonm/pkg-plist | 16 ++++++++++++++++ devel/ocaml-topkg/Makefile | 2 +- devel/ocaml-uutf/Makefile | 27 ++++++++++++++++----------- devel/ocaml-uutf/distinfo | 5 +++-- devel/ocaml-uutf/pkg-plist | 14 ++++++++++++++ 7 files changed, 72 insertions(+), 29 deletions(-) diff --git a/converters/ocaml-jsonm/Makefile b/converters/ocaml-jsonm/Makefile index 4ebc60463543..80bb4c11e6eb 100644 --- a/converters/ocaml-jsonm/Makefile +++ b/converters/ocaml-jsonm/Makefile @@ -1,35 +1,41 @@ # Created by: Veniamin Gvozdikov PORTNAME= jsonm -PORTVERSION= 0.9.1 +PORTVERSION= 1.0.1 CATEGORIES= converters -MASTER_SITES= http://erratique.ch/software/jsonm/releases/ +MASTER_SITES= https://erratique.ch/software/jsonm/releases/ PKGNAMEPREFIX= ocaml- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= Non-blocking streaming JSON codec for OCaml -LICENSE= BSD3CLAUSE +LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf -BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild -RUN_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild \ + opam-installer:devel/ocaml-opam \ + ${SA_DIR}/topkg/META:devel/ocaml-topkg \ + ${SA_DIR}/uchar/META:devel/ocaml-uchar \ + ${SA_DIR}/uutf/META:devel/ocaml-uutf +RUN_DEPENDS= ${SA_DIR}/uchar/META:devel/ocaml-uchar \ + ${SA_DIR}/uutf/META:devel/ocaml-uutf USES= tar:tbz USE_OCAML= yes SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} USE_OCAML_FINDLIB= yes -USE_OCAMLFIND_PLIST= yes USE_OCAML_LDCONFIG= yes +OPTIONS_DEFINE= DOCS + do-build: - cd ${WRKSRC} && ocamlbuild src/jsonm.cmxs src/jsonm.cma src/jsonm.a + cd ${BUILD_WRKSRC} && ocaml pkg/pkg.ml build do-install: - ${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}/jsonm - cd ${WRKSRC} && ocamlfind install -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib jsonm src/META _build/src/jsonm.a _build/src/jsonm.cma _build/src/jsonm.cmi _build/src/jsonm.cmx _build/src/jsonm.cmxa _build/src/jsonm.cmxs _build/src/jsonm.mli - ${INSTALL_LIB} ${WRKSRC}/_build/src/jsonm.cmxs \ - ${STAGEDIR}${OCAMLFIND_DESTDIR}/jsonm + cd ${INSTALL_WRKSRC} && opam-installer -i \ + --prefix=${STAGEDIR}${PREFIX} \ + --docdir=${OCAML_DOCSDIR:S,^${PREFIX}/,,} \ + --libdir=${OCAML_SITELIBDIR} ${PORTNAME}.install .include diff --git a/converters/ocaml-jsonm/distinfo b/converters/ocaml-jsonm/distinfo index e76db4733fc3..198e1dab92bc 100644 --- a/converters/ocaml-jsonm/distinfo +++ b/converters/ocaml-jsonm/distinfo @@ -1,2 +1,3 @@ -SHA256 (jsonm-0.9.1.tbz) = 3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73 -SIZE (jsonm-0.9.1.tbz) = 64843 +TIMESTAMP = 1632410748 +SHA256 (jsonm-1.0.1.tbz) = 3c09562ed43b617d8b6d9522a249ff770228e7d6de9f9508b72e84d52b6be684 +SIZE (jsonm-1.0.1.tbz) = 21608 diff --git a/converters/ocaml-jsonm/pkg-plist b/converters/ocaml-jsonm/pkg-plist new file mode 100644 index 000000000000..97b64489f21b --- /dev/null +++ b/converters/ocaml-jsonm/pkg-plist @@ -0,0 +1,16 @@ +bin/jsontrip +%%OCAML_SITELIBDIR%%/jsonm/META +%%OCAML_SITELIBDIR%%/jsonm/jsonm.a +%%OCAML_SITELIBDIR%%/jsonm/jsonm.cma +%%OCAML_SITELIBDIR%%/jsonm/jsonm.cmi +%%OCAML_SITELIBDIR%%/jsonm/jsonm.cmti +%%OCAML_SITELIBDIR%%/jsonm/jsonm.cmx +%%OCAML_SITELIBDIR%%/jsonm/jsonm.cmxa +%%OCAML_SITELIBDIR%%/jsonm/jsonm.cmxs +%%OCAML_SITELIBDIR%%/jsonm/jsonm.mli +%%OCAML_SITELIBDIR%%/jsonm/opam +%%PORTDOCS%%share/doc/ocaml/jsonm/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/jsonm/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/jsonm/README.md +%%PORTDOCS%%share/doc/ocaml/jsonm/examples.ml +%%PORTDOCS%%share/doc/ocaml/jsonm/jtree.ml diff --git a/devel/ocaml-topkg/Makefile b/devel/ocaml-topkg/Makefile index 2b5ad56548ad..5fc8b0872af1 100644 --- a/devel/ocaml-topkg/Makefile +++ b/devel/ocaml-topkg/Makefile @@ -22,7 +22,7 @@ USE_OCAML_FINDLIB= yes OPTIONS_DEFINE= DOCS do-build: - cd ${WRKSRC} && ocaml pkg/pkg.ml build + cd ${BUILD_WRKSRC} && ocaml pkg/pkg.ml build do-install: cd ${INSTALL_WRKSRC} && opam-installer -i \ diff --git a/devel/ocaml-uutf/Makefile b/devel/ocaml-uutf/Makefile index 8a782cf50ce2..1dd5c914d5f3 100644 --- a/devel/ocaml-uutf/Makefile +++ b/devel/ocaml-uutf/Makefile @@ -1,32 +1,37 @@ # Created by: Veniamin Gvozdikov PORTNAME= uutf -PORTVERSION= 0.9.4 +PORTVERSION= 1.0.2 CATEGORIES= devel -MASTER_SITES= http://erratique.ch/software/uutf/releases/ +MASTER_SITES= https://erratique.ch/software/uutf/releases/ PKGNAMEPREFIX= ocaml- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= Non-blocking streaming Unicode codec for OCaml -LICENSE= BSD3CLAUSE +LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild +BUILD_DEPENDS+= opam-installer:devel/ocaml-opam \ + ${LOCALBASE}/${OCAML_SITELIBDIR}/cmdliner/META:devel/ocaml-cmdliner \ + ${LOCALBASE}/${OCAML_SITELIBDIR}/topkg/META:devel/ocaml-topkg \ + ${LOCALBASE}/${OCAML_SITELIBDIR}/uchar/META:devel/ocaml-uchar USES= tar:tbz USE_OCAML= yes - USE_OCAML_FINDLIB= yes -USE_OCAMLFIND_PLIST= yes USE_OCAML_LDCONFIG= yes +OPTIONS_DEFINE= DOCS + do-build: - cd ${WRKSRC} && ocamlbuild uutf.cmxs uutf.cma uutf.a + cd ${BUILD_WRKSRC} && ocaml pkg/pkg.ml build do-install: - ${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}/uutf - cd ${WRKSRC} && ocamlfind install -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib uutf pkg/META _build/src/uutf.a _build/src/uutf.cma _build/src/uutf.cmi _build/src/uutf.cmx _build/src/uutf.cmxa _build/src/uutf.cmxs _build/src/uutf.mli - ${INSTALL_LIB} ${WRKSRC}/_build/src/uutf.cmxs \ - ${STAGEDIR}${OCAMLFIND_DESTDIR}/uutf + cd ${INSTALL_WRKSRC} && opam-installer -i \ + --prefix=${STAGEDIR}${PREFIX} \ + --docdir=${OCAML_DOCSDIR:S,^${PREFIX}/,,} \ + --libdir=${OCAML_SITELIBDIR} ${PORTNAME}.install .include diff --git a/devel/ocaml-uutf/distinfo b/devel/ocaml-uutf/distinfo index dadbedfcb0c5..948227b29685 100644 --- a/devel/ocaml-uutf/distinfo +++ b/devel/ocaml-uutf/distinfo @@ -1,2 +1,3 @@ -SHA256 (uutf-0.9.4.tbz) = 13706722a0037b167eef359bac68d5426d05f64aa308f44c1784aace9577e1b8 -SIZE (uutf-0.9.4.tbz) = 36987 +TIMESTAMP = 1630879713 +SHA256 (uutf-1.0.2.tbz) = e61a81f535e535b8772aa8ec4950939dd588b9337d4c9fec9743483c3ccda1db +SIZE (uutf-1.0.2.tbz) = 22420 diff --git a/devel/ocaml-uutf/pkg-plist b/devel/ocaml-uutf/pkg-plist new file mode 100644 index 000000000000..3cb41f6192f2 --- /dev/null +++ b/devel/ocaml-uutf/pkg-plist @@ -0,0 +1,14 @@ +bin/utftrip +%%OCAML_SITELIBDIR%%/uutf/META +%%OCAML_SITELIBDIR%%/uutf/opam +%%OCAML_SITELIBDIR%%/uutf/uutf.a +%%OCAML_SITELIBDIR%%/uutf/uutf.cma +%%OCAML_SITELIBDIR%%/uutf/uutf.cmi +%%OCAML_SITELIBDIR%%/uutf/uutf.cmti +%%OCAML_SITELIBDIR%%/uutf/uutf.cmx +%%OCAML_SITELIBDIR%%/uutf/uutf.cmxa +%%OCAML_SITELIBDIR%%/uutf/uutf.cmxs +%%OCAML_SITELIBDIR%%/uutf/uutf.mli +%%PORTDOCS%%share/doc/ocaml/uutf/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/uutf/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/uutf/README.md