git: 7ae5b8769dc5 - main - net/librespeed-go: Update to 1.1.4

[Guangyuan Yang]

The branch main has been updated by ygy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7ae5b8769dc525054cc8847c7cdaee27c5c0ae80

commit 7ae5b8769dc525054cc8847c7cdaee27c5c0ae80
Author:     Dries Michiels <driesm.michiels at gmail.com>
AuthorDate: 2021-09-19 19:52:40 +0000
Commit:     Guangyuan Yang <ygy at FreeBSD.org>
CommitDate: 2021-09-19 19:52:40 +0000

    net/librespeed-go: Update to 1.1.4
    
    Changelog:      https://github.com/librespeed/speedtest-go/releases/tag/v1.1.4
    
    PR:             258600
---
 net/librespeed-go/Makefile             | 12 +++++-------
 net/librespeed-go/distinfo             | 10 +++++-----
 net/librespeed-go/files/pkg-message.in |  3 +--
 net/librespeed-go/pkg-plist            | 12 +-----------
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/net/librespeed-go/Makefile b/net/librespeed-go/Makefile
index ac4a980f7b06..9a4f9c775265 100644
--- a/net/librespeed-go/Makefile
+++ b/net/librespeed-go/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	librespeed-go
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.3
+DISTVERSION=	1.1.4
 CATEGORIES=	net www
 
 MAINTAINER=	driesm.michiels at gmail.com
@@ -26,16 +26,14 @@ OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	${REINPLACE_CMD} -e 's|"."|"${ETCDIR}"|g' ${WRKSRC}/config/config.go
-	${REINPLACE_CMD} -e 's|"./assets"|"${WWWDIR}"|g' ${WRKSRC}/config/config.go
 
 pre-install:
-	${REINPLACE_CMD} -e 's|"./assets"|"${WWWDIR}"|g' ${WRKSRC}/settings.toml
-	${REINPLACE_CMD} -e 's|"speedtest.db"|"/var/db/${PORTNAME}/speedtest.db"|g' ${WRKSRC}/settings.toml
+	${REINPLACE_CMD} -e 's|assets_path=""|assets_path="${WWWDIR}"|g' ${WRKSRC}/settings.toml
+	${REINPLACE_CMD} -e 's|speedtest.db|/var/db/${PORTNAME}/speedtest.db|g' ${WRKSRC}/settings.toml
 
 post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
-	${CP} -a ${WRKSRC}/assets/*.js ${STAGEDIR}${WWWDIR}
-	${CP} -a ${WRKSRC}/assets/*.ttf ${STAGEDIR}${WWWDIR}
+	${CP} -a ${WRKSRC}/web/assets/*.js ${STAGEDIR}${WWWDIR}
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/settings.toml ${STAGEDIR}${ETCDIR}/settings.toml.sample
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
@@ -43,6 +41,6 @@ post-install:
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${CP} -a ${WRKSRC}/assets/*.html ${STAGEDIR}${EXAMPLESDIR}
+	${CP} -a ${WRKSRC}/web/assets/*.html ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net/librespeed-go/distinfo b/net/librespeed-go/distinfo
index db971c3ff2c8..9ca5d3623ca2 100644
--- a/net/librespeed-go/distinfo
+++ b/net/librespeed-go/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1616267468
-SHA256 (go/net_librespeed-go/librespeed-go-v1.1.3/v1.1.3.mod) = 729ef810a813698820b8d025d13c81ccc40791c59350c4053967b3dcec47d9f0
-SIZE (go/net_librespeed-go/librespeed-go-v1.1.3/v1.1.3.mod) = 1207
-SHA256 (go/net_librespeed-go/librespeed-go-v1.1.3/v1.1.3.zip) = 799e68773d93b5772d589a6b5fd81ae87bd67b2c5e7744066c68fec35946e4d9
-SIZE (go/net_librespeed-go/librespeed-go-v1.1.3/v1.1.3.zip) = 2273742
+TIMESTAMP = 1632048939
+SHA256 (go/net_librespeed-go/librespeed-go-v1.1.4/v1.1.4.mod) = 4b8b82ecf25d90c7d9ba9560487be6f9a4be3bcba2c8409c74f6fe816da4b57a
+SIZE (go/net_librespeed-go/librespeed-go-v1.1.4/v1.1.4.mod) = 952
+SHA256 (go/net_librespeed-go/librespeed-go-v1.1.4/v1.1.4.zip) = 75a82716b0cec884145a491c53ba9a8b28f3a872fd5b17aaca458158bc042f6d
+SIZE (go/net_librespeed-go/librespeed-go-v1.1.4/v1.1.4.zip) = 2262145
diff --git a/net/librespeed-go/files/pkg-message.in b/net/librespeed-go/files/pkg-message.in
index 1cd558f6fede..61a06c675347 100644
--- a/net/librespeed-go/files/pkg-message.in
+++ b/net/librespeed-go/files/pkg-message.in
@@ -3,9 +3,8 @@
   message: <<EOM
 Copy your preferred example from %%EXAMPLESDIR%% to
 %%WWWDIR%%/index.html.
-To use the backend feature, be sure to copy a -full example.
 	cd %%EXAMPLESDIR%%
-	cp -a example-singleServer-full.html %%WWWDIR%%/index.html
+	cp -a index.html %%WWWDIR%%/index.html
 
 To automatically start librespeed-go at boot time:
         sysrc librespeed_go_enable="YES"
diff --git a/net/librespeed-go/pkg-plist b/net/librespeed-go/pkg-plist
index 5abae96ed7bc..514fdd2ad3be 100644
--- a/net/librespeed-go/pkg-plist
+++ b/net/librespeed-go/pkg-plist
@@ -1,17 +1,7 @@
 bin/librespeed-go
 @sample %%ETCDIR%%/settings.toml.sample
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-multipleServers-full.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-multipleServers-pretty.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-singleServer-basic.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-singleServer-chart.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-singleServer-customSettings.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-singleServer-full.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-singleServer-gauges.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-singleServer-pretty.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-singleServer-progressBar.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.html
-%%WWWDIR%%/NotoSansDisplay-Light.ttf
-%%WWWDIR%%/NotoSansDisplay-Medium.ttf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linode.html
 %%WWWDIR%%/speedtest.js
 %%WWWDIR%%/speedtest_worker.js
 @owner %%LIBRESPEED_USER%%