diff options
author | jaapb <jaapb@pkgsrc.org> | 2018-06-06 10:50:51 +0000 |
---|---|---|
committer | jaapb <jaapb@pkgsrc.org> | 2018-06-06 10:50:51 +0000 |
commit | db10061070e6b9ccdfad302ac358a1b03a85d1f7 (patch) | |
tree | 2b286553860a38b9ed1d3b43c8fe1121ab789170 /www/ocsigen-start | |
parent | 6c6cd54acfccfa1292f61fa42d18475ca2e0a276 (diff) | |
download | pkgsrc-db10061070e6b9ccdfad302ac358a1b03a85d1f7.tar.gz |
Additional changes to template in www/ocsigen-start. Revbump.
Diffstat (limited to 'www/ocsigen-start')
-rw-r--r-- | www/ocsigen-start/Makefile | 12 | ||||
-rw-r--r-- | www/ocsigen-start/distinfo | 4 | ||||
-rw-r--r-- | www/ocsigen-start/patches/patch-template.distillery_Makefile.style | 14 | ||||
-rw-r--r-- | www/ocsigen-start/patches/patch-template.distillery_PROJECT__NAME.eliom | 20 |
4 files changed, 46 insertions, 4 deletions
diff --git a/www/ocsigen-start/Makefile b/www/ocsigen-start/Makefile index 50dc8f80acc..c95c4c30d4b 100644 --- a/www/ocsigen-start/Makefile +++ b/www/ocsigen-start/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2018/06/06 09:45:01 jaapb Exp $ +# $NetBSD: Makefile,v 1.3 2018/06/06 10:50:51 jaapb Exp $ GITHUB_PROJECT= ocsigen-start DISTNAME= ${GITHUB_PROJECT}-1.1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} @@ -26,7 +26,7 @@ MAKE_ENV+= NATIVE=no DEPENDS+= eliom>=6.3:../../www/eliom -SUBST_CLASSES+= fix-settings +SUBST_CLASSES+= fix-settings fix-md5 SUBST_STAGE.fix-settings= pre-configure SUBST_FILES.fix-settings= template.distillery/Makefile.db SUBST_FILES.fix-settings+= template.distillery/Makefile.options @@ -35,6 +35,12 @@ 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_STAGE.fix-md5= pre-configure +SUBST_FILES.fix-md5= template.distillery/Makefile.mobile +SUBST_FILES.fix-md5+= template.distillery/Makefile.os +SUBST_FILES.fix-md5+= template.distillery/Makefile.style +SUBST_SED.fix-md5= -e 's,md5sum,md5,g' + pre-configure: ${RUN} cd ${WRKSRC} && rm -f template.distillery/*.orig diff --git a/www/ocsigen-start/distinfo b/www/ocsigen-start/distinfo index 4c35118f702..0356794480d 100644 --- a/www/ocsigen-start/distinfo +++ b/www/ocsigen-start/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2018/06/06 09:45:01 jaapb Exp $ +$NetBSD: distinfo,v 1.3 2018/06/06 10:50:51 jaapb Exp $ SHA1 (ocsigen-start-1.1.0.tar.gz) = 17227ab765b6a7a794938353415d226cbfcfc885 RMD160 (ocsigen-start-1.1.0.tar.gz) = bc5a6814054a4abf6d40a5c70c6b26293a81668e @@ -8,3 +8,5 @@ SHA1 (patch-Makefile.options) = 0291679dc7250c0abac1f2cd7a960c77202fd96e 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 diff --git a/www/ocsigen-start/patches/patch-template.distillery_Makefile.style b/www/ocsigen-start/patches/patch-template.distillery_Makefile.style new file mode 100644 index 00000000000..fc851c2c0fd --- /dev/null +++ b/www/ocsigen-start/patches/patch-template.distillery_Makefile.style @@ -0,0 +1,14 @@ +$NetBSD: patch-template.distillery_Makefile.style,v 1.1 2018/06/06 10:50:51 jaapb Exp $ + +Correct invocation of sed +--- template.distillery/Makefile.style.orig 2018-03-09 16:47:43.000000000 +0000 ++++ template.distillery/Makefile.style +@@ -9,7 +9,7 @@ check_sed: + ifneq ($(shell sed --version 2> /dev/null),) + SED = sed -i + else +-SED = sed -i .css ++SED = sed -i.css + endif + + css: import-external-css $(CSS_DEST) diff --git a/www/ocsigen-start/patches/patch-template.distillery_PROJECT__NAME.eliom b/www/ocsigen-start/patches/patch-template.distillery_PROJECT__NAME.eliom new file mode 100644 index 00000000000..0b90c495437 --- /dev/null +++ b/www/ocsigen-start/patches/patch-template.distillery_PROJECT__NAME.eliom @@ -0,0 +1,20 @@ +$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 *) |