git: 6c696ba462f0 - main - net/gorss: update to version 0.4, don't force infocmp(1) installation
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 24 Sep 2023 17:20:50 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6c696ba462f0fe954461370f664888f9ddaeb61c
commit 6c696ba462f0fe954461370f664888f9ddaeb61c
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-09-24 17:19:24 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-09-24 17:19:24 +0000
net/gorss: update to version 0.4, don't force infocmp(1) installation
LookupTerminfo() first tries to find definitions based on the TERM
environment variable and falls back to parsing infocmp(1) output
only if that fails. The latter is really a method of last resort,
as the performance will be slow. Do not force this dependency since
it is rarely needed, and most likely due to incorrectly configured
environment which should be fixed instead.
Improve user-friendliness of the program on the first run by copying
installed example configuration and default theme files into user's
home directory (exact location depends on XDG configuration).
PR: 272768
---
net/gorss/Makefile | 16 ++----
net/gorss/Makefile.deps | 44 +++++++++-------
net/gorss/distinfo | 90 ++++++++++++++++++++-------------
net/gorss/files/patch-cmd_gorss_main.go | 28 ++++++++++
4 files changed, 115 insertions(+), 63 deletions(-)
diff --git a/net/gorss/Makefile b/net/gorss/Makefile
index a337fc8de54e..05734be4ab07 100644
--- a/net/gorss/Makefile
+++ b/net/gorss/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gorss
-PORTVERSION= 0.3
+PORTVERSION= 0.4
DISTVERSIONPREFIX= v
-PORTREVISION= 15
CATEGORIES= net www
MAINTAINER= ports@FreeBSD.org
@@ -15,28 +14,23 @@ USES= go:modules
USE_GITHUB= yes
GH_ACCOUNT= Lallassu
-.include <bsd.port.options.mk>
-
-.if (${OPSYS} == FreeBSD && ( ${OSVERSION} < 1400000))
-USES+= ncurses:port
-.endif
-
.include "${.CURDIR}/Makefile.deps"
GO_BUILDFLAGS= -ldflags "-w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal.Version=${PORTVERSION}"
GO_TARGET= ./cmd/${PORTNAME}
PLIST_FILES= bin/${PORTNAME} \
+ ${DATADIR_REL}/gorss.conf \
${DATADIR_REL}/themes/default.theme \
${DATADIR_REL}/themes/irssi.theme \
${DATADIR_REL}/themes/night.theme
post-patch:
- @${LN} -sf xdg_linux.go \
- ${WRKSRC}/vendor/github.com/OpenPeeDeeP/xdg/xdg_${OPSYS:tl}.go
+ @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
+ ${WRKSRC}/vendor/github.com/OpenPeeDeeP/xdg/xdg_bsd.go
post-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
- ${CP} -a ${WRKSRC}/themes ${STAGEDIR}${DATADIR}
+ ${CP} -a ${WRKSRC}/gorss.conf ${WRKSRC}/themes ${STAGEDIR}${DATADIR}
.include <bsd.port.mk>
diff --git a/net/gorss/Makefile.deps b/net/gorss/Makefile.deps
index b0f237ba9786..0365bb1d91a7 100644
--- a/net/gorss/Makefile.deps
+++ b/net/gorss/Makefile.deps
@@ -1,21 +1,31 @@
# Generated with `make gomod-vendor'
GH_TUPLE= \
- OpenPeeDeeP:xdg:v0.2.0:openpeedeep_xdg/vendor/github.com/OpenPeeDeeP/xdg \
- PuerkitoBio:goquery:v1.5.0:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
- andybalholm:cascadia:v1.0.0:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
+ OpenPeeDeeP:xdg:v1.0.0:openpeedeep_xdg/vendor/github.com/OpenPeeDeeP/xdg \
+ PuerkitoBio:goquery:v1.8.1:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
+ andybalholm:cascadia:v1.3.1:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
- gdamore:tcell:v1.2.0:gdamore_tcell/vendor/github.com/gdamore/tcell \
+ gdamore:tcell:v1.4.0:gdamore_tcell/vendor/github.com/gdamore/tcell \
+ gdamore:tcell:v2.6.0:gdamore_tcell_v2/vendor/github.com/gdamore/tcell/v2 \
+ gen2brain:beeep:6e717729cb4f:gen2brain_beeep/vendor/github.com/gen2brain/beeep \
gilliek:go-opml:v1.0.0:gilliek_go_opml/vendor/github.com/gilliek/go-opml \
- golang:net:ba9fcec4b297:golang_net/vendor/golang.org/x/net \
- golang:sys:e07cf5db2756:golang_sys/vendor/golang.org/x/sys \
- golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
- jaytaylor:html2text:01ec452cbe43:jaytaylor_html2text/vendor/jaytaylor.com/html2text \
- lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
- mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
- mattn:go-sqlite3:v1.11.0:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
- mmcdole:gofeed:v1.0.0-beta2:mmcdole_gofeed/vendor/github.com/mmcdole/gofeed \
- mmcdole:goxpp:0068e33feabf:mmcdole_goxpp/vendor/github.com/mmcdole/goxpp \
- olekukonko:tablewriter:v0.0.1:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
- rivo:tview:f8bc69b90341:rivo_tview/vendor/github.com/rivo/tview \
- rivo:uniseg:b9f5b9457d44:rivo_uniseg/vendor/github.com/rivo/uniseg \
- ssor:bom:6386211fdfcf:ssor_bom/vendor/github.com/ssor/bom
+ go-toast:toast:01e6764cf0a4:go_toast_toast/vendor/github.com/go-toast/toast \
+ godbus:dbus:v5.1.0:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
+ golang:net:v0.8.0:golang_net/vendor/golang.org/x/net \
+ golang:sys:v0.6.0:golang_sys/vendor/golang.org/x/sys \
+ golang:term:v0.6.0:golang_term/vendor/golang.org/x/term \
+ golang:text:v0.8.0:golang_text/vendor/golang.org/x/text \
+ jaytaylor:html2text:74c2419ad056:jaytaylor_html2text/vendor/jaytaylor.com/html2text \
+ json-iterator:go:v1.1.12:json_iterator_go/vendor/github.com/json-iterator/go \
+ lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
+ mattn:go-runewidth:v0.0.14:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+ mattn:go-sqlite3:v1.14.16:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+ mmcdole:gofeed:v1.2.1:mmcdole_gofeed/vendor/github.com/mmcdole/gofeed \
+ mmcdole:goxpp:v1.1.0:mmcdole_goxpp/vendor/github.com/mmcdole/goxpp \
+ modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
+ modern-go:reflect2:v1.0.2:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
+ nu7hatch:gouuid:179d4d0c4d8d:nu7hatch_gouuid/vendor/github.com/nu7hatch/gouuid \
+ olekukonko:tablewriter:v0.0.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
+ rivo:tview:84f9c0ff9de8:rivo_tview/vendor/github.com/rivo/tview \
+ rivo:uniseg:v0.4.4:rivo_uniseg/vendor/github.com/rivo/uniseg \
+ ssor:bom:6386211fdfcf:ssor_bom/vendor/github.com/ssor/bom \
+ tadvi:systray:11a2b8fa57af:tadvi_systray/vendor/github.com/tadvi/systray
diff --git a/net/gorss/distinfo b/net/gorss/distinfo
index 7f27b22d0e58..98a56a0e80d5 100644
--- a/net/gorss/distinfo
+++ b/net/gorss/distinfo
@@ -1,41 +1,61 @@
-TIMESTAMP = 1603882104
-SHA256 (Lallassu-gorss-v0.3_GH0.tar.gz) = 28f8c03c0ec5844fde940216d3906fbdc5a8f644dd9ccb5d0321825ca6bf7a57
-SIZE (Lallassu-gorss-v0.3_GH0.tar.gz) = 7816076
-SHA256 (OpenPeeDeeP-xdg-v0.2.0_GH0.tar.gz) = decfceaec24c6b09f209924c3ff17b528604f1b60df8f3b5dff82b4c34558f63
-SIZE (OpenPeeDeeP-xdg-v0.2.0_GH0.tar.gz) = 6601
-SHA256 (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 0307341d56ae12648584b3990fb1e84f465870247e46aff00381c98c5ad231c7
-SIZE (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 100975
-SHA256 (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 00ab6f915e958c9e0509836cd67082a802513459c12c4aa6e7a28ef37743ce52
-SIZE (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 13232
+TIMESTAMP = 1679591277
+SHA256 (Lallassu-gorss-v0.4_GH0.tar.gz) = 9217a2fb49a07eef904852dcebe41e74c2c7a029b2bc93c78e85d722fb346703
+SIZE (Lallassu-gorss-v0.4_GH0.tar.gz) = 7821329
+SHA256 (OpenPeeDeeP-xdg-v1.0.0_GH0.tar.gz) = d565019d49bc1b47e777981e4fa70bcbe00e3c77b7263d50433230ae77b94f47
+SIZE (OpenPeeDeeP-xdg-v1.0.0_GH0.tar.gz) = 6720
+SHA256 (PuerkitoBio-goquery-v1.8.1_GH0.tar.gz) = d6e72ac1c5bb92e1106dab9a03bb29cdabd7b1ef8b915e7a6fbcfedb8e2b9388
+SIZE (PuerkitoBio-goquery-v1.8.1_GH0.tar.gz) = 106563
+SHA256 (andybalholm-cascadia-v1.3.1_GH0.tar.gz) = ced0bf6f8daadb38619be1e70675c6920c994649b83cd0a20e9e096c3785eb72
+SIZE (andybalholm-cascadia-v1.3.1_GH0.tar.gz) = 33071
SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
-SHA256 (gdamore-tcell-v1.2.0_GH0.tar.gz) = 39f3d1fb6c30b911141f6d19d3e3ee1352af7907336910811a8e60b2f10c8d8b
-SIZE (gdamore-tcell-v1.2.0_GH0.tar.gz) = 146485
+SHA256 (gdamore-tcell-v1.4.0_GH0.tar.gz) = 20f8c7dca13178982d7db797a6d47eb582d268240526fded412866b6293b1daf
+SIZE (gdamore-tcell-v1.4.0_GH0.tar.gz) = 151954
+SHA256 (gdamore-tcell-v2.6.0_GH0.tar.gz) = cd157929007755f69e858a97647ad9c8805184635b8774fb0f930e0282b0ae5d
+SIZE (gdamore-tcell-v2.6.0_GH0.tar.gz) = 173877
+SHA256 (gen2brain-beeep-6e717729cb4f_GH0.tar.gz) = 3889f1a1893b42d87842cd841bc0422db6861f4dc14afefa57001efc2d8c1d1a
+SIZE (gen2brain-beeep-6e717729cb4f_GH0.tar.gz) = 19904
SHA256 (gilliek-go-opml-v1.0.0_GH0.tar.gz) = 54d184503845a831daa9eb9c041f2bd9ae33aa2f607f3aeb6bcee5e61e513d69
SIZE (gilliek-go-opml-v1.0.0_GH0.tar.gz) = 4165
-SHA256 (golang-net-ba9fcec4b297_GH0.tar.gz) = eae512644d59db05f5420315897daf1315beee1b07c723703922d6174f28b993
-SIZE (golang-net-ba9fcec4b297_GH0.tar.gz) = 1100029
-SHA256 (golang-sys-e07cf5db2756_GH0.tar.gz) = 4aff7bdec4be7c5d8ddb1655b02c537e1380d26f02eb25dec89e9dca563f0f36
-SIZE (golang-sys-e07cf5db2756_GH0.tar.gz) = 1448658
-SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (jaytaylor-html2text-01ec452cbe43_GH0.tar.gz) = 4132a677ad55a82d24cf7f5422a227bce85044c08ab9ca6be0fd14551a7ee345
-SIZE (jaytaylor-html2text-01ec452cbe43_GH0.tar.gz) = 15152
-SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140
-SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545
-SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
-SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
-SHA256 (mattn-go-sqlite3-v1.11.0_GH0.tar.gz) = bbf0711c000be4dcdda2bed529ed8fd03679c69e39793e11b8b5d9dfe9b533ca
-SIZE (mattn-go-sqlite3-v1.11.0_GH0.tar.gz) = 2278788
-SHA256 (mmcdole-gofeed-v1.0.0-beta2_GH0.tar.gz) = c9bba6379f2f7c3bf65e0f2ddfe3789310c0f8af269152df20dc4daae4b57be9
-SIZE (mmcdole-gofeed-v1.0.0-beta2_GH0.tar.gz) = 3804592
-SHA256 (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 432aadb22bc36d15d405c8b08a2c44dfd6f73508c49971e5a773cb6683f124ab
-SIZE (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 5167
-SHA256 (olekukonko-tablewriter-v0.0.1_GH0.tar.gz) = d9d620f0bcd58953a44b514042caa378b8256a692bcc8c0842e8aeac5a87db89
-SIZE (olekukonko-tablewriter-v0.0.1_GH0.tar.gz) = 17505
-SHA256 (rivo-tview-f8bc69b90341_GH0.tar.gz) = f271740c1d46fe1be6888af636ea5fe430f4dacfacf11c6de0b208c292db74bf
-SIZE (rivo-tview-f8bc69b90341_GH0.tar.gz) = 2861099
-SHA256 (rivo-uniseg-b9f5b9457d44_GH0.tar.gz) = 710a4b93f00e30012ecc518eb5c3a032681aab2bcdd20ae734fe7b5e6a8bbb4a
-SIZE (rivo-uniseg-b9f5b9457d44_GH0.tar.gz) = 43962
+SHA256 (go-toast-toast-01e6764cf0a4_GH0.tar.gz) = f036f1b7def281fe0179db01729250922c75732a7fb3fe63acf7f7b60dcc3159
+SIZE (go-toast-toast-01e6764cf0a4_GH0.tar.gz) = 213533
+SHA256 (godbus-dbus-v5.1.0_GH0.tar.gz) = 2f4939ab13a20178584ef534293abc5b6744bb5b6232432050c5a3ab2ab85fd7
+SIZE (godbus-dbus-v5.1.0_GH0.tar.gz) = 74080
+SHA256 (golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831
+SIZE (golang-net-v0.8.0_GH0.tar.gz) = 1244302
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
+SHA256 (golang-term-v0.6.0_GH0.tar.gz) = 4fdff852a658e927e7886629ef7cd88874a11ddf0c8b3633a50961afc8902093
+SIZE (golang-term-v0.6.0_GH0.tar.gz) = 14795
+SHA256 (golang-text-v0.8.0_GH0.tar.gz) = aeaec799a8e0b02523c80fed03383da04bf1b9c9ef431ed4d34b70488fbeaa64
+SIZE (golang-text-v0.8.0_GH0.tar.gz) = 8359526
+SHA256 (jaytaylor-html2text-74c2419ad056_GH0.tar.gz) = 66ea85d591c790662befca911b4f0d017ead597f3c6e6a5af52f89673bc628b0
+SIZE (jaytaylor-html2text-74c2419ad056_GH0.tar.gz) = 15610
+SHA256 (json-iterator-go-v1.1.12_GH0.tar.gz) = ff70e539fd919da757a2f3a530a053e7577cb4d7e2824fc1058d3abbefbb523e
+SIZE (json-iterator-go-v1.1.12_GH0.tar.gz) = 84307
+SHA256 (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = b3ee835cc398287452377266313edcc231043bae4168f8d2706e5d34ce1ce755
+SIZE (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = 970830
+SHA256 (mattn-go-runewidth-v0.0.14_GH0.tar.gz) = 0e6a49d6a8f694154af2746a820d4c5f13fe3d9b0968bdf16fcf939dd461e034
+SIZE (mattn-go-runewidth-v0.0.14_GH0.tar.gz) = 18274
+SHA256 (mattn-go-sqlite3-v1.14.16_GH0.tar.gz) = 826a8201600e05860b6a580c0b97a75b11fa6ca469696868d23d7c680ed19c54
+SIZE (mattn-go-sqlite3-v1.14.16_GH0.tar.gz) = 2475472
+SHA256 (mmcdole-gofeed-v1.2.1_GH0.tar.gz) = c9bbd6dccfaf84305dbcf1b656dd1460b462438baa37728bc43bcfe4bd75fc73
+SIZE (mmcdole-gofeed-v1.2.1_GH0.tar.gz) = 127908
+SHA256 (mmcdole-goxpp-v1.1.0_GH0.tar.gz) = 9bd9a09a76d82f157a84ea68f3742d205bdeeb323d8da572d13b28a7c26903c3
+SIZE (mmcdole-goxpp-v1.1.0_GH0.tar.gz) = 7182
+SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
+SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
+SHA256 (modern-go-reflect2-v1.0.2_GH0.tar.gz) = eab313f24c09d512f004d489aeed0d0a485f789abd07e7df411375035174341b
+SIZE (modern-go-reflect2-v1.0.2_GH0.tar.gz) = 14030
+SHA256 (nu7hatch-gouuid-179d4d0c4d8d_GH0.tar.gz) = 2ead616e5bb23c0c669a1485cb45f083d8d6752acc5faa5f668521b7e99ec2e1
+SIZE (nu7hatch-gouuid-179d4d0c4d8d_GH0.tar.gz) = 3733
+SHA256 (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 14a1294a8267facc9bc99a230b8871517e6db284ccc7e39030313befa124677f
+SIZE (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 19568
+SHA256 (rivo-tview-84f9c0ff9de8_GH0.tar.gz) = 34805ec29198bb2030012e6a772f100abfe9416b57c5b1e6ea82e1542e958176
+SIZE (rivo-tview-84f9c0ff9de8_GH0.tar.gz) = 1954898
+SHA256 (rivo-uniseg-v0.4.4_GH0.tar.gz) = eb2837932d0a666e13ea6b4cebf698096266d4f14740faa78c63b8291cf1fb5c
+SIZE (rivo-uniseg-v0.4.4_GH0.tar.gz) = 453399
SHA256 (ssor-bom-6386211fdfcf_GH0.tar.gz) = 6e05adf64dd2846fa27f0e89038171600806529d3f0df3ef50edb42304399336
SIZE (ssor-bom-6386211fdfcf_GH0.tar.gz) = 1802
+SHA256 (tadvi-systray-11a2b8fa57af_GH0.tar.gz) = c7a2e5733693597e643460a6d30f1680c5d294b84a6133ede577e1fa73e176e3
+SIZE (tadvi-systray-11a2b8fa57af_GH0.tar.gz) = 25788
diff --git a/net/gorss/files/patch-cmd_gorss_main.go b/net/gorss/files/patch-cmd_gorss_main.go
new file mode 100644
index 000000000000..156c0d7e1e88
--- /dev/null
+++ b/net/gorss/files/patch-cmd_gorss_main.go
@@ -0,0 +1,28 @@
+--- cmd/gorss/main.go.orig 2023-03-23 17:07:57 UTC
++++ cmd/gorss/main.go
+@@ -41,6 +41,7 @@ func main() {
+
+ dataHome := conf.DataHome()
+ configHome := conf.ConfigHome()
++ systemDataDir := conf.DataDirs()[0]
+
+ // Create dirs
+ for _, path := range []string{dataHome, configHome} {
+@@ -61,7 +62,7 @@ func main() {
+ // check if default config exists, copy if not
+ _, err := os.Stat(cfg)
+ if errors.Is(err, os.ErrNotExist) {
+- internal.CopyFile(defaultConfig, cfg)
++ internal.CopyFile(fmt.Sprintf("%s/%s", systemDataDir, defaultConfig), cfg)
+ }
+ }
+ }
+@@ -80,7 +81,7 @@ func main() {
+ if err := os.Mkdir(themeDir, os.ModePerm); err != nil {
+ log.Printf("Failed to create dir: %s\n", themeDir)
+ }
+- internal.CopyFile(defaultTheme, theme)
++ internal.CopyFile(fmt.Sprintf("%s/%s", systemDataDir, defaultTheme), theme)
+ }
+ }
+ }