CVS commit: pkgsrc/www/gotosocial

["nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon May 27 20:04:46 UTC 2024

Modified Files:
        pkgsrc/www/gotosocial: Makefile PLIST distinfo
        pkgsrc/www/gotosocial/files: gotosocial.sh

Log Message:
gotosocial: add webassets, fix runtime errors.

Add required webassets, as reported by Joel Carnat <joel%carnat.net@localhost>.
Partially based on a patch by Joel, with adjustments.
Thanks!

This could be build from the original source with yarn as well if we
download node modules into the build environment.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/gotosocial/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/gotosocial/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/gotosocial/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/gotosocial/files/gotosocial.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/gotosocial/Makefile
diff -u pkgsrc/www/gotosocial/Makefile:1.33 pkgsrc/www/gotosocial/Makefile:1.34
--- pkgsrc/www/gotosocial/Makefile:1.33 Fri Apr 12 15:10:20 2024
+++ pkgsrc/www/gotosocial/Makefile      Mon May 27 20:04:46 2024
@@ -1,17 +1,24 @@
-# $NetBSD: Makefile,v 1.33 2024/04/12 15:10:20 nikita Exp $
+# $NetBSD: Makefile,v 1.34 2024/05/27 20:04:46 nikita Exp $
 
 DISTNAME=      gotosocial-0.15.0-source-code
 PKGNAME=       ${DISTNAME:S/-source-code//}
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=superseriousbusiness/}
-GITHUB_RELEASE=        v${PKGVERSION_NOREV}
-GITHUB_PROJECT=        gotosocial
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    nikita%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/superseriousbusiness/gotosocial/
 COMMENT=       Fediverse server written in Go
 LICENSE=       gnu-agpl-v3
-USE_TOOLS+=    pax
+USE_TOOLS+=    pax tar
+
+DISTFILES=      gotosocial-0.15.0-source-code.tar.gz
+DISTFILES+=    gotosocial_0.15.0_web-assets.tar.gz
+
+SITES.gotosocial-0.15.0-source-code.tar.gz= \
+       -https://github.com/superseriousbusiness/gotosocial/releases/download/v0.15.0/gotosocial-0.15.0-source-code.tar.gz
+
+SITES.gotosocial_0.15.0_web-assets.tar.gz= \
+       -https://github.com/superseriousbusiness/gotosocial/releases/download/v0.15.0/gotosocial_0.15.0_web-assets.tar.gz
 
 # release archive has no toplevel folder.
 EXTRACT_DIR=   ${WRKDIR}/${PKGNAME}
@@ -71,6 +78,8 @@ ONLY_FOR_PLATFORM=    *-*-x86_64
 
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} scripts/build.sh
+       # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} && \
+       # go build -o gotosocial ./cmd/gotosocial
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/gotosocial ${DESTDIR}/${PREFIX}/bin/
@@ -78,6 +87,7 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/example/config.yaml ${DESTDIR}/${EGDIR}/config.yaml
        ${INSTALL_DATA} ${WRKSRC}/example/docker-compose/docker-compose.yaml ${DESTDIR}/${EGDIR}/docker-compose.yaml
        ${INSTALL_DATA} ${WRKSRC}/example/gotosocial.service ${DESTDIR}/${EGDIR}/gotosocial.service
+       cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/gotosocial_0.15.0_web-assets.tar.gz
        cd ${WRKSRC} && ${PAX} -rw web ${DESTDIR}/${EGDIR}
 
 do-test:

Index: pkgsrc/www/gotosocial/PLIST
diff -u pkgsrc/www/gotosocial/PLIST:1.12 pkgsrc/www/gotosocial/PLIST:1.13
--- pkgsrc/www/gotosocial/PLIST:1.12    Fri Apr 12 15:10:20 2024
+++ pkgsrc/www/gotosocial/PLIST Mon May 27 20:04:46 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2024/04/12 15:10:20 nikita Exp $
+@comment $NetBSD: PLIST,v 1.13 2024/05/27 20:04:46 nikita Exp $
 bin/gotosocial
 share/examples/gotosocial/config.yaml
 share/examples/gotosocial/docker-compose.yaml
@@ -24,6 +24,19 @@ share/examples/gotosocial/web/assets/def
 share/examples/gotosocial/web/assets/default_avatars/GoToSocial_icon5.png
 share/examples/gotosocial/web/assets/default_avatars/GoToSocial_icon6.png
 share/examples/gotosocial/web/assets/default_header.png
