CVS commit: pkgsrc/www/ocsigen-start

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Jan 29 14:23:07 UTC 2019

Modified Files:
        pkgsrc/www/ocsigen-start: Makefile PLIST distinfo
        pkgsrc/www/ocsigen-start/patches:
            patch-template.distillery_Makefile.style
Removed Files:
        pkgsrc/www/ocsigen-start/patches: patch-Makefile.options
            patch-template.distillery_Makefile.mobile
            patch-template.distillery_Makefile.options
            patch-template.distillery_PROJECT__NAME.eliom

Log Message:
Updated www/ocsigen-start to version 1.5.0.

Mostly incremental changes and bugfixes.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/ocsigen-start/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ocsigen-start/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/ocsigen-start/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/ocsigen-start/patches/patch-Makefile.options \
    pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.mobile \
    pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.options \
    pkgsrc/www/ocsigen-start/patches/patch-template.distillery_PROJECT__NAME.eliom
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.style

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

Modified files:

Index: pkgsrc/www/ocsigen-start/Makefile
diff -u pkgsrc/www/ocsigen-start/Makefile:1.5 pkgsrc/www/ocsigen-start/Makefile:1.6
--- pkgsrc/www/ocsigen-start/Makefile:1.5       Mon Nov 12 16:10:29 2018
+++ pkgsrc/www/ocsigen-start/Makefile   Tue Jan 29 14:23:07 2019
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2018/11/12 16:10:29 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/29 14:23:07 jaapb Exp $
 
 GITHUB_PROJECT=        ocsigen-start
-DISTNAME=      ${GITHUB_PROJECT}-1.1.0
-PKGREVISION=   4
+DISTNAME=      ${GITHUB_PROJECT}-1.5.0
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -26,7 +25,7 @@ MAKE_ENV+=    NATIVE=no
 
 DEPENDS+=      eliom>=6.3:../../www/eliom
 
-SUBST_CLASSES+=        fix-settings fix-md5
+SUBST_CLASSES+=        fix-settings
 SUBST_STAGE.fix-settings=      pre-configure
 SUBST_FILES.fix-settings= template.distillery/Makefile.db
 SUBST_FILES.fix-settings+=     template.distillery/Makefile.options
@@ -35,6 +34,7 @@ SUBST_SED.fix-settings+=      -e 's,$$(shell 
 SUBST_SED.fix-settings+=       -e '/USE_SASS/s,yes,no,'
 SUBST_SED.fix-settings+=       -e '/USE_NPM/s,yes,no,'
 
+SUBST_CLASSES+=        fix-md5
 SUBST_STAGE.fix-md5=   pre-configure
 SUBST_FILES.fix-md5=   template.distillery/Makefile.mobile
 SUBST_FILES.fix-md5+=  template.distillery/Makefile.os
@@ -47,6 +47,7 @@ pre-configure:
 .include "../../databases/ocaml-macaque/buildlink3.mk"
 .include "../../devel/ocaml-lwt_camlp4/buildlink3.mk"
 .include "../../devel/ocaml-lwt_log/buildlink3.mk"
+.include "../../devel/ocaml-resource-pooling/buildlink3.mk"
 .include "../../devel/ocaml-yojson/buildlink3.mk"
 .include "../../security/ocaml-safepass/buildlink3.mk"
 .include "../../www/ocsigen-i18n/buildlink3.mk"

Index: pkgsrc/www/ocsigen-start/PLIST
diff -u pkgsrc/www/ocsigen-start/PLIST:1.1 pkgsrc/www/ocsigen-start/PLIST:1.2
--- pkgsrc/www/ocsigen-start/PLIST:1.1  Tue Jun  5 16:17:10 2018
+++ pkgsrc/www/ocsigen-start/PLIST      Tue Jan 29 14:23:07 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/06/05 16:17:10 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/01/29 14:23:07 jaapb Exp $
 ${OCAML_SITELIB}/eliom/templates/os.pgocaml/.eliomignore
 ${OCAML_SITELIB}/eliom/templates/os.pgocaml/.eliomreserve
 ${OCAML_SITELIB}/eliom/templates/os.pgocaml/.eliomverbatim
@@ -136,6 +136,8 @@ ${OCAML_SITELIB}/ocsigen-start/server/os
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-start/server/os_comet.cmx
 ${OCAML_SITELIB}/ocsigen-start/server/os_connect_phone.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-start/server/os_connect_phone.cmx
