CVS commit: pkgsrc/shells/dash

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jun 28 02:40:08 UTC 2025

Modified Files:
        pkgsrc/shells/dash: Makefile distinfo
Added Files:
        pkgsrc/shells/dash/patches: patch-configure.ac patch-src_histedit.c

Log Message:
dash: fix Illumos build. Still packages on macOS and NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/shells/dash/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/shells/dash/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/dash/patches/patch-configure.ac \
    pkgsrc/shells/dash/patches/patch-src_histedit.c

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

Modified files:

Index: pkgsrc/shells/dash/Makefile
diff -u pkgsrc/shells/dash/Makefile:1.16 pkgsrc/shells/dash/Makefile:1.17
--- pkgsrc/shells/dash/Makefile:1.16    Wed May 28 09:40:06 2025
+++ pkgsrc/shells/dash/Makefile Sat Jun 28 02:40:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2025/05/28 09:40:06 zafer Exp $
+# $NetBSD: Makefile,v 1.17 2025/06/28 02:40:08 schmonz Exp $
 
 DISTNAME=      dash-0.5.12
 CATEGORIES=    shells
@@ -15,5 +15,10 @@ PKG_SHELL=           bin/dash
 
 CONFIGURE_ARGS+=       --with-libedit
 
+USE_TOOLS+=            autoconf automake aclocal autoheader
+
+pre-configure:
+       cd ${WRKSRC} && autoreconf -fiv
+
 .include "../../devel/editline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/shells/dash/distinfo
diff -u pkgsrc/shells/dash/distinfo:1.15 pkgsrc/shells/dash/distinfo:1.16
--- pkgsrc/shells/dash/distinfo:1.15    Thu Feb 22 08:39:26 2024
+++ pkgsrc/shells/dash/distinfo Sat Jun 28 02:40:08 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.15 2024/02/22 08:39:26 adam Exp $
+$NetBSD: distinfo,v 1.16 2025/06/28 02:40:08 schmonz Exp $
 
 BLAKE2s (dash-0.5.12.tar.gz) = 986c3e5ba776e749edefb3da036468f9b3e0b5a21b485189039d2cedd2ba94d1
 SHA512 (dash-0.5.12.tar.gz) = 13bd262be0089260cbd13530a9cf34690c0abeb2f1920eb5e61be7951b716f9f335b86279d425dbfae56cbd49231a8fdffdff70601a5177da3d543be6fc5eb17
 Size (dash-0.5.12.tar.gz) = 246054 bytes
+SHA1 (patch-configure.ac) = 24f94810bfc466f85a87c56f84a17724f6f7bcd1
+SHA1 (patch-src_histedit.c) = a5d187bcbf3cd90f77e70b4505c939b69aa24cac

Added files:

Index: pkgsrc/shells/dash/patches/patch-configure.ac
diff -u /dev/null pkgsrc/shells/dash/patches/patch-configure.ac:1.1
--- /dev/null   Sat Jun 28 02:40:08 2025
+++ pkgsrc/shells/dash/patches/patch-configure.ac       Sat Jun 28 02:40:08 2025
@@ -0,0 +1,48 @@
+$NetBSD: patch-configure.ac,v 1.1 2025/06/28 02:40:08 schmonz Exp $
+
+Avoid redefinition of 64-bit stat, dirent, etc. on Illumos.
+
+--- configure.ac.orig  2022-12-11 06:33:19.000000000 +0000
++++ configure.ac
+@@ -141,26 +141,40 @@ fi
+ 
+ dnl Check for stat64 (dietlibc/klibc).
+ AC_CHECK_DECL(stat64, AC_CHECK_FUNC(stat64))
+-if test "$ac_cv_func_stat64" != yes; then
++if test "$ac_cv_have_decl_stat64" != yes && test "$ac_cv_func_stat64" != yes; then
+       AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit])
+       AC_DEFINE(lstat64, lstat, [64-bit operations are the same as 32-bit])
+       AC_DEFINE(stat64, stat, [64-bit operations are the same as 32-bit])
+ fi
+ 
+ AC_CHECK_FUNC(glob64,, [
++      case `uname -s 2>/dev/null` in
++      SunOS) ;;
++      *)
++
+       AC_DEFINE(glob64_t, glob_t, [64-bit operations are the same as 32-bit])
+       AC_DEFINE(glob64, glob, [64-bit operations are the same as 32-bit])
+       AC_DEFINE(globfree64, globfree,
+                 [64-bit operations are the same as 32-bit])
++
++      ;;
++      esac
+ ])
+ 
+ dnl OS X apparently has stat64 but not open64.
+ AC_CHECK_FUNC(open64,, [
++      case `uname -s 2>/dev/null` in
++      SunOS) ;;
++      *)
++
+       AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit])
+       AC_DEFINE(readdir64, readdir,
+                 [64-bit operations are the same as 32-bit])
+       AC_DEFINE(dirent64, dirent,
+                 [64-bit operations are the same as 32-bit])
++
++      ;;
++      esac
+ ])
+ 
+ dnl Check if struct stat has st_mtim.
Index: pkgsrc/shells/dash/patches/patch-src_histedit.c
diff -u /dev/null pkgsrc/shells/dash/patches/patch-src_histedit.c:1.1
--- /dev/null   Sat Jun 28 02:40:08 2025
+++ pkgsrc/shells/dash/patches/patch-src_histedit.c     Sat Jun 28 02:40:08 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_histedit.c,v 1.1 2025/06/28 02:40:08 schmonz Exp $
+
+Avoid "'optreset' undeclared" on Illumos.
+
+--- src/histedit.c.orig        2025-06-28 02:26:40.738340552 +0000
++++ src/histedit.c
+@@ -217,6 +217,8 @@ histcmd(int argc, char **argv)
+ 
+ #ifdef __GLIBC__
+       optind = 0;
++#elif defined(__sun)
++      optind = 1;
+ #else
+       optreset = 1; optind = 1; /* initialize getopt */
+ #endif