Re: [update] sysutils/facette

2024-04-13 Thread Stuart Henderson 
On 2024/04/13 10:14, Stuart Henderson wrote:
> On 2024/04/13 10:51, Joel Carnat wrote:
> > 
> > > Le 13 avr. 2024 à 09:33, Landry Breuil  a écrit :
> > > 
> > > Le Wed, Apr 10, 2024 at 01:58:35AM +0200, Joel Carnat a écrit :
> > >> Hi,
> > >> 
> > >> Looking at sysutils/facette, it is marked as broken.
> > >> The attached patch has it compile and working.
> > > 
> > > oh, thanks for coming back at that... wonder if its worth it since its
> > > more or less abandoned upstream, and since its go code it might break at
> > > some point for using old modules/syscalls/etc ?
> > 
> > I agree with you on the abandoned state. I was just testing a few rrdtool 
> > stuff, noticed this one was marked as failed and looked at if I could solve 
> > it.
> > 
> > But after (re)using it for a while, I have seen what I wanted and will not 
> > use it any longer.
> > 
> > > either way, does it build without network access with your diff ? how
> > > did you check that ?
> > 
> > I have not tested an offline build. It was done on my laptop that has wifi 
> > access to the Internet. I just ran a few “make clean” / “make package”.
> 
> The simplest way to check that is with PORTS_PRIVSEP=Yes in mk.conf and
> a PF rule like "block return quick proto {tcp udp} user _pbuild"
> 

...

===>  Building for facette-0.5.1p3
cd /pobj/facette-0.5.1/facette-0.5.1 && git init
Initialized empty Git repository in 
/usr/obj/ports/facette-0.5.1/facette-0.5.1/.git/
fatal: ambiguous argument 'HEAD': unknown revision or path not in the working 
tree.
Use '--' to separate paths from revisions, like this:
'git  [...] -- [...]'
fatal: ambiguous argument 'HEAD': unknown revision or path not in the working 
tree.
Use '--' to separate paths from revisions, like this:
'git  [...] -- [...]'
tput: No value for $TERM and no -T specified
tput: No value for $TERM and no -T specified
*** Installing pre-commit Git hook...
tput: No value for $TERM and no -T specified
tput: No value for $TERM and no -T specified
*** Building assets...

> build
> gulp --no-color build

[10:15:40] Using gulpfile 
/usr/obj/ports/facette-0.5.1/facette-0.5.1/ui/gulpfile.js
[10:15:40] Starting 'build'...
[10:15:40] Starting 'buildLocales'...
[10:15:40] Starting 'buildStyles'...
[10:15:40] Starting 'copyHtml'...
[10:15:40] Starting 'copyStyles'...
[10:15:41] Starting 'buildHtml'...
Browserslist: caniuse-lite is outdated. Please run next command `npm update`
[10:15:42] Finished 'copyHtml' after 1.74 s
[10:15:42] Finished 'buildLocales' after 1.8 s
[10:15:42] Finished 'copyStyles' after 1.8 s
[10:15:43] Finished 'buildStyles' after 2.7 s
[10:15:43] Finished 'buildHtml' after 2.76 s
[10:15:43] Starting 'buildScripts'...
[10:15:43] Finished 'buildScripts' after 117 ms
[10:15:43] Finished 'build' after 2.98 s
tput: No value for $TERM and no -T specified
tput: No value for $TERM and no -T specified
*** Building binaries for openbsd/amd64...
go: cloud.google.com/go@v0.26.0: Get 
"https://proxy.golang.org/cloud.google.com/go/@v/v0.26.0.mod": dial tcp 
[2a00:1450:4009:81f::2011]:443: connect: permission denied
gmake: *** [Makefile:64: build-bin] Error 1
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3061 
'/pobj/facette-0.5.1/.build_done': @cd /pobj/facette-0.5.1/facette-0.5.1 && ...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2235 
'/usr/ports/packages/amd64/all/facette-0.5.1p3.tgz': @cd /usr/ports/sysutils...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2725 
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$(sudo -...)
*** Error 2 in /usr/ports/sysutils/facette 
(/usr/ports/infrastructure/mk/bsd.port.mk:2704 'package': 
@lock=facette-0.5.1p3;  export _LOCKS_H...)

Re: [update] sysutils/facette