+${OCAML_SITELIB}/ocsigen-start/server/os_core_db.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-start/server/os_core_db.cmx
 ${OCAML_SITELIB}/ocsigen-start/server/os_current_user.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-start/server/os_current_user.cmx
 ${OCAML_SITELIB}/ocsigen-start/server/os_date.cmi

Index: pkgsrc/www/ocsigen-start/distinfo
diff -u pkgsrc/www/ocsigen-start/distinfo:1.3 pkgsrc/www/ocsigen-start/distinfo:1.4
--- pkgsrc/www/ocsigen-start/distinfo:1.3       Wed Jun  6 10:50:51 2018
+++ pkgsrc/www/ocsigen-start/distinfo   Tue Jan 29 14:23:07 2019
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.3 2018/06/06 10:50:51 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2019/01/29 14:23:07 jaapb Exp $
 
-SHA1 (ocsigen-start-1.1.0.tar.gz) = 17227ab765b6a7a794938353415d226cbfcfc885
-RMD160 (ocsigen-start-1.1.0.tar.gz) = bc5a6814054a4abf6d40a5c70c6b26293a81668e
-SHA512 (ocsigen-start-1.1.0.tar.gz) = 0e55c602dac8e24df03b462d9c4924fab0a0151a8877aafe44ad3ef0f17338ee758b5803dbebc911ed9818cba97751d6cea2623ffb3dd3887a1d79f1dd8d6f0a
-Size (ocsigen-start-1.1.0.tar.gz) = 1034520 bytes
-SHA1 (patch-Makefile.options) = 0291679dc7250c0abac1f2cd7a960c77202fd96e
+SHA1 (ocsigen-start-1.5.0.tar.gz) = 7f1af6856dd3c77725634c89a60389a72e86bb63
+RMD160 (ocsigen-start-1.5.0.tar.gz) = 6e4801f3e2daa33e700171c9a7c2677a7ba58a92
+SHA512 (ocsigen-start-1.5.0.tar.gz) = 10cf41e98a025a448c32835c2d1e76a44db853d575c2df2d61a6989ae00d4f8ae10fdf6a21a4d10bb3c3a3e3fb31885b8b1ff743d1518516cdf860430b09d183
+Size (ocsigen-start-1.5.0.tar.gz) = 1035174 bytes
 SHA1 (patch-template.distillery_Makefile.db) = fd3ffe0453f1dd68270435c3176be7a489f3c04b
-SHA1 (patch-template.distillery_Makefile.mobile) = 50e2f2b28881a100ac94982de5187c230e0bb95e
-SHA1 (patch-template.distillery_Makefile.options) = c9604909a345f47b7cf7429919c6921cf6821591
-SHA1 (patch-template.distillery_Makefile.style) = a3b449916340ab339abcd02e85892f08c6c4093f
-SHA1 (patch-template.distillery_PROJECT__NAME.eliom) = 59ed67268ce9f2a6756bb564762d54a38e803810
+SHA1 (patch-template.distillery_Makefile.style) = f6834831e0a167cfe7def779f801d315d5e7df9a

Index: pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.style
diff -u pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.style:1.1 pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.style:1.2
--- pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.style:1.1       Wed Jun  6 10:50:51 2018
+++ pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.style   Tue Jan 29 14:23:07 2019
@@ -1,7 +1,7 @@
-$NetBSD: patch-template.distillery_Makefile.style,v 1.1 2018/06/06 10:50:51 jaapb Exp $
+$NetBSD: patch-template.distillery_Makefile.style,v 1.2 2019/01/29 14:23:07 jaapb Exp $
 
-Correct invocation of sed
---- template.distillery/Makefile.style.orig    2018-03-09 16:47:43.000000000 +0000
+Use BSD version of sed
+--- template.distillery/Makefile.style.orig    2019-01-17 09:35:57.000000000 +0000
 +++ template.distillery/Makefile.style
 @@ -9,7 +9,7 @@ check_sed:
  ifneq ($(shell sed --version 2> /dev/null),)
@@ -11,4 +11,4 @@ Correct invocation of sed
 +SED = sed -i.css
  endif
  
- css: import-external-css $(CSS_DEST)
+ css: $(CSS_DEST)