kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated www/ocsigen-start to version 1.5.0.

Browse source 
Mostly incremental changes and bugfixes.
This commit is contained in:
jaapb 2019-01-29 14:23:07 +00:00
parent 0e2e079b44
commit c083f2633e
8 changed files with 18 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
www/ocsigen-start/Makefile
View file

@ -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 $$(OPAM) config var share),${PREFIX}/sha
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"

4
www/ocsigen-start/PLIST
View file

@ -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_comet.cmi
${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

16
www/ocsigen-start/distinfo
View file

@ -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

23
www/ocsigen-start/patches/patch-Makefile.options
View file

@ -1,23 +0,0 @@
$NetBSD: patch-Makefile.options,v 1.1 2018/06/05 16:17:10 jaapb Exp $
Some required package names (or structure) have changed
--- Makefile.options.orig 2018-03-09 16:47:43.000000000 +0000
+++ Makefile.options
@@ -54,13 +54,13 @@ SASS_TEMPORARY_PROJECT_NAME := os_tempor
##----------------------------------------------------------------------
# OCamlfind packages for the server
-SERVER_PACKAGES := lwt.ppx js_of_ocaml-ppx.deriving calendar safepass \
- ocsigen-toolkit.server yojson re.str
+SERVER_PACKAGES := lwt_ppx js_of_ocaml-ppx.deriving calendar safepass \
+ ocsigen-toolkit.server yojson re.str lwt_log
-SERVER_DB_PACKAGES := pgocaml pgocaml.syntax macaque.syntax calendar safepass
+SERVER_DB_PACKAGES := pgocaml pgocaml.syntax macaque.syntax calendar safepass lwt_log
# OCamlfind packages for the client
-CLIENT_PACKAGES := lwt.ppx js_of_ocaml-ppx.deriving js_of_ocaml-ppx \
+CLIENT_PACKAGES := lwt_ppx js_of_ocaml-ppx.deriving js_of_ocaml-ppx \
calendar ocsigen-toolkit.client re.str
# Debug package (yes/no): Debugging info in compilation

14
www/ocsigen-start/patches/patch-template.distillery_Makefile.mobile
View file

@ -1,14 +0,0 @@
$NetBSD: patch-template.distillery_Makefile.mobile,v 1.1 2018/06/06 09:45:01 jaapb Exp $
lwt.ppx has been renamed to lwt_ppx
--- template.distillery/Makefile.mobile.orig 2018-03-09 16:47:43.000000000 +0000
+++ template.distillery/Makefile.mobile
@@ -232,7 +232,7 @@ $(CORDOVAPATH)/www/eliom.html: $(CORDOVA
# Eliom loader is used in the index.html to retrieve update from the server.
mobile/eliom_loader.byte: mobile/eliom_loader.ml
ocamlfind ocamlc \
- -package js_of_ocaml,js_of_ocaml-ppx,js_of_ocaml-lwt,lwt.ppx \
+ -package js_of_ocaml,js_of_ocaml-ppx,js_of_ocaml-lwt,lwt_ppx \
-linkpkg -o mobile/eliom_loader.byte \
$<

21
www/ocsigen-start/patches/patch-template.distillery_Makefile.options
View file

@ -1,21 +0,0 @@
$NetBSD: patch-template.distillery_Makefile.options,v 1.1 2018/06/06 09:45:01 jaapb Exp $
lwt.ppx has been renamed to lwt_ppx
--- template.distillery/Makefile.options.orig 2018-03-09 16:47:43.000000000 +0000
+++ template.distillery/Makefile.options
@@ -24,13 +24,13 @@ CLIENT_FILES := $(wildcard *.el
SERVER_ELIOM_PACKAGES := ocsigen-start.server
# OCamlfind packages for the server
-SERVER_PACKAGES := lwt.ppx js_of_ocaml-ppx.deriving ppx_deriving.std
+SERVER_PACKAGES := lwt_ppx js_of_ocaml-ppx.deriving ppx_deriving.std
# OCamlfind packages for database access
SERVER_DB_PACKAGES := pgocaml.syntax
# OCamlfind packages for the client
-CLIENT_PACKAGES := lwt.ppx js_of_ocaml-ppx js_of_ocaml-ppx.deriving \
+CLIENT_PACKAGES := lwt_ppx js_of_ocaml-ppx js_of_ocaml-ppx.deriving \
ppx_deriving.std ocsigen-start.client base
# Automatically install packages via NPM

8
www/ocsigen-start/patches/patch-template.distillery_Makefile.style
View file

@ -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)

20
www/ocsigen-start/patches/patch-template.distillery_PROJECT__NAME.eliom
View file

@ -1,20 +0,0 @@
$NetBSD: patch-template.distillery_PROJECT__NAME.eliom,v 1.1 2018/06/06 10:50:51 jaapb Exp $
Lwt_log is deprecated
--- template.distillery/PROJECT_NAME.eliom.orig 2018-03-09 16:47:43.000000000 +0000
+++ template.distillery/PROJECT_NAME.eliom
@@ -70,7 +70,7 @@ let%server () =
Lwt_log.ign_info ~section "This is an information";
(or ign_debug, ign_warning, ign_error etc.)
*)
-let%server _ =
+(* let%server _ =
if Eliom_config.get_debugmode ()
then begin
ignore
@@ -83,4 +83,4 @@ let%server _ =
: unit ) ];
(* Lwt_log_core.add_rule "*" Lwt_log.Debug *)
Lwt_log_core.add_rule "%%%MODULE_NAME%%%*" Lwt_log.Debug
- end
+ end *)