CVS commit: pkgsrc/textproc/ugrep

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jul  1 19:35:45 UTC 2022

Modified Files:
        pkgsrc/textproc/ugrep: Makefile distinfo options.mk

Log Message:
ugrep: updated to 3.8.3

ugrep v3.8.3

New option combination -o (--only-matching) with -ABC context to show the match within NUM columns, with context before and/or after, which visually aids in searching files with long lines; option -o 
with -b or -k now shows results on separate lines; new option --width to truncate long lines to the specified width or the terminal width by default; short ug command now sorts by name by default; 
query TUI ALT-] [ (increase/decrease context) and ALT-} { (increase/decrease fuzziness) keys switched meaning (quicker and more intuitive); new %+ format field used by updated --only-line-number 
option; new --help fuzzy help page; updated man pages; fixed bz2 issue cutting off decompression too soon, fixed tiny lz4 file search error, and other improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/textproc/ugrep/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/textproc/ugrep/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ugrep/options.mk

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

Modified files:

Index: pkgsrc/textproc/ugrep/Makefile
diff -u pkgsrc/textproc/ugrep/Makefile:1.39 pkgsrc/textproc/ugrep/Makefile:1.40
--- pkgsrc/textproc/ugrep/Makefile:1.39 Wed Jun 15 08:55:33 2022
+++ pkgsrc/textproc/ugrep/Makefile      Fri Jul  1 19:35:45 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2022/06/15 08:55:33 adam Exp $
+# $NetBSD: Makefile,v 1.40 2022/07/01 19:35:45 adam Exp $
 
-DISTNAME=      ugrep-3.8.2
+DISTNAME=      ugrep-3.8.3
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Genivia/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,13 +15,11 @@ LICENSE=    modified-bsd
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-bzlib
-CONFIGURE_ARGS+=       --with-lz4
-CONFIGURE_ARGS+=       --with-lzma     # lzma & xz files
-CONFIGURE_ARGS+=       --with-zlib
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/ugrep/distinfo
diff -u pkgsrc/textproc/ugrep/distinfo:1.37 pkgsrc/textproc/ugrep/distinfo:1.38
--- pkgsrc/textproc/ugrep/distinfo:1.37 Wed Jun 15 08:55:33 2022
+++ pkgsrc/textproc/ugrep/distinfo      Fri Jul  1 19:35:45 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.37 2022/06/15 08:55:33 adam Exp $
+$NetBSD: distinfo,v 1.38 2022/07/01 19:35:45 adam Exp $
 
-BLAKE2s (ugrep-3.8.2.tar.gz) = 91fa078d9684ac951f67db6a30ab7dacbfd596507e777566f75b3a05a610f55f
-SHA512 (ugrep-3.8.2.tar.gz) = 4c62a771ca1b04c311dcad567e80d09fdaa68122bfdaa9430558b9306d2d743121bf1a37a52d9a1dbe752a7148b1a155d821ef3b4d3cc04ab6765c27308c9348
-Size (ugrep-3.8.2.tar.gz) = 4442354 bytes
+BLAKE2s (ugrep-3.8.3.tar.gz) = 18b53302c78018b63e097bdd04a0d50cf2b9616eb15b6ee4deeecf649eefe938
+SHA512 (ugrep-3.8.3.tar.gz) = 5f0a484283a6e51dcd8bdebc9aeeabde476f7275c6dfd0fcf67287bb56c6c878614dcfc92d1dfa100d4e54116a2e088f39b0270719cd928284db90597fd57323
+Size (ugrep-3.8.3.tar.gz) = 4445071 bytes

Index: pkgsrc/textproc/ugrep/options.mk
diff -u pkgsrc/textproc/ugrep/options.mk:1.1 pkgsrc/textproc/ugrep/options.mk:1.2
--- pkgsrc/textproc/ugrep/options.mk:1.1        Sat Aug  1 15:13:59 2020
+++ pkgsrc/textproc/ugrep/options.mk    Fri Jul  1 19:35:45 2022
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2020/08/01 15:13:59 scole Exp $
+# $NetBSD: options.mk,v 1.2 2022/07/01 19:35:45 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ugrep
-PKG_SUPPORTED_OPTIONS= cpu-optimization boost-libs pcre2
-PKG_SUGGESTED_OPTIONS= cpu-optimization boost-libs pcre2
+PKG_SUPPORTED_OPTIONS= cpu-optimization boost-libs
+PKG_SUGGESTED_OPTIONS= cpu-optimization boost-libs
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,10 +17,3 @@ CONFIGURE_ARGS+=     --disable-neon
 CONFIGURE_ARGS+=       --with-boost-regex
 .include "../../devel/boost-libs/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Mpcre2)
-CONFIGURE_ARGS+=       --with-pcre2
-.include "../../devel/pcre2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-pcre2
-.endif