CVS commit: pkgsrc/textproc/R-hunspell

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Jul 13 14:33:23 UTC 2026

Modified Files:
        pkgsrc/textproc/R-hunspell: Makefile distinfo
        pkgsrc/textproc/R-hunspell/patches: patch-src_Makevars

Log Message:
(textproc/R-hunspell) Fix on Darwin and hopefully on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/R-hunspell/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/R-hunspell/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/R-hunspell/patches/patch-src_Makevars

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

Modified files:

Index: pkgsrc/textproc/R-hunspell/Makefile
diff -u pkgsrc/textproc/R-hunspell/Makefile:1.5 pkgsrc/textproc/R-hunspell/Makefile:1.6
--- pkgsrc/textproc/R-hunspell/Makefile:1.5     Tue May 26 21:33:00 2026
+++ pkgsrc/textproc/R-hunspell/Makefile Mon Jul 13 14:33:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2026/05/26 21:33:00 mef Exp $
+# $NetBSD: Makefile,v 1.6 2026/07/13 14:33:23 mef Exp $
 
 R_PKGNAME=     hunspell
 R_PKGVER=      3.0.5
@@ -23,8 +23,17 @@ TEST_DEPENDS+=       tex-url-[0-9]*:../../prin
 TEST_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval
 
 USE_LANGUAGES= c c++
-# only for ifne at patch-src_Makevars
-USE_TOOLS+=    gmake
+
+.include "../../mk/bsd.prefs.mk"
+SUBST_CLASSES+=                pkglibs
+SUBST_STAGE.pkglibs=   pre-configure
+SUBST_FILES.pkglibs=   src/Makevars
+SUBST_MESSAGE.pkglibs= Add -lexecinfo for *BSD
+.if ${OPSYS} != SunOS && ${OPSYS} != Linux && ${OPSYS} != Darwin
+SUBST_SED.pkglibs=     -e s,@@PKG_LIBS@@,PKG_LIBS+=-lexecinfo,
+.else
+SUBST_SED.pkglibs=     -e s,@@PKG_LIBS@@,,
+.endif
 
 .include "../../math/R/Makefile.extension"
 .include "../../devel/R-Rcpp/buildlink3.mk"

Index: pkgsrc/textproc/R-hunspell/distinfo
diff -u pkgsrc/textproc/R-hunspell/distinfo:1.7 pkgsrc/textproc/R-hunspell/distinfo:1.8
--- pkgsrc/textproc/R-hunspell/distinfo:1.7     Tue May 26 21:33:00 2026
+++ pkgsrc/textproc/R-hunspell/distinfo Mon Jul 13 14:33:23 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2026/05/26 21:33:00 mef Exp $
+$NetBSD: distinfo,v 1.8 2026/07/13 14:33:23 mef Exp $
 
 BLAKE2s (R/hunspell_3.0.5.tar.gz) = 429fb82c5829ea5c64cef3bf1adc8f5f2ece45c8606cfaa89a45f6b53dba901d
 SHA512 (R/hunspell_3.0.5.tar.gz) = ce507c807d3123adda36c1b4fb5991b5fe787ec7cb52f463fb7e109d050c3f1c35efb36bade2cf9e1066d82be7f7d83d89196066fe3251f95bd037fbc8cf0c53
 Size (R/hunspell_3.0.5.tar.gz) = 3214026 bytes
-SHA1 (patch-src_Makevars) = 4c4b7c66e0ead07527ae7b624fbf09e340f79820
+SHA1 (patch-src_Makevars) = 1a5d4107d3098c617c84ca24985b835d6f0e88f1

Index: pkgsrc/textproc/R-hunspell/patches/patch-src_Makevars
diff -u pkgsrc/textproc/R-hunspell/patches/patch-src_Makevars:1.1 pkgsrc/textproc/R-hunspell/patches/patch-src_Makevars:1.2
--- pkgsrc/textproc/R-hunspell/patches/patch-src_Makevars:1.1   Tue May 26 21:33:01 2026
+++ pkgsrc/textproc/R-hunspell/patches/patch-src_Makevars       Mon Jul 13 14:33:23 2026
@@ -1,21 +1,14 @@
-$NetBSD: patch-src_Makevars,v 1.1 2026/05/26 21:33:01 mef Exp $
+$NetBSD: patch-src_Makevars,v 1.2 2026/07/13 14:33:23 mef Exp $
 
 symbol backtrace_symbols is defined in /usr/lib/libexecinfo
 
---- src/Makevars.orig  2024-10-03 06:31:38.000000000 +0900
-+++ src/Makevars       2026-05-27 06:28:29.894023422 +0900
-@@ -15,6 +15,14 @@ LIBHUNSPELL=parsers/textparser.o parsers
+--- src/Makevars.orig  2026-07-13 23:25:32.501709589 +0900
++++ src/Makevars       2026-07-13 23:26:51.338836123 +0900
+@@ -4,6 +4,7 @@ PKG_CXXFLAGS=$(C_VISIBILITY)
+ #Add Windows-only flags (ifeq is a GNU extension...)
+ WINRICONV=$(subst 64,-lRiconv,$(subst 32,64,$(WIN)))
+ PKG_LIBS=-Lhunspell -lstathunspell $(WINRICONV)
++@@PKG_LIBS@@
  
- STATLIB = hunspell/libstathunspell.a
- 
-+UNAME := $(shell uname)
-+
-+ifneq ($(UNAME), Linux)
-+ifneq ($(UNAME), SunOS)
-+PKG_LIBS += -lexecinfo
-+endif
-+endif
-+
- $(SHLIB): $(STATLIB)
- 
- $(STATLIB): $(LIBHUNSPELL)
+ LIBHUNSPELL=parsers/textparser.o parsers/latexparser.o parsers/manparser.o \
+       parsers/xmlparser.o parsers/htmlparser.o \