pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/sift sift: update to 0.9.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/39dbfc483017
branches: trunk
changeset: 385493:39dbfc483017
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Sun Sep 18 11:54:51 2022 +0000
description:
sift: update to 0.9.0
Also turn this into a Go module build because it's 2022.
Version 0.9.0 introduces several new options/features:
* --conf
* --field-sep
* --byte-offset
* Support for custom types
A detailed description can be found in this blog post:
https://svent.github.io/2016/10/23/sift-version-0.9-released/
This version also removes the cgo dependency while improving the
performance for line counting and case conversions.
diffstat:
textproc/sift/Makefile | 19 ++++--------
textproc/sift/PLIST | 13 +--------
textproc/sift/distinfo | 42 ++++++++++++++++++++++++---
textproc/sift/files/go.mod | 14 +++++++++
textproc/sift/files/go.sum | 11 +++++++
textproc/sift/go-modules.mk | 13 ++++++++
textproc/sift/patches/patch-matching__cgo.go | 15 ----------
7 files changed, 83 insertions(+), 44 deletions(-)
diffs (167 lines):
diff -r d28c80f62716 -r 39dbfc483017 textproc/sift/Makefile
--- a/textproc/sift/Makefile Sun Sep 18 11:54:06 2022 +0000
+++ b/textproc/sift/Makefile Sun Sep 18 11:54:51 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2022/09/07 09:32:18 bsiegert Exp $
+# $NetBSD: Makefile,v 1.54 2022/09/18 11:54:51 bsiegert Exp $
-DISTNAME= sift-0.6.0
-PKGREVISION= 51
+DISTNAME= sift-0.9.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=svent/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -11,14 +10,10 @@
COMMENT= Fast and powerful open source alternative to grep
LICENSE= gnu-gpl-v3
-GO_DIST_BASE= ${DISTNAME}
-GO_SRCPATH= github.com/svent/sift
-
-post-install:
- find ${DESTDIR}${PREFIX}/gopkg/src/${GO_SRCPATH} -name "*.orig" -exec ${RM} \{\} \;
+post-extract:
+ ${CP} files/go.mod files/go.sum ${WRKSRC}/
-.include "../../security/go-crypto/buildlink3.mk"
-.include "../../devel/go-nbreader/buildlink3.mk"
-.include "../../devel/go-flags-svent/buildlink3.mk"
-.include "../../lang/go/go-package.mk"
+.include "go-modules.mk"
+
+.include "../../lang/go/go-module.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d28c80f62716 -r 39dbfc483017 textproc/sift/PLIST
--- a/textproc/sift/PLIST Sun Sep 18 11:54:06 2022 +0000
+++ b/textproc/sift/PLIST Sun Sep 18 11:54:51 2022 +0000
@@ -1,13 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2015/12/27 20:50:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/09/18 11:54:51 bsiegert Exp $
bin/sift
-gopkg/pkg/${GO_PLATFORM}/github.com/svent/sift/gitignore.a
-gopkg/src/github.com/svent/sift/LICENSE
-gopkg/src/github.com/svent/sift/README.md
-gopkg/src/github.com/svent/sift/filetypes.go
-gopkg/src/github.com/svent/sift/gitignore/gitignore.go
-gopkg/src/github.com/svent/sift/matching.go
-gopkg/src/github.com/svent/sift/matching_cgo.go
-gopkg/src/github.com/svent/sift/matching_other.go
-gopkg/src/github.com/svent/sift/options.go
-gopkg/src/github.com/svent/sift/output.go
-gopkg/src/github.com/svent/sift/sift.go
diff -r d28c80f62716 -r 39dbfc483017 textproc/sift/distinfo
--- a/textproc/sift/distinfo Sun Sep 18 11:54:06 2022 +0000
+++ b/textproc/sift/distinfo Sun Sep 18 11:54:51 2022 +0000
@@ -1,6 +1,38 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:23:31 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/09/18 11:54:51 bsiegert Exp $
-BLAKE2s (sift-0.6.0.tar.gz) = 28ec524490869caac4681c7f14695b92fac45e71baf1d7a6389e628423e446e3
-SHA512 (sift-0.6.0.tar.gz) = 7a42a793cde876834468ef800e109dfb18dde28451cb05e3e3e9ac3cbe07d4f1c9bdc007c7e2ef84ebd3162753c698c177017e19cefa0a6d2cc2822d308204c9
-Size (sift-0.6.0.tar.gz) = 34032 bytes
-SHA1 (patch-matching__cgo.go) = 10b30a335e3e86616fe9dd9f97090adff1fd507a
+BLAKE2s (github.com_svent_go-flags_@v_v0.0.0-20141123140740-4bcbad344f03.mod) = bcbbc7d164dbbaab110bb40b1ea27d2c42e923da916905b90ee5b3899711834d
+SHA512 (github.com_svent_go-flags_@v_v0.0.0-20141123140740-4bcbad344f03.mod) =
0c56012b720f238b8e4a38cc1d3d74853fd7c86816ea94b3e0d91cc470ebaef2cfc6c3397b5bfe76473bc5fb161557c9605715f36ed0f9187aa26fc2a570a430
+Size (github.com_svent_go-flags_@v_v0.0.0-20141123140740-4bcbad344f03.mod) = 33 bytes
+BLAKE2s (github.com_svent_go-flags_@v_v0.0.0-20141123140740-4bcbad344f03.zip) = 308be9be1a6d94e38043a0c01293b36f3ab4176ebbeb52b8f70916e6ba959011
+SHA512 (github.com_svent_go-flags_@v_v0.0.0-20141123140740-4bcbad344f03.zip) =
825b7a75c4c4d1d505fe7893a0ef1eee24518b077edd6bb2d7690ad193cffbae91485952b0beecb5491f44a1a44bd3c63cce3ed5d42892452f28787b0389aa6c
+Size (github.com_svent_go-flags_@v_v0.0.0-20141123140740-4bcbad344f03.zip) = 67191 bytes
+BLAKE2s (github.com_svent_go-nbreader_@v_v0.0.0-20150201200112-7cef48da76dc.mod) = 51a5758bc74ce31b3314547976b1bf9d74c56d00f95f6e360f18683a071a7ee7
+SHA512 (github.com_svent_go-nbreader_@v_v0.0.0-20150201200112-7cef48da76dc.mod) =
a05dca482b8d4e8039de3bfbab617b00955aa25fc05a0d09e548eedeb3a53ee99ca1087587fc4b76cde221035c8e0f8b1ddc088852b1f7d6b34c4a62d19c7b90
+Size (github.com_svent_go-nbreader_@v_v0.0.0-20150201200112-7cef48da76dc.mod) = 36 bytes
+BLAKE2s (github.com_svent_go-nbreader_@v_v0.0.0-20150201200112-7cef48da76dc.zip) = fc714d6b8feb5ade1ebe3b132d149a46cfcfc13a69ffb8d52e34f46499049f40
+SHA512 (github.com_svent_go-nbreader_@v_v0.0.0-20150201200112-7cef48da76dc.zip) =
8546a18a91ce532b3998263d8c63a7dc34460ae8f9cb486a75122e3cd9b64d55c435495050501c744023bbf6e6737c863e577010cecf0cc8cebdada4af5ace88
+Size (github.com_svent_go-nbreader_@v_v0.0.0-20150201200112-7cef48da76dc.zip) = 3506 bytes
+BLAKE2s (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.mod) = 3218fb197e3df718e689eb2e6187e8b6164db45fcd92c7b120f1805fb409353f
+SHA512 (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.mod) =
8b89bda14a8eea63c73e602efb4f90d9bd5ba816041b8c8eeb516a7edbb70578e2c594f4ac7168b5cef417075b295f6aab908514244cb9bb05f7bb13f1170bb3
+Size (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.mod) = 255 bytes
+BLAKE2s (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.zip) = 936646a3872a7c2b5d8b94eedfe611742ba1c632de2854577a1fd1f0d605e001
+SHA512 (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.zip) =
8850e5af000fc6f8ace471c19f7edce4da91025154415435723cfa6c355a13c2d7648b24010155de107444ffa07d6806a116a090420047627f511bd63482db8b
+Size (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.zip) = 1779881 bytes
+BLAKE2s (golang.org_x_sys_@v_v0.0.0-20201119102817-f84b799fce68.mod) = 6b2b0a0ac9d77adff84f1aab70cc38a4dcf14418c326fcb2dde80f104fb41e9f
+SHA512 (golang.org_x_sys_@v_v0.0.0-20201119102817-f84b799fce68.mod) = 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+Size (golang.org_x_sys_@v_v0.0.0-20201119102817-f84b799fce68.mod) = 33 bytes
+BLAKE2s (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.mod) = 66613eb38a59b8a7f75e1aaeb294a1c4ea290d4e9ae699137566025e50ed741c
+SHA512 (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.mod) = 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+Size (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.mod) = 33 bytes
+BLAKE2s (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.zip) = bc46f9203ee9a65dead922f9a7b8b7433778b1da11a7d7f8738091dceb51939c
+SHA512 (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.zip) = ea2b0c8163b22097a9e6c57c9d2dfb75548f2b6004a775a6c97fceb1d2e3e1dbd4cb2050a36cd4e1e9cd0386794d7bd3a3b6b956b8a55009217b06e9b72f64b5
+Size (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.zip) = 1644123 bytes
+BLAKE2s (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.mod) = ea6d2006c1c11da8c2174212a63865a04dec1775f98210c17f3a0cb8d4a1a80f
+SHA512 (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.mod) = a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+Size (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95 bytes
+BLAKE2s (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.zip) = 589b6eb654aba7bc8013335ded196de3cc21dccf4805e83602cbef73de8bf376
+SHA512 (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.zip) = 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
+Size (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.zip) = 23281 bytes
+BLAKE2s (sift-0.9.0.tar.gz) = 7eb62dd627682f74b3fcb0204145cd9f94f7a6d5dbb0e1b49f4f25f298995840
+SHA512 (sift-0.9.0.tar.gz) = e0990e45ec9a11f9609090908bf5232b4cf215c9d1e95791ef7c02668ef56d19cde495e1e1b3a1f9ca569d2aa35c4242eaea702f6db8d31ee295210cacb02a03
+Size (sift-0.9.0.tar.gz) = 37442 bytes
diff -r d28c80f62716 -r 39dbfc483017 textproc/sift/files/go.mod
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/sift/files/go.mod Sun Sep 18 11:54:51 2022 +0000
@@ -0,0 +1,14 @@
+module github.com/svent/sift
+
+go 1.19
+
+require (
+ github.com/svent/go-flags v0.0.0-20141123140740-4bcbad344f03
+ github.com/svent/go-nbreader v0.0.0-20150201200112-7cef48da76dc
+ golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
+)
+
+require (
+ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
+)
diff -r d28c80f62716 -r 39dbfc483017 textproc/sift/files/go.sum
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/sift/files/go.sum Sun Sep 18 11:54:51 2022 +0000
@@ -0,0 +1,11 @@
+github.com/svent/go-flags v0.0.0-20141123140740-4bcbad344f03 h1:rQ2altc2segoMAqIA2Wx+f0MLEhq12Q9j3xSQumEVpw=
+github.com/svent/go-flags v0.0.0-20141123140740-4bcbad344f03/go.mod h1:NqD1j/FwfaG9ljD9BohCK5YZHzSRCzWAMneQoMWVBxw=
+github.com/svent/go-nbreader v0.0.0-20150201200112-7cef48da76dc h1:usYkrH2/es/TT7ETdC/qLAagcJPW3EEYFKqvibSnFbA=
+github.com/svent/go-nbreader v0.0.0-20150201200112-7cef48da76dc/go.mod h1:pPzZl0vMkUhyoxUF8PAGG5bDRGo7PY80oO/PMmpLkkc=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
diff -r d28c80f62716 -r 39dbfc483017 textproc/sift/go-modules.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/sift/go-modules.mk Sun Sep 18 11:54:51 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: go-modules.mk,v 1.1 2022/09/18 11:54:51 bsiegert Exp $
+
+GO_MODULE_FILES+= github.com/svent/go-flags/@v/v0.0.0-20141123140740-4bcbad344f03.mod
+GO_MODULE_FILES+= github.com/svent/go-flags/@v/v0.0.0-20141123140740-4bcbad344f03.zip
+GO_MODULE_FILES+= github.com/svent/go-nbreader/@v/v0.0.0-20150201200112-7cef48da76dc.mod
+GO_MODULE_FILES+= github.com/svent/go-nbreader/@v/v0.0.0-20150201200112-7cef48da76dc.zip
+GO_MODULE_FILES+= golang.org/x/crypto/@v/v0.0.0-20220829220503-c86fa9a7ed90.mod
+GO_MODULE_FILES+= golang.org/x/crypto/@v/v0.0.0-20220829220503-c86fa9a7ed90.zip
+GO_MODULE_FILES+= golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod
+GO_MODULE_FILES+= golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod
+GO_MODULE_FILES+= golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.zip
+GO_MODULE_FILES+= golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod
+GO_MODULE_FILES+= golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip
diff -r d28c80f62716 -r 39dbfc483017 textproc/sift/patches/patch-matching__cgo.go
--- a/textproc/sift/patches/patch-matching__cgo.go Sun Sep 18 11:54:06 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-matching__cgo.go,v 1.1 2018/03/13 17:28:59 bsiegert Exp $
-
-The -funroll-loops flag is not on the compiler flag whitelist.
-
---- matching_cgo.go.orig 2015-12-23 00:37:41.000000000 +0000
-+++ matching_cgo.go
-@@ -16,7 +16,7 @@
- package main
-
- /*
--#cgo CFLAGS: -std=gnu99 -O2 -funroll-loops
-+#cgo CFLAGS: -std=gnu99 -O2
-
- #include <stddef.h>
-
Home |
Main Index |
Thread Index |
Old Index