2024-04-13 Thread Stuart Henderson 
On 2024/04/13 10:51, Joel Carnat wrote:
> 
> > Le 13 avr. 2024 à 09:33, Landry Breuil  a écrit :
> > 
> > Le Wed, Apr 10, 2024 at 01:58:35AM +0200, Joel Carnat a écrit :
> >> Hi,
> >> 
> >> Looking at sysutils/facette, it is marked as broken.
> >> The attached patch has it compile and working.
> > 
> > oh, thanks for coming back at that... wonder if its worth it since its
> > more or less abandoned upstream, and since its go code it might break at
> > some point for using old modules/syscalls/etc ?
> 
> I agree with you on the abandoned state. I was just testing a few rrdtool 
> stuff, noticed this one was marked as failed and looked at if I could solve 
> it.
> 
> But after (re)using it for a while, I have seen what I wanted and will not 
> use it any longer.
> 
> > either way, does it build without network access with your diff ? how
> > did you check that ?
> 
> I have not tested an offline build. It was done on my laptop that has wifi 
> access to the Internet. I just ran a few “make clean” / “make package”.

The simplest way to check that is with PORTS_PRIVSEP=Yes in mk.conf and
a PF rule like "block return quick proto {tcp udp} user _pbuild"

Re: [update] sysutils/facette

2024-04-13 Thread Joel Carnat 


> Le 13 avr. 2024 à 09:33, Landry Breuil  a écrit :
> 
> Le Wed, Apr 10, 2024 at 01:58:35AM +0200, Joel Carnat a écrit :
>> Hi,
>> 
>> Looking at sysutils/facette, it is marked as broken.
>> The attached patch has it compile and working.
> 
> oh, thanks for coming back at that... wonder if its worth it since its
> more or less abandoned upstream, and since its go code it might break at
> some point for using old modules/syscalls/etc ?

I agree with you on the abandoned state. I was just testing a few rrdtool 
stuff, noticed this one was marked as failed and looked at if I could solve it.

But after (re)using it for a while, I have seen what I wanted and will not use 
it any longer.

> either way, does it build without network access with your diff ? how
> did you check that ?

I have not tested an offline build. It was done on my laptop that has wifi 
access to the Internet. I just ran a few “make clean” / “make package”.

Regards,
Joel C.

Re: [update] sysutils/facette

2024-04-13 Thread Landry Breuil 
Le Wed, Apr 10, 2024 at 01:58:35AM +0200, Joel Carnat a écrit :
> Hi,
> 
> Looking at sysutils/facette, it is marked as broken.
> The attached patch has it compile and working.

oh, thanks for coming back at that... wonder if its worth it since its
more or less abandoned upstream, and since its go code it might break at
some point for using old modules/syscalls/etc ?

either way, does it build without network access with your diff ? how
did you check that ?

Landry

[update] sysutils/facette

2024-04-09 Thread Joel Carnat 

Hi,

Looking at sysutils/facette, it is marked as broken.
The attached patch has it compile and working.

I' ve tested facette with a couple of RRD files I have and didn't see 
any errors. Not sure I'll continue using it. I'm still looking at what 
it can do. But in case someone wants to use it, here's the update.


Regards,
Joel C.Index: Makefile
===
RCS file: /cvs/ports/sysutils/facette/Makefile,v
retrieving revision 1.24
diff -u -p -u -r1.24 Makefile
--- Makefile	4 Dec 2023 23:03:19 -	1.24
+++ Makefile	9 Apr 2024 23:55:18 -
@@ -1,4 +1,4 @@
-BROKEN =	fetches from internet during build
+#BROKEN =	fetches from internet during build
 
 COMMENT =	time series data visualization and graphing software
 
@@ -38,6 +38,9 @@ post-patch:
 	ln -s ${WRKDIR}/node_modules ${WRKSRC}/ui/node_modules
 	ln -s ${WRKDIR}/dist ${WRKSRC}/dist
 	cp ${WRKDIR}/web/bindata.go ${WRKSRC}/web/
+
+pre-build:
+	cd ${WRKSRC} && git init
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/facette/
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/sysutils/facette/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 patch-Makefile
--- patches/patch-Makefile	11 Mar 2022 19:57:24 -	1.5
+++ patches/patch-Makefile	9 Apr 2024 23:55:18 -
@@ -10,6 +10,15 @@ Index: Makefile
  
  ifneq ($(filter builtin_assets,$(TAGS)),)
  build-bin: build-assets
+@@ -62,7 +62,7 @@ build-bin:
+ endif
+ 	@$(call print_step,"Building binaries for $(GOOS)/$(GOARCH)...")
+ 	@$(GO) generate -tags "$(TAGS)" ./... && for bin in $(BIN_LIST); do \
+-		$(GO) build -i \
++		$(GO) build \
+ 			-tags "$(TAGS)" \
+ 			-ldflags "-s -w \
+ -X '$(REPO_PATH)/version.Version=$(VERSION)' \
 @@ -75,7 +75,7 @@ endif
  
  build-assets: ui/node_modules

[update] sysutils/facette to 0.5.1

2019-11-28 Thread Aaron Bieber 
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