pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/ocsigen-start
Module Name: pkgsrc
Committed By: jaapb
Date: Wed Jun 6 09:45:01 UTC 2018
Modified Files:
pkgsrc/www/ocsigen-start: Makefile distinfo
Added Files:
pkgsrc/www/ocsigen-start/patches: patch-template.distillery_Makefile.db
patch-template.distillery_Makefile.mobile
patch-template.distillery_Makefile.options
Log Message:
Fixes to templates in www/ocsigen-start. Revbump.
The template used by eliom-distillery needs opam and has some other
errors, which have now been fixed using the SUBST framework and patches.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ocsigen-start/Makefile \
pkgsrc/www/ocsigen-start/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.db \
pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.mobile \
pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.options
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.1 pkgsrc/www/ocsigen-start/Makefile:1.2
--- pkgsrc/www/ocsigen-start/Makefile:1.1 Tue Jun 5 16:17:10 2018
+++ pkgsrc/www/ocsigen-start/Makefile Wed Jun 6 09:45:01 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2018/06/05 16:17:10 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2018/06/06 09:45:01 jaapb Exp $
GITHUB_PROJECT= ocsigen-start
DISTNAME= ${GITHUB_PROJECT}-1.1.0
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -25,7 +26,17 @@ MAKE_ENV+= NATIVE=no
DEPENDS+= eliom>=6.3:../../www/eliom
-MAKE_JOBS_SAFE= no # for debugging, remove before flight
+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
+SUBST_SED.fix-settings= -e 's,$$(shell opam config var lib),${PREFIX}/${OCAML_SITELIBDIR},'
+SUBST_SED.fix-settings+= -e 's,$$(shell $$(OPAM) config var share),${PREFIX}/share,'
+SUBST_SED.fix-settings+= -e '/USE_SASS/s,yes,no,'
+SUBST_SED.fix-settings+= -e '/USE_NPM/s,yes,no,'
+
+pre-configure:
+ ${RUN} cd ${WRKSRC} && rm -f template.distillery/*.orig
.include "../../databases/ocaml-macaque/buildlink3.mk"
.include "../../devel/ocaml-lwt_camlp4/buildlink3.mk"
Index: pkgsrc/www/ocsigen-start/distinfo
diff -u pkgsrc/www/ocsigen-start/distinfo:1.1 pkgsrc/www/ocsigen-start/distinfo:1.2
--- pkgsrc/www/ocsigen-start/distinfo:1.1 Tue Jun 5 16:17:10 2018
+++ pkgsrc/www/ocsigen-start/distinfo Wed Jun 6 09:45:01 2018
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.1 2018/06/05 16:17:10 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2018/06/06 09:45:01 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 (patch-template.distillery_Makefile.db) = fd3ffe0453f1dd68270435c3176be7a489f3c04b
+SHA1 (patch-template.distillery_Makefile.mobile) = 50e2f2b28881a100ac94982de5187c230e0bb95e
+SHA1 (patch-template.distillery_Makefile.options) = c9604909a345f47b7cf7429919c6921cf6821591
Added files:
Index: pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.db
diff -u /dev/null pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.db:1.1
--- /dev/null Wed Jun 6 09:45:01 2018
+++ pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.db Wed Jun 6 09:45:01 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-template.distillery_Makefile.db,v 1.1 2018/06/06 09:45:01 jaapb Exp $
+
+Avoid error with wrongly set locale in template
+--- template.distillery/Makefile.db.orig 2018-03-09 16:47:43.000000000 +0000
++++ template.distillery/Makefile.db
+@@ -98,7 +98,7 @@ $(PSQL_DIR):
+ ifeq ($(LOCAL),yes)
+
+ db-init: $(PSQL_DIR)
+- $(pg_ctl) initdb -o --encoding=UNICODE -D $(PSQL_DIR)
++ $(pg_ctl) initdb -o "--encoding=UNICODE --no-locale" -D $(PSQL_DIR)
+ echo unix_socket_directories = \'/tmp\' >> $(PSQL_DIR)/postgresql.conf
+ $(pg_ctl) -o "-p $(DB_PORT)" -D $(PSQL_DIR) -l $(PSQL_LOG) start
+
Index: pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.mobile
diff -u /dev/null pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.mobile:1.1
--- /dev/null Wed Jun 6 09:45:01 2018
+++ pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.mobile Wed Jun 6 09:45:01 2018
@@ -0,0 +1,14 @@
+$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 \
+ $<
+
Index: pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.options
diff -u /dev/null pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.options:1.1
--- /dev/null Wed Jun 6 09:45:01 2018
+++ pkgsrc/www/ocsigen-start/patches/patch-template.distillery_Makefile.options Wed Jun 6 09:45:01 2018
@@ -0,0 +1,21 @@
+$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
Home |
Main Index |
Thread Index |
Old Index