CVS commit: pkgsrc/archivers/lzsa

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jun 20 00:52:49 UTC 2026

Modified Files:
        pkgsrc/archivers/lzsa: Makefile distinfo
Added Files:
        pkgsrc/archivers/lzsa/patches: patch-Makefile patch-src_dictionary.c

Log Message:
lzsa: Various build fixes.

Define the correct _POSIX_C_SOURCE to get a definition of
ftello(3).

Make sure the user's choice of compiler is honoured instead
of always using clang.

Verified to build on FreeBSD, NetBSD, macOS, Linux.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/archivers/lzsa/Makefile \
    pkgsrc/archivers/lzsa/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/lzsa/patches/patch-Makefile \
    pkgsrc/archivers/lzsa/patches/patch-src_dictionary.c

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

Modified files:

Index: pkgsrc/archivers/lzsa/Makefile
diff -u pkgsrc/archivers/lzsa/Makefile:1.1 pkgsrc/archivers/lzsa/Makefile:1.2
--- pkgsrc/archivers/lzsa/Makefile:1.1  Mon Nov 27 02:21:51 2023
+++ pkgsrc/archivers/lzsa/Makefile      Sat Jun 20 00:52:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/11/27 02:21:51 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2026/06/20 00:52:49 nia Exp $
 
 DISTNAME=      lzsa-1.4.1
 CATEGORIES=    archivers
@@ -12,8 +12,13 @@ LICENSE=     zlib
 
 USE_TOOLS+=    gmake
 
+TOOL_DEPENDS+= dos2unix-[0-9]*:../../converters/dos2unix
+
 INSTALLATION_DIRS=     bin
 
+pre-patch:
+       dos2unix ${WRKSRC}/src/*.c
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/lzsa ${DESTDIR}${PREFIX}/bin
 
Index: pkgsrc/archivers/lzsa/distinfo
diff -u pkgsrc/archivers/lzsa/distinfo:1.1 pkgsrc/archivers/lzsa/distinfo:1.2
--- pkgsrc/archivers/lzsa/distinfo:1.1  Mon Nov 27 02:21:51 2023
+++ pkgsrc/archivers/lzsa/distinfo      Sat Jun 20 00:52:49 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1 2023/11/27 02:21:51 thorpej Exp $
+$NetBSD: distinfo,v 1.2 2026/06/20 00:52:49 nia Exp $
 
 BLAKE2s (lzsa-1.4.1.tar.gz) = 5596b8694df3787d4a6d15a8a982e4d67592ecb848aa218eb940db8bd854ce5c
 SHA512 (lzsa-1.4.1.tar.gz) = 08fed665bf24c7435f98e80d3560d2cdd346c863850227468af9dcfea9dded47168de8c4584e3b24c83dc57dd13ae94f5842c1b7cec68ed10e7e6c7c97f5b20b
 Size (lzsa-1.4.1.tar.gz) = 152571 bytes
+SHA1 (patch-Makefile) = 0b50051ac1649eb9361eca902d4ce3edd2079b79
+SHA1 (patch-src_dictionary.c) = bc492e11bcc2bc7fedcc5259d541f7273854ba9d

Added files:

Index: pkgsrc/archivers/lzsa/patches/patch-Makefile
diff -u /dev/null pkgsrc/archivers/lzsa/patches/patch-Makefile:1.1
--- /dev/null   Sat Jun 20 00:52:50 2026
+++ pkgsrc/archivers/lzsa/patches/patch-Makefile        Sat Jun 20 00:52:49 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile,v 1.1 2026/06/20 00:52:49 nia Exp $
+
+Don't override the user's choice of compiler.
+
+--- Makefile.orig      2023-02-27 17:23:00.000000000 +0000
++++ Makefile
+@@ -1,5 +1,4 @@
+-CC=clang
+-CFLAGS=-O3 -g -fomit-frame-pointer -Isrc/libdivsufsort/include -Isrc
++CFLAGS+=-Isrc/libdivsufsort/include -Isrc
+ OBJDIR=obj
+ LDFLAGS=
+ 
Index: pkgsrc/archivers/lzsa/patches/patch-src_dictionary.c
diff -u /dev/null pkgsrc/archivers/lzsa/patches/patch-src_dictionary.c:1.1
--- /dev/null   Sat Jun 20 00:52:50 2026
+++ pkgsrc/archivers/lzsa/patches/patch-src_dictionary.c        Sat Jun 20 00:52:49 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dictionary.c,v 1.1 2026/06/20 00:52:49 nia Exp $
+
+Define the correct standard version for ftello(3).
+
+--- src/dictionary.c.orig      2026-06-20 00:44:31.904787286 +0000
++++ src/dictionary.c
+@@ -30,7 +30,7 @@
+  *
+  */
+ 
+-#define _POSIX_C_SOURCE 200808
++#define _POSIX_C_SOURCE 200809L
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>