CVS commit: pkgsrc/www/eliom

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Apr 21 12:52:06 UTC 2020

Modified Files:
        pkgsrc/www/eliom: Makefile PLIST distinfo
        pkgsrc/www/eliom/patches: patch-pkg_build.ml
Removed Files:
        pkgsrc/www/eliom/patches: patch-opam patch-pkg_META patch-src___tags
            patch-src_ocamlbuild_ocamlbuild__eliom.ml
            patch-src_ppx_ppx__eliom__type.ml
            patch-src_ppx_ppx__eliom__utils.ml patch-src_tools_eliomc.ml

Log Message:
Updated www/eliom to version 6.11.0.

The CHANGES file in the distribution has not been updated fully, but
changes include several improvements and adaptations to new versions of
dependencies and the OCaml language.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/www/eliom/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/eliom/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/eliom/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/www/eliom/patches/patch-opam \
    pkgsrc/www/eliom/patches/patch-src___tags \
    pkgsrc/www/eliom/patches/patch-src_ocamlbuild_ocamlbuild__eliom.ml \
    pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__type.ml \
    pkgsrc/www/eliom/patches/patch-src_ppx_ppx__eliom__utils.ml \
    pkgsrc/www/eliom/patches/patch-src_tools_eliomc.ml
cvs rdiff -u -r1.6 -r0 pkgsrc/www/eliom/patches/patch-pkg_META
cvs rdiff -u -r1.3 -r1.4 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.31 pkgsrc/www/eliom/Makefile:1.32
--- pkgsrc/www/eliom/Makefile:1.31      Sat Jan 18 21:51:06 2020
+++ pkgsrc/www/eliom/Makefile   Tue Apr 21 12:52:06 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2020/01/18 21:51:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.32 2020/04/21 12:52:06 jaapb Exp $
 #
 
 GITHUB_PROJECT=        eliom
-DISTNAME=      ${GITHUB_PROJECT}-6.7.0
+DISTNAME=      ${GITHUB_PROJECT}-6.11.0
 CATEGORIES=    www
-PKGREVISION=   2
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
@@ -15,6 +14,7 @@ LICENSE=      gnu-lgpl-v2.1
 USE_TOOLS+=            gmake
 USE_LANGUAGES=         c
 OCAML_USE_FINDLIB=     yes
+UNLIMIT_RESOURCES+=    stacksize
 
 DEPENDS+=      ocsigen>=2.9:../../www/ocsigen
 #DEPENDS+=     ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen

Index: pkgsrc/www/eliom/PLIST
diff -u pkgsrc/www/eliom/PLIST:1.6 pkgsrc/www/eliom/PLIST:1.7
--- pkgsrc/www/eliom/PLIST:1.6  Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/PLIST      Tue Apr 21 12:52:06 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/08/24 11:07:34 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/04/21 12:52:06 jaapb Exp $
 bin/eliom-distillery
 bin/eliombuild
 bin/eliomc
@@ -103,7 +103,7 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_error_pages.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_extension.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_extension.cmx
-${OCAML_SITELIB}/eliom/server/eliom_form.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_form.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_form_sigs.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_lazy.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_lib.cmi
@@ -182,13 +182,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom
 ${OCAML_SITELIB}/eliom/server/server.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/server.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/server.cmxs
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/.ocp-indent
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/Makefile
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/Makefile.options
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/PROJECT_NAME.conf.in
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/PROJECT_NAME.eliom
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/README
-${OCAML_SITELIB}/eliom/templates/basic.camlp4/static!css!PROJECT_NAME.css
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/.ocp-indent
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/Makefile
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/Makefile.options

Index: pkgsrc/www/eliom/distinfo
diff -u pkgsrc/www/eliom/distinfo:1.15 pkgsrc/www/eliom/distinfo:1.16
--- pkgsrc/www/eliom/distinfo:1.15      Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/distinfo   Tue Apr 21 12:52:06 2020
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.15 2019/08/24 11:07:34 jaapb Exp $
+$NetBSD: distinfo,v 1.16 2020/04/21 12:52:06 jaapb Exp $
 
