Hola! Here is a diff to bump facette to the latest version. This resolves the breakage from the node 12 update.
I don't use facette, so tests from people that do use it would be really awesome! Port changes: - bundle built assets. (This requires pandoc and go-bindata, which are not ported currently) - Use npm vs yarn for "executing" gulp. - The files in "share" are removed because they are now included in the facette binary. OK? diff --git a/sysutils/facette/Makefile b/sysutils/facette/Makefile index 848e388070a..40f62e7e7dd 100644 --- a/sysutils/facette/Makefile +++ b/sysutils/facette/Makefile @@ -4,15 +4,21 @@ COMMENT = time series data visualization and graphing software GH_ACCOUNT = facette GH_PROJECT = facette -GH_TAGNAME = 0.4.1 +GH_TAGNAME = 0.5.1 CATEGORIES = sysutils HOMEPAGE = https://facette.io -# selfhosted node_modules deps generated via gmake node_modules +# selfhosted node_modules deps generated via 'gmake node_modules' in +# $WRKSRC/ui . +# selfhosted asset deps are generated by: 'gmake build-docs' for man pages and +# 'go-bindata -pkg web -prefix ../dist/assets -tags builtin_assets -o bindata.go ../dist/assets/...' +# in WRKSRC/web . +# For the above to work, pandoc and go-bindata need to be installed. DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${GH_TAGNAME}${EXTRACT_SUFX}} \ - ${GH_PROJECT}-${GH_TAGNAME}-node_modules${EXTRACT_SUFX}:0 + ${GH_PROJECT}-${GH_TAGNAME}-node_modules${EXTRACT_SUFX}:0 \ + ${GH_PROJECT}-${GH_TAGNAME}-assets${EXTRACT_SUFX}:0 MASTER_SITES0 = https://deftly.net/dist/ # BSD @@ -29,7 +35,9 @@ USE_GMAKE = Yes SUBST_VARS += VARBASE post-patch: - ln -s ${WRKDIR}/node_modules ${WRKSRC}/node_modules + ln -s ${WRKDIR}/node_modules ${WRKSRC}/ui/node_modules + ln -s ${WRKDIR}/dist ${WRKSRC}/dist + cp ${WRKDIR}/web/bindata.go ${WRKSRC}/web/ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/facette/ diff --git a/sysutils/facette/distinfo b/sysutils/facette/distinfo index e9d66910aee..4914922a84d 100644 --- a/sysutils/facette/distinfo +++ b/sysutils/facette/distinfo @@ -1,4 +1,6 @@ -SHA256 (facette-0.4.1-node_modules.tar.gz) = dB/ULQSbzR14ciiDnGyP9jfaB+PDfx8wqVo2EPmhUoM= -SHA256 (facette-0.4.1.tar.gz) = srXEGWAFUAzH40D3Lv0Fu8NOKLCT/WXdssWl7OhSsNY= -SIZE (facette-0.4.1-node_modules.tar.gz) = 15518372 -SIZE (facette-0.4.1.tar.gz) = 7524008 +SHA256 (facette-0.5.1-assets.tar.gz) = Y/0Qni2SgdHIIHdSsz0ulAE9QXIahPWWE1OCW1g1sg0= +SHA256 (facette-0.5.1-node_modules.tar.gz) = 6oUn8XhNquJB5EvLz69guIvBD7IEwuzUAUqX2UyfdPE= +SHA256 (facette-0.5.1.tar.gz) = sgbvCbEzP9VbfbIviNMOeDPOBJaRtphQwlxaAL9JMSg= +SIZE (facette-0.5.1-assets.tar.gz) = 2104227 +SIZE (facette-0.5.1-node_modules.tar.gz) = 20481001 +SIZE (facette-0.5.1.tar.gz) = 3711994 diff --git a/sysutils/facette/patches/patch-Makefile b/sysutils/facette/patches/patch-Makefile index c5fff940078..5e4cb40d8f2 100644 --- a/sysutils/facette/patches/patch-Makefile +++ b/sysutils/facette/patches/patch-Makefile @@ -1,38 +1,32 @@ -$OpenBSD: patch-Makefile,v 1.3 2018/10/08 14:07:36 sthen Exp $ +$OpenBSD$ Index: Makefile --- Makefile.orig +++ Makefile -@@ -73,7 +73,7 @@ build-bin: build-dir - endif - @$(call mesg_start,build,Building binaries...) - @(for bin in $(BIN_LIST); do \ -- $(GO) build -i -v \ -+ $(GO) build -v -x \ - -tags "$(BUILD_TAGS)" \ - -ldflags "-s -w \ - -X main.version=$(VERSION) \ -@@ -83,7 +83,7 @@ endif - -o $(BUILD_DIR)/bin/$$bin ./src/cmd/$$bin || exit 1; \ - done) && $(call mesg_ok) || $(call mesg_fail) +@@ -53,7 +53,7 @@ clean: + @$(call print_step,"Cleaning files...") + @rm -rf bin/ dist/ web/bindata.go --build-assets: node_modules -+build-assets: - @$(call mesg_start,build,Building assets...) - @BUILD_DIR=$(BUILD_DIR) $(GULP) $(GULP_ARGS) build --env $(BUILD_ENV) >/dev/null && \ - $(call mesg_ok) || $(call mesg_fail) -@@ -112,12 +112,12 @@ test-bin: build-dir +-build: build-bin build-assets build-docs ++build: build-bin build-assets - install: install-bin install-assets install-docs + ifneq ($(filter builtin_assets,$(TAGS)),) + build-bin: build-assets +@@ -75,7 +75,7 @@ endif --install-bin: build-bin -+install-bin: - @$(call mesg_start,install,Installing binaries...) - @install -d -m 0755 $(PREFIX)/bin && install -m 0755 $(BUILD_DIR)/bin/* $(PREFIX)/bin/ && \ - $(call mesg_ok) || $(call mesg_fail) + build-assets: ui/node_modules + @$(call print_step,"Building assets...") +- @rm -rf $(DIST_DIR)/assets/ && $(YARN) $(YARN_ARGS) build --env $(ENV) ++ @rm -rf $(DIST_DIR)/assets/ && cd ui; npm run build --install-assets: build-assets -+install-assets: - @$(call mesg_start,install,Installing assets...) - @install -d -m 0755 $(PREFIX)/share/facette && cp -r $(BUILD_DIR)/assets $(PREFIX)/share/facette/ && \ - $(call mesg_ok) || $(call mesg_fail) + build-docs: + ifeq ($(filter skip_docs,$(TAGS)),) +@@ -100,7 +100,7 @@ install-bin: build-bin + @$(call print_step,"Installing binaries...") + @install -d -m 0755 $(PREFIX)/bin && install -m 0755 bin/* $(PREFIX)/bin/ + +-install-docs: build-docs ++install-docs: + ifneq ($(filter build_docs,$(TAGS)),) + @$(call print_step,"Installing manual pages...") + @install -d -m 0755 $(PREFIX)/share/man/man1 && cp -r $(DIST_DIR)/man/* $(PREFIX)/share/man/man1 diff --git a/sysutils/facette/patches/patch-docs_examples_facette_yaml b/sysutils/facette/patches/patch-docs_examples_facette_yaml index 101850f0ba0..e81b963308e 100644 --- a/sysutils/facette/patches/patch-docs_examples_facette_yaml +++ b/sysutils/facette/patches/patch-docs_examples_facette_yaml @@ -1,14 +1,23 @@ -$OpenBSD: patch-docs_examples_facette_yaml,v 1.1 2018/04/25 16:09:56 landry Exp $ +$OpenBSD$ Index: docs/examples/facette.yaml --- docs/examples/facette.yaml.orig +++ docs/examples/facette.yaml -@@ -17,7 +17,7 @@ backend: +@@ -51,7 +51,7 @@ storage: ### SQLite driver: sqlite -- path: /var/lib/facette/data.db +- path: var/data.db + path: ${VARBASE}/facette/data.db ### PostgreSQL #driver: pgsql +@@ -71,7 +71,7 @@ storage: + + cache: + # Cache directory path +- path: var/cache ++ path: ${VARBASE}/facette/cache + + defaults: + # Default time range diff --git a/sysutils/facette/patches/patch-web_asset_builtin_go b/sysutils/facette/patches/patch-web_asset_builtin_go new file mode 100644 index 00000000000..d62140ca9ff --- /dev/null +++ b/sysutils/facette/patches/patch-web_asset_builtin_go @@ -0,0 +1,12 @@ +$OpenBSD$ + +Index: web/asset_builtin.go +--- web/asset_builtin.go.orig ++++ web/asset_builtin.go +@@ -1,6 +1,5 @@ + // +build builtin_assets + // +-//go:generate go-bindata -pkg web -prefix ../dist/assets -tags builtin_assets -o bindata.go ../dist/assets/... + + package web + diff --git a/sysutils/facette/pkg/PLIST b/sysutils/facette/pkg/PLIST index 2f5991baeb8..f544f736e2d 100644 --- a/sysutils/facette/pkg/PLIST +++ b/sysutils/facette/pkg/PLIST @@ -1,6 +1,6 @@ @comment $OpenBSD: PLIST,v 1.3 2019/01/24 14:02:40 landry Exp $ @newgroup _facette:774 -@newuser _facette:774:774:daemon:Facette Daemon:/var/empty:/sbin/nologin +@newuser _facette:774:774:daemon:Facette Daemon:${VARBASE}/empty:/sbin/nologin @rcscript ${RCDIR}/facette @bin bin/facette @bin bin/facettectl @@ -8,33 +8,6 @@ share/examples/facette/ @sample ${SYSCONFDIR}/facette/ share/examples/facette/facette.yaml @sample ${SYSCONFDIR}/facette/facette.yaml -share/facette/ -share/facette/assets/ -share/facette/assets/css/ -share/facette/assets/css/font-awesome-269550530c.min.css -share/facette/assets/css/style-bc6bbc4dae.css -share/facette/assets/css/style-print-59792da171.css -share/facette/assets/fonts/ -share/facette/assets/fonts/Roboto-Light-7b5fb88f12.ttf -share/facette/assets/fonts/Roboto-Medium-fe13e41707.ttf -share/facette/assets/fonts/Roboto-Regular-ac3f799d5b.ttf -share/facette/assets/fonts/fontawesome-webfont-674f50d287.eot -share/facette/assets/fonts/fontawesome-webfont-912ec66d75.svg -share/facette/assets/fonts/fontawesome-webfont-af7ae505a9.woff2 -share/facette/assets/fonts/fontawesome-webfont-b06871f281.ttf -share/facette/assets/fonts/fontawesome-webfont-fee66e712a.woff -share/facette/assets/html/ -share/facette/assets/html/index.html -share/facette/assets/images/ -share/facette/assets/images/favicon-bec05f9734.png -share/facette/assets/images/logo-main-e327a302b8.png -share/facette/assets/images/logo-nav-f5c7f823c6.png -share/facette/assets/js/ -share/facette/assets/js/facette-11fd54e369.js -share/facette/assets/js/locales/ -share/facette/assets/js/locales/en.json -share/facette/assets/js/locales/fr.json -share/facette/assets/js/vendor-01cb0c030c.js @owner _facette @group _facette -@sample /var/facette/ +@sample ${VARBASE}/facette/ -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
