Fri Apr 7 00:32:56 2023 UTC ()
Get closer to building on NetBSD and Tribblix. (Someone will need to
write more platform-specific battery-reporting code at some point.) One
build failure left, I think. Still packages on Linux and macOS.


(schmonz)
diff -r1.3 -r1.4 pkgsrc/shells/oh-my-posh/Makefile
diff -r1.2 -r1.3 pkgsrc/shells/oh-my-posh/distinfo
diff -r0 -r1.1 pkgsrc/shells/oh-my-posh/patches/patch-font_install__unix.go
diff -r0 -r1.1 pkgsrc/shells/oh-my-posh/patches/patch-platform_battery_battery__unix.go
cvs diff -r1.3 -r1.4 pkgsrc/shells/oh-my-posh/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/oh-my-posh/Makefile 2023/04/05 20:47:53 1.3
+++ pkgsrc/shells/oh-my-posh/Makefile 2023/04/07 00:32:56 1.4
@@ -1,36 +1,44 @@ @@ -1,36 +1,44 @@
1# $NetBSD: Makefile,v 1.3 2023/04/05 20:47:53 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.4 2023/04/07 00:32:56 schmonz Exp $
2 2
3DISTNAME= oh-my-posh-14.14.3 3DISTNAME= oh-my-posh-14.14.3
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= shells 5CATEGORIES= shells
6MASTER_SITES= ${MASTER_SITE_GITHUB:=JanDeDobbeleer/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=JanDeDobbeleer/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://ohmyposh.dev/ 10HOMEPAGE= https://ohmyposh.dev/
11COMMENT= Prompt theme engine for any shell 11COMMENT= Prompt theme engine for any shell
12LICENSE= mit 12LICENSE= mit
13 13
14WRKSRC= ${WRKDIR}/${DISTNAME}/src 14WRKSRC= ${WRKDIR}/${DISTNAME}/src
15 15
16USE_LANGUAGES= c 16USE_LANGUAGES= c
17 17
18SUBST_CLASSES+= version 18SUBST_CLASSES+= version
19SUBST_STAGE.version= do-configure 19SUBST_STAGE.version= do-configure
20SUBST_FILES.version= main.go 20SUBST_FILES.version= main.go
21SUBST_SED.version= -e 's|"development"|"${PKGVERSION_NOREV}"|' 21SUBST_SED.version= -e 's|"development"|"${PKGVERSION_NOREV}"|'
22 22
23INSTALLATION_DIRS= share/${PKGBASE} 23INSTALLATION_DIRS= share/${PKGBASE}
24 24
 25# XXX is this still fine on Darwin? Linux?
 26post-extract:
 27 # won't report useful battery status on non-Linux, but at least it'll compile
 28 ${MV} ${WRKSRC}/platform/battery/battery_linux.go ${WRKSRC}/platform/battery/battery_unix.go
 29 # NetBSD and Illumos are just weird kinds of Linux, doncha know
 30 ${MV} ${WRKDIR}/github.com/gookit/goutil@v0.6.7/sysutil/sysutil_linux.go \
 31 ${WRKDIR}/github.com/gookit/goutil@v0.6.7/sysutil/sysutil_unix.go
 32
25post-build: 33post-build:
26 ${MV} ${WRKDIR}/.gopath/bin/src ${WRKDIR}/.gopath/bin/oh-my-posh 34 ${MV} ${WRKDIR}/.gopath/bin/src ${WRKDIR}/.gopath/bin/oh-my-posh
27 35
28post-install: 36post-install:
29 cd ${WRKDIR}/${DISTNAME}/themes && \ 37 cd ${WRKDIR}/${DISTNAME}/themes && \
30 for f in *.json *.yaml; do \ 38 for f in *.json *.yaml; do \
31 ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/share/${PKGBASE}; \ 39 ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/share/${PKGBASE}; \
32 done 40 done
33 41
34.include "go-modules.mk" 42.include "go-modules.mk"
35.include "../../lang/go/go-module.mk" 43.include "../../lang/go/go-module.mk"
36.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/shells/oh-my-posh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/oh-my-posh/distinfo 2023/03/17 11:23:57 1.2
+++ pkgsrc/shells/oh-my-posh/distinfo 2023/04/07 00:32:56 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.2 2023/03/17 11:23:57 schmonz Exp $ 1$NetBSD: distinfo,v 1.3 2023/04/07 00:32:56 schmonz Exp $
2 2
3BLAKE2s (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.mod) = 574dbad9c3f38d9ccf476f1ed9a7f1ae9fd6c319709dccd144a62ec5e4c7e072 3BLAKE2s (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.mod) = 574dbad9c3f38d9ccf476f1ed9a7f1ae9fd6c319709dccd144a62ec5e4c7e072
4SHA512 (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.mod) = 5416d8501e504414289d0a89108861278d0909dac49ace875d3826836d26680af2328397ba3e872040b4b73f21fe81606bbd45aa6ec96eba91e9a554987415c4 4SHA512 (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.mod) = 5416d8501e504414289d0a89108861278d0909dac49ace875d3826836d26680af2328397ba3e872040b4b73f21fe81606bbd45aa6ec96eba91e9a554987415c4
5Size (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.mod) = 39 bytes 5Size (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.mod) = 39 bytes
6BLAKE2s (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.zip) = 4f88571e62fa111082778b1cc9d9a153498a1eaac4e50a12e717ddc770e62276 6BLAKE2s (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.zip) = 4f88571e62fa111082778b1cc9d9a153498a1eaac4e50a12e717ddc770e62276
7SHA512 (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.zip) = 913cee61922f03baa36a77d64aff1e9331952c743bd4830a9ec0568af419c65e9c050786b19dcc6ae7d92e4395ddc1318933bd19ab954f3119dc3bf74685ee92 7SHA512 (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.zip) = 913cee61922f03baa36a77d64aff1e9331952c743bd4830a9ec0568af419c65e9c050786b19dcc6ae7d92e4395ddc1318933bd19ab954f3119dc3bf74685ee92
8Size (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.zip) = 7793 bytes 8Size (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.zip) = 7793 bytes
9BLAKE2s (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.mod) = 8218fce6a82b4a9d722973098d905bee2ba1b8d28e58e556bac92cff42ec7a04 9BLAKE2s (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.mod) = 8218fce6a82b4a9d722973098d905bee2ba1b8d28e58e556bac92cff42ec7a04
10SHA512 (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.mod) = ff8b1d90d4e4a62c86c2540c22cf472dc432f29768b3387d2e39b333deee1c19b24752f8642684624ba483c699d77128f619d3d880ceac7003294e7a3a27cfaa 10SHA512 (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.mod) = ff8b1d90d4e4a62c86c2540c22cf472dc432f29768b3387d2e39b333deee1c19b24752f8642684624ba483c699d77128f619d3d880ceac7003294e7a3a27cfaa
11Size (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.mod) = 106 bytes 11Size (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.mod) = 106 bytes
12BLAKE2s (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.zip) = 340f207c5338b6fda599a5160debdfd976163dea2406e2bdb7a2f1f03602eaef 12BLAKE2s (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.zip) = 340f207c5338b6fda599a5160debdfd976163dea2406e2bdb7a2f1f03602eaef
13SHA512 (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.zip) = e47af540ecc4c2f46722eaac246a99a6c76e88bdcfb3c8b800e1b28e348c57c5bbc7f7c497cdf1c4da3466694afc6b083dde620c2d86f9a035f81c8f1a0b2e2b 13SHA512 (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.zip) = e47af540ecc4c2f46722eaac246a99a6c76e88bdcfb3c8b800e1b28e348c57c5bbc7f7c497cdf1c4da3466694afc6b083dde620c2d86f9a035f81c8f1a0b2e2b
14Size (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.zip) = 35621 bytes 14Size (github.com__azure_go-ansiterm_@v_v0.0.0-20230124172434-306776ec8161.zip) = 35621 bytes
@@ -803,13 +803,15 @@ SHA512 (gopkg.in_yaml.v2_@v_v2.4.0.mod)  @@ -803,13 +803,15 @@ SHA512 (gopkg.in_yaml.v2_@v_v2.4.0.mod)
803Size (gopkg.in_yaml.v2_@v_v2.4.0.mod) = 95 bytes 803Size (gopkg.in_yaml.v2_@v_v2.4.0.mod) = 95 bytes
804BLAKE2s (gopkg.in_yaml.v3_@v_v3.0.0-20200313102051-9f266ea9e77c.mod) = 17da54ba1894b4653d4c1ab1ae6e9fe03928a96c69cdc8db6b6ea9e34d673991 804BLAKE2s (gopkg.in_yaml.v3_@v_v3.0.0-20200313102051-9f266ea9e77c.mod) = 17da54ba1894b4653d4c1ab1ae6e9fe03928a96c69cdc8db6b6ea9e34d673991
805SHA512 (gopkg.in_yaml.v3_@v_v3.0.0-20200313102051-9f266ea9e77c.mod) = 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d 805SHA512 (gopkg.in_yaml.v3_@v_v3.0.0-20200313102051-9f266ea9e77c.mod) = 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
806Size (gopkg.in_yaml.v3_@v_v3.0.0-20200313102051-9f266ea9e77c.mod) = 95 bytes 806Size (gopkg.in_yaml.v3_@v_v3.0.0-20200313102051-9f266ea9e77c.mod) = 95 bytes
807BLAKE2s (gopkg.in_yaml.v3_@v_v3.0.1.mod) = 17da54ba1894b4653d4c1ab1ae6e9fe03928a96c69cdc8db6b6ea9e34d673991 807BLAKE2s (gopkg.in_yaml.v3_@v_v3.0.1.mod) = 17da54ba1894b4653d4c1ab1ae6e9fe03928a96c69cdc8db6b6ea9e34d673991
808SHA512 (gopkg.in_yaml.v3_@v_v3.0.1.mod) = 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d 808SHA512 (gopkg.in_yaml.v3_@v_v3.0.1.mod) = 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
809Size (gopkg.in_yaml.v3_@v_v3.0.1.mod) = 95 bytes 809Size (gopkg.in_yaml.v3_@v_v3.0.1.mod) = 95 bytes
810BLAKE2s (gopkg.in_yaml.v3_@v_v3.0.1.zip) = 2e80fa896e65b1ae160400012c71aeac70e22a31cac82ec4921c85a93d65774c 810BLAKE2s (gopkg.in_yaml.v3_@v_v3.0.1.zip) = 2e80fa896e65b1ae160400012c71aeac70e22a31cac82ec4921c85a93d65774c
811SHA512 (gopkg.in_yaml.v3_@v_v3.0.1.zip) = d57b0d42c71ad6503415e42979b51b0dc7f6344072c728ab2e3d4bab88da7b7d775e7f261868909f990f6b44aed6c533966c97bbe333a0acd65fc8bac9d1d4ff 811SHA512 (gopkg.in_yaml.v3_@v_v3.0.1.zip) = d57b0d42c71ad6503415e42979b51b0dc7f6344072c728ab2e3d4bab88da7b7d775e7f261868909f990f6b44aed6c533966c97bbe333a0acd65fc8bac9d1d4ff
812Size (gopkg.in_yaml.v3_@v_v3.0.1.zip) = 104623 bytes 812Size (gopkg.in_yaml.v3_@v_v3.0.1.zip) = 104623 bytes
813BLAKE2s (oh-my-posh-14.14.3.tar.gz) = 202f71a2fb32fb478f8e755e75593cd711ba1732e9122eb8ffa364dfc7e209c8 813BLAKE2s (oh-my-posh-14.14.3.tar.gz) = 202f71a2fb32fb478f8e755e75593cd711ba1732e9122eb8ffa364dfc7e209c8
814SHA512 (oh-my-posh-14.14.3.tar.gz) = e0cfecfa31dba8d071f6d3d07072f3d066e6eb81682c20127c0dfaedf355ee1cc1e8b337ef3efc6554eb4490a5e964bcbb7366ba0745ba40fdefb42a153a8610 814SHA512 (oh-my-posh-14.14.3.tar.gz) = e0cfecfa31dba8d071f6d3d07072f3d066e6eb81682c20127c0dfaedf355ee1cc1e8b337ef3efc6554eb4490a5e964bcbb7366ba0745ba40fdefb42a153a8610
815Size (oh-my-posh-14.14.3.tar.gz) = 4170973 bytes 815Size (oh-my-posh-14.14.3.tar.gz) = 4170973 bytes
 816SHA1 (patch-font_install__unix.go) = cca30cb0c78d1b02cd6054a74049f862ed047cd0
 817SHA1 (patch-platform_battery_battery__unix.go) = 5b34b0a3b488446a043ae02f330c6b0a2b6645bd
File Added: pkgsrc/shells/oh-my-posh/patches/Attic/patch-font_install__unix.go
$NetBSD: patch-font_install__unix.go,v 1.1 2023/04/07 00:32:56 schmonz Exp $

Build this file also on other Unixy platforms (besides Darwin).

--- font/install_unix.go.orig	2023-03-17 08:45:01.000000000 +0000
+++ font/install_unix.go
@@ -1,4 +1,4 @@
-//go:build linux
+//go:build !darwin && !windows
 
 // Derived from https://github.com/Crosse/font-install
 // Copyright 2020 Seth Wright <seth@crosse.org>
File Added: pkgsrc/shells/oh-my-posh/patches/Attic/patch-platform_battery_battery__unix.go
$NetBSD: patch-platform_battery_battery__unix.go,v 1.1 2023/04/07 00:32:56 schmonz Exp $

Build this file only on Unixy platforms (besides Darwin).

--- platform/battery/battery_unix.go.orig	2023-03-17 08:45:01.000000000 +0000
+++ platform/battery/battery_unix.go
@@ -1,3 +1,5 @@
+//go:build !darwin && !windows
+
 // battery
 // Copyright (C) 2016-2017 Karol 'Kenji Takahashi' Woźniak
 //