-SHA1 (eliom-6.7.0.tar.gz) = 02a105be3f58170d7ba39bd2152cb557b5e71fb5
-RMD160 (eliom-6.7.0.tar.gz) = d8f465a141f7eb761bf64964cfeb5653eadb2158
-SHA512 (eliom-6.7.0.tar.gz) = d7914dc1f5f2fd8a2d977dd79523a1b98ccfd8e34f67d285a5566f143d226b2563c4e7a9196170e91aba3c2e732cc97a1aa5b747e678e8bd219cc9b538c84f69
-Size (eliom-6.7.0.tar.gz) = 653578 bytes
-SHA1 (patch-opam) = 106a66cddc084774a6b68dcdfc4532825d89cceb
-SHA1 (patch-pkg_META) = cc17e1c7b2c6620662ffa37a991bf9f6612c3da2
-SHA1 (patch-pkg_build.ml) = 9622b65fe58fe939336ac61fa80579afefda1dec
-SHA1 (patch-src___tags) = 4f3be24e6c5f8c4871fcfc218d2dfc8c413217c8
-SHA1 (patch-src_ocamlbuild_ocamlbuild__eliom.ml) = cbbfd6bbdf9bee928d2d4c82f46cc6335f8c1e3e
-SHA1 (patch-src_ppx_ppx__eliom__type.ml) = 77bb28c5e73b4db7de2b96f07042eeaa31b0e106
-SHA1 (patch-src_ppx_ppx__eliom__utils.ml) = b592111fdef4fb33cace3e9f8857cbd3db64c226
-SHA1 (patch-src_tools_eliomc.ml) = 578c35f563746ef3a974af16f761c047943db633
+SHA1 (eliom-6.11.0.tar.gz) = 00eb272bd75a222c0201576b8ac06c0b0475f35b
+RMD160 (eliom-6.11.0.tar.gz) = 3a40c4734c2d0c968feaf32e7c6f809914fb029c
+SHA512 (eliom-6.11.0.tar.gz) = d17821f2da4808d79278efc4230a328c128c7a4dc1ef60ca01e2093c24e1a5d1c8dd98c06fb5be283d876368154e19d5246eda7b950e8942202ea89fe4352833
+Size (eliom-6.11.0.tar.gz) = 641496 bytes
+SHA1 (patch-pkg_build.ml) = a952e78e2e8e9e35d287fcf6e575a2e91eaf4016

Index: pkgsrc/www/eliom/patches/patch-pkg_build.ml
diff -u pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.3 pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.4
--- pkgsrc/www/eliom/patches/patch-pkg_build.ml:1.3     Sat Aug 24 11:07:34 2019
+++ pkgsrc/www/eliom/patches/patch-pkg_build.ml Tue Apr 21 12:52:06 2020
@@ -1,29 +1,14 @@
-$NetBSD: patch-pkg_build.ml,v 1.3 2019/08/24 11:07:34 jaapb Exp $
+$NetBSD: patch-pkg_build.ml,v 1.4 2020/04/21 12:52:06 jaapb Exp $
 
 Do not install mime types
-Do not build syntax package (patch from upstream)
---- pkg/build.ml.orig  2019-02-08 11:31:12.000000000 +0000
+
+--- pkg/build.ml.orig  2020-03-11 10:55:00.000000000 +0000
 +++ pkg/build.ml
-@@ -75,12 +75,6 @@ let () =
-     Pkg.bin ~auto:true ~dst:"eliom-distillery" "src/tools/distillery";
-     Pkg.bin ~auto:true "src/ocamlbuild/eliombuild";
- 
--    (* SYNTAXES *)
--    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_seed" "src/syntax/pa_eliom_seed";
--    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_client_client" "src/syntax/pa_eliom_client_client";
--    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_client_server" "src/syntax/pa_eliom_client_server";
--    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_type_filter" "src/syntax/pa_eliom_type_filter";
--
-     Pkg.lib ~exts:exts_modlib ~dst:"ocamlbuild/ocamlbuild_eliom" "src/ocamlbuild/ocamlbuild_eliom";
- 
-     (* PPX *)
-@@ -109,8 +103,7 @@ let () =
-     (* MISC *)
+@@ -104,7 +104,6 @@ let () =
  
      Pkg.doc "README.md";
--    Pkg.doc "CHANGES";
+     Pkg.doc "CHANGES";
 -    Pkg.etc "pkg/etc/mime.types"
-+    Pkg.doc "CHANGES"
    ] @ (
      List.flatten (
        List.map (fun (name,files) ->