CVS commit: pkgsrc/devel/libowfat

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jun 27 17:13:31 UTC 2025

Modified Files:
        pkgsrc/devel/libowfat: Makefile distinfo
        pkgsrc/devel/libowfat/patches: patch-GNUmakefile

Log Message:
libowfat: fix SmartOS build. Still OK on macOS and NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libowfat/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/libowfat/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libowfat/patches/patch-GNUmakefile

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

Modified files:

Index: pkgsrc/devel/libowfat/Makefile
diff -u pkgsrc/devel/libowfat/Makefile:1.14 pkgsrc/devel/libowfat/Makefile:1.15
--- pkgsrc/devel/libowfat/Makefile:1.14 Sun Dec  8 23:08:15 2024
+++ pkgsrc/devel/libowfat/Makefile      Fri Jun 27 17:13:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/12/08 23:08:15 hgutch Exp $
+# $NetBSD: Makefile,v 1.15 2025/06/27 17:13:31 schmonz Exp $
 
 DISTNAME=      libowfat-0.34
 PKGREVISION=   1
@@ -15,6 +15,8 @@ MAKE_FILE=    GNUmakefile
 MAKE_JOBS_SAFE=        no
 USE_TOOLS+=    gmake
 
+CFLAGS.SunOS+= -D__EXTENSIONS__
+
 post-extract:
        cd ${WRKSRC}; \
        ${MV} tai/tai_now.3 tai/tai_now_libowfat.3; \

Index: pkgsrc/devel/libowfat/distinfo
diff -u pkgsrc/devel/libowfat/distinfo:1.16 pkgsrc/devel/libowfat/distinfo:1.17
--- pkgsrc/devel/libowfat/distinfo:1.16 Sun Dec  8 23:08:15 2024
+++ pkgsrc/devel/libowfat/distinfo      Fri Jun 27 17:13:31 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2024/12/08 23:08:15 hgutch Exp $
+$NetBSD: distinfo,v 1.17 2025/06/27 17:13:31 schmonz Exp $
 
 BLAKE2s (libowfat-0.34.tar.xz) = 033749d597626b35b39d759bc5e019331cee8d5eba823f0a95d12ecd41fcc053
 SHA512 (libowfat-0.34.tar.xz) = 5be668f78d86c8591c8f2b8067f8ce41a38891b977ab239ee64602c37232aa85c396e07fedd378be12c6730080ca2ada08964cebd6e844191fce0c8cff57bb47
 Size (libowfat-0.34.tar.xz) = 223960 bytes
-SHA1 (patch-GNUmakefile) = 5f7cbfd30e151957b18439bb3bacabe17c292d47
+SHA1 (patch-GNUmakefile) = fe7d1e284105aea218ef153212e0eb1a598d4909
 SHA1 (patch-io_io__sendfile.c) = b275fadf236220207cd90e2a44f739d91656b253
 SHA1 (patch-io_io__waituntil2.c) = 6648ee2cb43feac30ee71ca187bb1dc78905ec78
 SHA1 (patch-mmap_mmap__readat.c) = bd0c8bb8a9c74e51ad55153ad9e855fb64be6f2e

Index: pkgsrc/devel/libowfat/patches/patch-GNUmakefile
diff -u pkgsrc/devel/libowfat/patches/patch-GNUmakefile:1.1 pkgsrc/devel/libowfat/patches/patch-GNUmakefile:1.2
--- pkgsrc/devel/libowfat/patches/patch-GNUmakefile:1.1 Sun Jan 23 13:30:33 2022
+++ pkgsrc/devel/libowfat/patches/patch-GNUmakefile     Fri Jun 27 17:13:31 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-GNUmakefile,v 1.1 2022/01/23 13:30:33 schmonz Exp $
+$NetBSD: patch-GNUmakefile,v 1.2 2025/06/27 17:13:31 schmonz Exp $
 
-Follow hier(7) and support PKGMANDIR.
+Respect CFLAGS, follow hier(7), support PKGMANDIR.
 
---- GNUmakefile.orig   2018-08-24 12:00:46.000000000 +0000
+--- GNUmakefile.orig   2024-10-31 13:42:37.000000000 +0000
 +++ GNUmakefile
 @@ -4,10 +4,10 @@
  # in /opt/diet, where they are in the default search path for my diet libc
@@ -17,3 +17,14 @@ Follow hier(7) and support PKGMANDIR.
  
  LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \
  buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \
+@@ -41,8 +41,8 @@ OPT_PLUS=-O3 $(NATIVE)
+ 
+ DEFINE=-D_REENTRANT
+ 
+-CFLAGS=-pipe $(WARN) $(DEFINE) $(OPT_REG)
+-CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS)
++CFLAGS+=-pipe $(WARN) $(DEFINE) $(OPT_REG)
++CFLAGS_OPT+=-pipe $(WARN) $(DEFINE) $(OPT_PLUS)
+ 
+ #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
+