+share/examples/gotosocial/web/assets/dist/_colors.css
+share/examples/gotosocial/web/assets/dist/about.css
+share/examples/gotosocial/web/assets/dist/base.css
+share/examples/gotosocial/web/assets/dist/frontend.js
+share/examples/gotosocial/web/assets/dist/index.css
+share/examples/gotosocial/web/assets/dist/page.css
+share/examples/gotosocial/web/assets/dist/prism.css
+share/examples/gotosocial/web/assets/dist/profile.css
+share/examples/gotosocial/web/assets/dist/settings-style.css
+share/examples/gotosocial/web/assets/dist/settings.js
+share/examples/gotosocial/web/assets/dist/status.css
+share/examples/gotosocial/web/assets/dist/tag.css
+share/examples/gotosocial/web/assets/dist/thread.css
 share/examples/gotosocial/web/assets/feditext.svg
 share/examples/gotosocial/web/assets/fonts/OFL.txt
 share/examples/gotosocial/web/assets/fonts/noto-sans-v27-latin-700.woff
@@ -34,6 +47,7 @@ share/examples/gotosocial/web/assets/log
 share/examples/gotosocial/web/assets/logo.svg
 share/examples/gotosocial/web/assets/mastodon.svg
 share/examples/gotosocial/web/assets/plyr.svg
+share/examples/gotosocial/web/assets/swagger.yaml
 share/examples/gotosocial/web/assets/themes/blurple-dark.css
 share/examples/gotosocial/web/assets/themes/blurple-light.css
 share/examples/gotosocial/web/assets/themes/midnight-trip.css

Index: pkgsrc/www/gotosocial/distinfo
diff -u pkgsrc/www/gotosocial/distinfo:1.16 pkgsrc/www/gotosocial/distinfo:1.17
--- pkgsrc/www/gotosocial/distinfo:1.16 Tue May 14 22:44:55 2024
+++ pkgsrc/www/gotosocial/distinfo      Mon May 27 20:04:46 2024
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.16 2024/05/14 22:44:55 wiz Exp $
+$NetBSD: distinfo,v 1.17 2024/05/27 20:04:46 nikita Exp $
 
 BLAKE2s (gotosocial-0.15.0-source-code.tar.gz) = b1741b7e62e38add85f5ccfa678038adee6507b959acbcede71871d3de0d0f9a
 SHA512 (gotosocial-0.15.0-source-code.tar.gz) = de1f17892b3eeb62751ab61a782f74728fc36d80eb9ec27bec7ebdd3317a586850dc78d0be9862d561e9da07b1228ca57223af0f5caaf6ad811e10e0677f3f6a
 Size (gotosocial-0.15.0-source-code.tar.gz) = 75292015 bytes
+BLAKE2s (gotosocial_0.15.0_web-assets.tar.gz) = 41f2a9ff57f136c722c2cd4b43a3be014ee082b61a701280ce2f0bc8e6dd8ab1
+SHA512 (gotosocial_0.15.0_web-assets.tar.gz) = 8ab0a77a58086aa956c8ad9e38ecfc8e7c1485539e685030384a2cca1eb8d11fbda1cf23c29573958747652675762076547b675a3651e05f0fa7709dd7701880
+Size (gotosocial_0.15.0_web-assets.tar.gz) = 1420530 bytes
 SHA1 (patch-vendor_github.com_tdewolff_minify_v2_Makefile) = 2658c6597d4037b2f1ce1e2cf927a288146b21a3

Index: pkgsrc/www/gotosocial/files/gotosocial.sh
diff -u pkgsrc/www/gotosocial/files/gotosocial.sh:1.1 pkgsrc/www/gotosocial/files/gotosocial.sh:1.2
--- pkgsrc/www/gotosocial/files/gotosocial.sh:1.1       Sun Nov 20 20:17:03 2022
+++ pkgsrc/www/gotosocial/files/gotosocial.sh   Mon May 27 20:04:46 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: gotosocial.sh,v 1.1 2022/11/20 20:17:03 nikita Exp $
+# $NetBSD: gotosocial.sh,v 1.2 2024/05/27 20:04:46 nikita Exp $
 #
 # PROVIDE: gotosocial
 # REQUIRE: NETWORKING DAEMON
@@ -15,7 +15,7 @@ rcvar=${name}
 
 command="@PREFIX@/bin/gotosocial"
 : ${gotosocial_config:=@PKG_SYSCONFDIR@/config.yaml}
-command_args="--config-path ${gotosocial_config} server start"
+command_args="--config-path ${gotosocial_config} server start 2>&1 | logger -t ${name} -p daemon.info &"
 required_files="${gotosocial_config}"
 
 start_precmd="gotosocial_precmd"