CVS commit: pkgsrc/archivers/zstd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov  1 13:07:16 UTC 2026

Modified Files:
        pkgsrc/archivers/zstd: Makefile PLIST
Added Files:
        pkgsrc/archivers/zstd: Makefile.common

Log Message:
zstd: stop installing zstdgrep

The script requires GNU grep, and this leads to a bootstrap cycle
on systems that do not have GNU grep in the base system.

As proposed on tech-pkg.

zstdgrep will be packaged separately.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/archivers/zstd/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/zstd/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/archivers/zstd/PLIST

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

Modified files:

Index: pkgsrc/archivers/zstd/Makefile
diff -u pkgsrc/archivers/zstd/Makefile:1.53 pkgsrc/archivers/zstd/Makefile:1.54
--- pkgsrc/archivers/zstd/Makefile:1.53 Thu Feb 20 08:10:34 2025
+++ pkgsrc/archivers/zstd/Makefile      Sun Nov  1 13:07:16 2026
@@ -1,28 +1,10 @@
-# $NetBSD: Makefile,v 1.53 2025/02/20 08:10:34 adam Exp $
+# $NetBSD: Makefile,v 1.54 2026/11/01 13:07:16 wiz Exp $
 
-DISTNAME=      zstd-1.5.7
-CATEGORIES=    archivers
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=facebook/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+PKGREVISION=   1
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://facebook.github.io/zstd/
-COMMENT=       Fast real-time compression algorithm
-LICENSE=       modified-bsd OR gnu-gpl-v2
-
-CHECK_PORTABILITY_SKIP+=       tests/playTests.sh
-
-# 1.4.8
-# ld: ../lib/libzstd.a: error adding symbols: no more archived files
-# ld:../lib/libzstd.a: file format not recognized; treating as linker script
-# ld:../lib/libzstd.a:1: syntax error
-# or
-# ld: ../lib/libzstd.a: error adding symbols: file format not recognized
-# reported as
-# https://github.com/facebook/zstd/issues/2453
-#MAKE_JOBS_SAFE=               no
+.include "Makefile.common"
 
-.include "../../mk/bsd.prefs.mk"
+COMMENT=       Fast real-time compression algorithm
 
 # See HASH and BUILD_DIR in lib/Makefile and programs/Makefile.
 # Set BUILD_DIR so that HASH is not needed and there is no
@@ -34,7 +16,7 @@ MAKE_ENV+=            BUILD_DIR=obj
 MAKE_ENV+=             HASH=${FALSE:Q}
 
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            ggrep gmake pkg-config
+USE_TOOLS+=            gmake pkg-config
 PKGCONFIG_OVERRIDE+=   lib/libzstd.pc.in
 MAKE_FLAGS=            MANDIR=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=           mandir=${PREFIX}/${PKGMANDIR}
@@ -61,6 +43,10 @@ LDFLAGS.SunOS+=              -lrt
 
 BUILDLINK_TRANSFORM.Darwin+=   opt:-shared:-dynamiclib
 
+post-install:
+       ${RM} ${DESTDIR}${PREFIX}/bin/zstdgrep
+       ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zstdgrep.1
+
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/archivers/zstd/PLIST
diff -u pkgsrc/archivers/zstd/PLIST:1.6 pkgsrc/archivers/zstd/PLIST:1.7
--- pkgsrc/archivers/zstd/PLIST:1.6     Sun Jan  3 14:55:50 2021
+++ pkgsrc/archivers/zstd/PLIST Sun Nov  1 13:07:16 2026
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2021/01/03 14:55:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2026/11/01 13:07:16 wiz Exp $
 bin/unzstd
 bin/zstd
 bin/zstdcat
-bin/zstdgrep
 bin/zstdless
 bin/zstdmt
 include/zdict.h
@@ -16,5 +15,4 @@ lib/pkgconfig/libzstd.pc
 man/man1/unzstd.1
 man/man1/zstd.1
 man/man1/zstdcat.1
-man/man1/zstdgrep.1
 man/man1/zstdless.1

Added files:

Index: pkgsrc/archivers/zstd/Makefile.common
diff -u /dev/null pkgsrc/archivers/zstd/Makefile.common:1.1
--- /dev/null   Sun Nov  1 13:07:16 2026
+++ pkgsrc/archivers/zstd/Makefile.common       Sun Nov  1 13:07:16 2026
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile.common,v 1.1 2026/11/01 13:07:16 wiz Exp $
+
+DISTNAME=      zstd-1.5.7
+CATEGORIES=    archivers
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=facebook/}
+GITHUB_PROJECT=        zstd
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://facebook.github.io/zstd/
+LICENSE=       modified-bsd OR gnu-gpl-v2
+
+PATCHDIR=      ${.CURDIR}/../../archivers/zstd/patches
+DISTINFO_FILE= ${.CURDIR}/../../archivers/zstd/distinfo