CVS commit: pkgsrc/audio/espeak-ng

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Mar 25 17:18:09 UTC 2024

Modified Files:
        pkgsrc/audio/espeak-ng: distinfo
Added Files:
        pkgsrc/audio/espeak-ng/patches: patch-Makefile.am
            patch-src_include_compat_wctype.h

Log Message:
espeak-ng: Portability fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/espeak-ng/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/espeak-ng/patches/patch-Makefile.am \
    pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h

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

Modified files:

Index: pkgsrc/audio/espeak-ng/distinfo
diff -u pkgsrc/audio/espeak-ng/distinfo:1.1 pkgsrc/audio/espeak-ng/distinfo:1.2
--- pkgsrc/audio/espeak-ng/distinfo:1.1 Mon Mar 11 08:03:45 2024
+++ pkgsrc/audio/espeak-ng/distinfo     Mon Mar 25 17:18:08 2024
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1 2024/03/11 08:03:45 wiz Exp $
+$NetBSD: distinfo,v 1.2 2024/03/25 17:18:08 jperkin Exp $
 
 BLAKE2s (espeak-ng-1.51.tar.gz) = 7e95a1f9619984f4b349c48146a4a7a3f50f359d7043366edb1c447089b1e383
 SHA512 (espeak-ng-1.51.tar.gz) = 6c29275706d21de2d5fa393702d2f173fc05d2ce4e2f46f3bf9a2742b0a8f294177663df0d079188e31cc2541f2c21a64e09e8afffe95befab667a4d00429fd2
 Size (espeak-ng-1.51.tar.gz) = 14260788 bytes
+SHA1 (patch-Makefile.am) = 734c3e1cc914cf9236eadf0e372ad7438845faa8
+SHA1 (patch-src_include_compat_wctype.h) = bfbea130635fe0f1368969e3eb5c406aa3f73bdc
 SHA1 (patch-src_libespeak-ng_spect.c) = 33f69d7ba5621796628477f5596e147db76e38e1
 SHA1 (patch-src_libespeak-ng_speech.c) = e4f906157b1fce54c19a740274573310b3f276fb

Added files:

Index: pkgsrc/audio/espeak-ng/patches/patch-Makefile.am
diff -u /dev/null pkgsrc/audio/espeak-ng/patches/patch-Makefile.am:1.1
--- /dev/null   Mon Mar 25 17:18:09 2024
+++ pkgsrc/audio/espeak-ng/patches/patch-Makefile.am    Mon Mar 25 17:18:08 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-Makefile.am,v 1.1 2024/03/25 17:18:08 jperkin Exp $
+
+ln -v is not portable.
+
+--- Makefile.am.orig   2024-03-25 17:02:18.086717013 +0000
++++ Makefile.am
+@@ -895,7 +895,7 @@ espeak-ng-data/ro_dict: dictsource/ro_li
+ 
+ ru: espeak-ng-data/ru_dict
+ dictsource/ru_listx:
+-      ln -svf extra/ru_listx dictsource/
++      ln -s -f extra/ru_listx dictsource/
+ if HAVE_RU_EXTENDED_DICTIONARY
+ espeak-ng-data/ru_dict: dictsource/ru_list dictsource/ru_rules dictsource/ru_extra dictsource/ru_listx dictsource/ru_emoji
+ else
+@@ -981,7 +981,7 @@ espeak-ng-data/vi_dict: dictsource/vi_li
+ 
+ cmn: espeak-ng-data/cmn_dict
+ dictsource/cmn_listx:
+-      ln -svf extra/cmn_listx dictsource/
++      ln -s -f extra/cmn_listx dictsource/
+ if HAVE_CMN_EXTENDED_DICTIONARY
+ espeak-ng-data/cmn_dict: dictsource/cmn_list dictsource/cmn_rules dictsource/cmn_listx dictsource/cmn_extra dictsource/cmn_emoji
+ else
+@@ -990,7 +990,7 @@ endif
+ 
+ yue: espeak-ng-data/yue_dict
+ dictsource/yue_listx:
+-      ln -svf extra/yue_listx dictsource/
++      ln -s -f extra/yue_listx dictsource/
+ 
+ # NOTE: keep in sync with espeak-ng-data/%_dict more generic rule.
+ if HAVE_YUE_EXTENDED_DICTIONARY
Index: pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h
diff -u /dev/null pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h:1.1
--- /dev/null   Mon Mar 25 17:18:09 2024
+++ pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h    Mon Mar 25 17:18:08 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_include_compat_wctype.h,v 1.1 2024/03/25 17:18:08 jperkin Exp $
+
+Avoid breaking wctypes on illumos.
+
+--- src/include/compat/wctype.h.orig   2024-03-25 17:06:14.205256009 +0000
++++ src/include/compat/wctype.h
+@@ -32,6 +32,7 @@
+ 
+ #include <ucd/ucd.h>
+ 
++#if !defined(__illumos__)
+ #define iswalnum  ucd_isalnum
+ #define iswalpha  ucd_isalpha
+ #define iswblank  ucd_isblank
+@@ -44,5 +45,6 @@
+ #define iswspace  ucd_isspace
+ #define iswupper  ucd_isupper
+ #define iswxdigit ucd_isxdigit
++#endif
+ 
+ #endif