CVS commit: pkgsrc/www/eliom

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/eliom
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Mon, 23 May 2022 15:31:34 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Mon May 23 15:31:34 UTC 2022

Modified Files:
        pkgsrc/www/eliom: Makefile PLIST distinfo
        pkgsrc/www/eliom/patches: patch-pkg_build.ml

Log Message:
Updated www/eliom to version 10.0.0.

There are not as many changes as might be expected from the large
version increase; mostly compatibility updates and minor fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/eliom/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/eliom/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/eliom/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/eliom/patches/patch-pkg_build.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/eliom/Makefile
diff -u pkgsrc/www/eliom/Makefile:1.34 pkgsrc/www/eliom/Makefile:1.35
--- pkgsrc/www/eliom/Makefile:1.34      Mon Mar  8 08:13:08 2021
+++ pkgsrc/www/eliom/Makefile   Mon May 23 15:31:34 2022
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.34 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.35 2022/05/23 15:31:34 jaapb Exp $
 #
 
 GITHUB_PROJECT=        eliom
-DISTNAME=      ${GITHUB_PROJECT}-6.12.4
-PKGREVISION=   1
+DISTNAME=      ${GITHUB_PROJECT}-10.0.0
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
-HOMEPAGE=      http://ocsigen.org/download/
+HOMEPAGE=      http://ocsigen.org/eliom/
 COMMENT=       Dynamic webpage generation library
 LICENSE=       gnu-lgpl-v2.1
 
@@ -17,31 +16,33 @@ USE_LANGUAGES=              c
 OCAML_USE_FINDLIB=     yes
 UNLIMIT_RESOURCES+=    stacksize
 
-DEPENDS+=      ocsigen>=2.16.1:../../www/ocsigen
+DEPENDS+=      ocsigen>=5.0.0:../../www/ocsigen
 
 .include "../../mk/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
-BUILD_TARGET=  all
+BUILD_TARGET=  native
 .else
 BUILD_TARGET=  byte
 .endif
 
 do-install:
-       cd ${WRKSRC} && opam-installer --install --prefix ${DESTDIR}${PREFIX} --libdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR} --docdir ${DESTDIR}${PREFIX}/share/doc eliom.install
+       cd ${WRKSRC} && opaline -install-cmd "${INSTALL_DATA}" \
+       -destdir ${DESTDIR} \
+       -prefix ${PREFIX} \
+       -libdir ${PREFIX}/${OCAML_SITELIBDIR} \
+       -docdir ${PREFIX}/share/doc \
+        eliom.install
 
+.include "../../devel/js_of_ocaml-ocamlbuild/buildlink3.mk"
 .include "../../devel/js_of_ocaml/buildlink3.mk"
 .include "../../devel/ocaml-lwt_log/buildlink3.mk"
 .include "../../devel/ocaml-lwt_ppx/buildlink3.mk"
-.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
-.include "../../devel/ocaml-react/buildlink3.mk"
+.include "../../devel/ocaml-ppx_deriving/buildlink3.mk"
+.include "../../devel/ocaml-ppxlib/buildlink3.mk"
 .include "../../devel/ocaml-reactiveData/buildlink3.mk"
-.include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../misc/ocaml-opam/buildlink3.mk"
-BUILDLINK_DEPMETHOD.ocaml-opam?=    build
+.include "../../devel/ocaml-reactiveData/buildlink3.mk"
+.include "../../misc/ocaml-opaline/buildlink3.mk"
 .include "../../net/ocaml-ipaddr/buildlink3.mk"
-.include "../../net/ocamlnet/buildlink3.mk"
-.include "../../security/ocaml-ssl/buildlink3.mk"
 .include "../../textproc/ocaml-tyxml/buildlink3.mk"
-.include "../../time/ocaml-calendar/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/eliom/PLIST
diff -u pkgsrc/www/eliom/PLIST:1.7 pkgsrc/www/eliom/PLIST:1.8
--- pkgsrc/www/eliom/PLIST:1.7  Tue Apr 21 12:52:06 2020
+++ pkgsrc/www/eliom/PLIST      Mon May 23 15:31:34 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2020/04/21 12:52:06 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/05/23 15:31:34 jaapb Exp $
 bin/eliom-distillery
 bin/eliombuild
 bin/eliomc
@@ -41,6 +41,7 @@ ${OCAML_SITELIB}/eliom/client/eliom_tool
 ${OCAML_SITELIB}/eliom/client/eliom_types.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_unwrap.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_uri.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/client/libeliom_stubs.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.a
 ${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.cma
 ${OCAML_SITELIB}/eliom/ocamlbuild/ocamlbuild_eliom.cmi
@@ -80,6 +81,7 @@ ${OCAML_SITELIB}/eliom/server/eliom_bus.
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_bus.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_client.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_client.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_client_main.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_client_value.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_client_value.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_comet.cmi
@@ -95,8 +97,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_content_.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_content_core.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_content_sigs.cmi
-${OCAML_SITELIB}/eliom/server/eliom_cookie.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_cookie.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_cookies_base.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_cscache.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_cscache.cmx
@@ -189,11 +189,12 @@ ${OCAML_SITELIB}/eliom/templates/basic.p
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/PROJECT_NAME.eliom
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/README
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/static!css!PROJECT_NAME.css
+${OCAML_SITELIB}/stublibs/dlleliom_stubs.so
 man/man1/eliom-distillery.1
 man/man1/eliomc.1
 man/man1/eliomcp.1
 man/man1/eliomdep.1
 man/man1/eliomopt.1
 man/man1/js_of_eliom.1
-share/doc/eliom/CHANGES
-share/doc/eliom/README.md
+share/doc/CHANGES
+share/doc/README.md

Index: pkgsrc/www/eliom/distinfo
diff -u pkgsrc/www/eliom/distinfo:1.19 pkgsrc/www/eliom/distinfo:1.20
--- pkgsrc/www/eliom/distinfo:1.19      Tue Oct 26 11:29:25 2021
+++ pkgsrc/www/eliom/distinfo   Mon May 23 15:31:34 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 11:29:25 nia Exp $
+$NetBSD: distinfo,v 1.20 2022/05/23 15:31:34 jaapb Exp $
 
-BLAKE2s (eliom-6.12.4.tar.gz) = b34505371d3347f4020d226a3048351b57cb649a620f1ac785b417c62d3d8be0
-SHA512 (eliom-6.12.4.tar.gz) = 26aa99c87268830b2cb511091533a0fc007d88dedfd2f1a9d2a99ea19517280e7e87bba7316bf88a8446db17eba839d320c7271fe2fb14d486fa31ae253905b1
-Size (eliom-6.12.4.tar.gz) = 644029 bytes
-SHA1 (patch-pkg_build.ml) = a952e78e2e8e9e35d287fcf6e575a2e91eaf4016
+BLAKE2s (eliom-10.0.0.tar.gz) = 6ee5fd6f4c6e65b97e7534bda387e5437a28527ee921966d60e52087fd62e643
+SHA512 (eliom-10.0.0.tar.gz) = 9b580bd73e2dd5f687428d02dc9abdde5eef4a8d8d0f69309b29fa34389363b5f18f79f1f646e5efca324743096c1124c862fdd4427bc9d97adef6f72bd03f16
+Size (eliom-10.0.0.tar.gz) = 646242 bytes
+SHA1 (patch-pkg_build.ml) = d10092a7e2b3e56230ca9330a99eb2669a75c38d

Index: pkgsrc/www/eliom/patches/patch-pkg_build.ml
diff -u pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.4 pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.5
--- pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.4     Tue Apr 21 12:52:06 2020
+++ pkgsrc/www/eliom/patches/patch-pkg_build.ml Mon May 23 15:31:34 2022
@@ -1,14 +1,16 @@
-$NetBSD: patch-pkg_build.ml,v 1.4 2020/04/21 12:52:06 jaapb Exp $
+$NetBSD: patch-pkg_build.ml,v 1.5 2022/05/23 15:31:34 jaapb Exp $
 
 Do not install mime types
 
---- pkg/build.ml.orig  2020-03-11 10:55:00.000000000 +0000
+--- pkg/build.ml.orig  2022-03-10 16:39:39.000000000 +0000
 +++ pkg/build.ml
-@@ -104,7 +104,6 @@ let () =
- 
-     Pkg.doc "README.md";
-     Pkg.doc "CHANGES";
--    Pkg.etc "pkg/etc/mime.types"
-   ] @ (
-     List.flatten (
-       List.map (fun (name,files) ->
+@@ -116,8 +116,7 @@ let () =
+            server_extra
+     @ [ (* MISC *)
+         Pkg.doc "README.md"
+-      ; Pkg.doc "CHANGES"
+-      ; Pkg.etc "pkg/etc/mime.types" ]
++      ; Pkg.doc "CHANGES" ]
+     @ List.flatten
+         (List.map
+            (fun (name, files) ->

Prev by Date: CVS commit: pkgsrc/devel/js_of_ocaml-ocamlbuild
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/js_of_ocaml-ocamlbuild
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index