pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/textproc/dict-dictionaries



Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan  4 14:08:24 UTC 2026

Modified Files:
        pkgsrc/textproc/dict-dictionaries: distinfo
        pkgsrc/textproc/dict-dictionaries/patches: patch-aa
Added Files:
        pkgsrc/textproc/dict-dictionaries/patches:
            patch-dict-gazetteer-1.3_configure patch-dict-misc-1.5_configure
            patch-dict-web1913-1.4_configure patch-dict-web1913-1.4_fmt.c
            patch-dict-web1913-1.4_libmaa_configure
            patch-dict-web1913-1.4_libmaa_getopt.c
            patch-dict-web1913-1.4_libmaa_obstack.c patch-dict-wn-1.5_configure

Log Message:
dict-dictionaries: fix build on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/dict-dictionaries/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 \
    pkgsrc/textproc/dict-dictionaries/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/dict-dictionaries/patches/patch-dict-gazetteer-1.3_configure \
    pkgsrc/textproc/dict-dictionaries/patches/patch-dict-misc-1.5_configure \
    pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_configure \
    pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_fmt.c \
    pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_configure \
    pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_getopt.c \
    pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_obstack.c \
    pkgsrc/textproc/dict-dictionaries/patches/patch-dict-wn-1.5_configure

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

Modified files:

Index: pkgsrc/textproc/dict-dictionaries/distinfo
diff -u pkgsrc/textproc/dict-dictionaries/distinfo:1.6 pkgsrc/textproc/dict-dictionaries/distinfo:1.7
--- pkgsrc/textproc/dict-dictionaries/distinfo:1.6      Tue Oct 26 11:21:49 2021
+++ pkgsrc/textproc/dict-dictionaries/distinfo  Sun Jan  4 14:08:23 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:21:49 nia Exp $
+$NetBSD: distinfo,v 1.7 2026/01/04 14:08:23 wiz Exp $
 
 BLAKE2s (dict-gazetteer-1.3.tar.gz) = 5fd86a0c76b617008f63bb0d514ce0d10692bcd3e99ff2d633520a4067566802
 SHA512 (dict-gazetteer-1.3.tar.gz) = a8849dd0e4383cfee81ea74569c459a1167e8a1f820b657e33ed49653c7ec4f9a5a363bba4c91a7147d94966d7f25c0d8920c9436d0399beca5683f944aa7ee1
@@ -15,7 +15,15 @@ Size (web1913-0.46-a.tar.gz) = 13795530 
 BLAKE2s (dict-wn-1.5.tar.gz) = 794527d341f035528a11807dd400401d209d5b55d144d5a7a94688fdacff4a59
 SHA512 (dict-wn-1.5.tar.gz) = 734ab372c760aebb35fdbe0ef7b1863b499fcff1e99a1bf99ee473f772a2259ff79b89c1c9589a872520ed849ae8ff8f6109ddfa4d7f90a2d45858e311f6e38d
 Size (dict-wn-1.5.tar.gz) = 6363650 bytes
-SHA1 (patch-aa) = fdc8ee511a2e5ebbacccae199e5e37b9c0a40666
+SHA1 (patch-aa) = 7f02507277dcdb23fc0687e4249b2b60ecdb4a22
 SHA1 (patch-ab) = 232c319e24e874703c441115c13af32c697f81c6
 SHA1 (patch-ac) = aa3956015efd2de7aff43ef0a8cc2bf2d751368f
 SHA1 (patch-ad) = 27b932ea47ec313d32548a66d975b777e42358fe
+SHA1 (patch-dict-gazetteer-1.3_configure) = 848a87e937c61dce7077f5c0ef1574322ed417ea
+SHA1 (patch-dict-misc-1.5_configure) = fe9f60c36d323d99da0e8a4bba880d5036d54a1c
+SHA1 (patch-dict-web1913-1.4_configure) = 4c145ebfa1149c283e161371f50520c836912ff7
+SHA1 (patch-dict-web1913-1.4_fmt.c) = ba371ab724919904597c805351f66d7c191661d0
+SHA1 (patch-dict-web1913-1.4_libmaa_configure) = 330780f7f19f5661b71a46268e656332a014f83c
+SHA1 (patch-dict-web1913-1.4_libmaa_getopt.c) = 33148d22be49d2e35e2d9a1c24fb2f88445883d7
+SHA1 (patch-dict-web1913-1.4_libmaa_obstack.c) = 8b2521042c790e4544ef4db8302ad7bda3835cc2
+SHA1 (patch-dict-wn-1.5_configure) = f7d124fd90f32413c570405a902e07d289befd66

Index: pkgsrc/textproc/dict-dictionaries/patches/patch-aa
diff -u pkgsrc/textproc/dict-dictionaries/patches/patch-aa:1.1.1.1 pkgsrc/textproc/dict-dictionaries/patches/patch-aa:1.2
--- pkgsrc/textproc/dict-dictionaries/patches/patch-aa:1.1.1.1  Fri Dec 27 02:43:47 2002
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-aa  Sun Jan  4 14:08:23 2026
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/27 02:43:47 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2026/01/04 14:08:23 wiz Exp $
 
---- dict-gazetteer-1.3/format.c.orig   Mon Jul 21 00:21:24 1997
+--- dict-gazetteer-1.3/format.c.orig   1997-07-20 15:21:24.000000000 +0000
 +++ dict-gazetteer-1.3/format.c
-@@ -22,7 +22,7 @@
+@@ -15,6 +15,7 @@
+ #include <ctype.h>
+ #include <math.h>
+ #include <time.h>
++#include <unistd.h>
+ #include <sys/time.h>
+ 
+ #define INCLUDE_STATE 0               /* If 1, also index "City, State".
+@@ -22,7 +23,7 @@
                                     This is usually clearer when
                                     searching. */
  
@@ -11,3 +19,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/12/27 0
  extern int    atoi(char *);
  extern int    printf( char *, ... );
  extern int    fprintf( FILE *, char *, ... );
+@@ -280,7 +281,7 @@ static void zips( char *buffer )
+                 allocation[strlen(allocation)-1] = 0;
+ 
+    for (i = 1; i < strlen(name); i++) {
+-      if (name[i-1] != ' ') name[i] = tolower(name[i]);
++      if (name[i-1] != ' ') name[i] = tolower((unsigned char)name[i]);
+    }
+ 
+    if (strcmp(name,zip)) {

Added files:

Index: pkgsrc/textproc/dict-dictionaries/patches/patch-dict-gazetteer-1.3_configure
diff -u /dev/null pkgsrc/textproc/dict-dictionaries/patches/patch-dict-gazetteer-1.3_configure:1.1
--- /dev/null   Sun Jan  4 14:08:24 2026
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-dict-gazetteer-1.3_configure        Sun Jan  4 14:08:23 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-dict-gazetteer-1.3_configure,v 1.1 2026/01/04 14:08:23 wiz Exp $
+
+Add missing return value.
+
+--- dict-gazetteer-1.3/configure.orig  2026-01-04 13:57:34.051307553 +0000
++++ dict-gazetteer-1.3/configure
+@@ -694,7 +694,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 696 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
Index: pkgsrc/textproc/dict-dictionaries/patches/patch-dict-misc-1.5_configure
diff -u /dev/null pkgsrc/textproc/dict-dictionaries/patches/patch-dict-misc-1.5_configure:1.1
--- /dev/null   Sun Jan  4 14:08:24 2026
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-dict-misc-1.5_configure     Sun Jan  4 14:08:23 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-dict-misc-1.5_configure,v 1.1 2026/01/04 14:08:23 wiz Exp $
+
+Add missing return value.
+
+--- dict-misc-1.5/configure.orig       2026-01-04 13:57:48.588608673 +0000
++++ dict-misc-1.5/configure
+@@ -694,7 +694,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 696 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
Index: pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_configure
diff -u /dev/null pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_configure:1.1
--- /dev/null   Sun Jan  4 14:08:24 2026
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_configure  Sun Jan  4 14:08:23 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-dict-web1913-1.4_configure,v 1.1 2026/01/04 14:08:23 wiz Exp $
+
+Add missing return value.
+
+--- dict-web1913-1.4/configure.orig    2026-01-04 13:57:55.979748705 +0000
++++ dict-web1913-1.4/configure
+@@ -698,7 +698,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 700 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
Index: pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_fmt.c
diff -u /dev/null pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_fmt.c:1.1
--- /dev/null   Sun Jan  4 14:08:24 2026
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_fmt.c      Sun Jan  4 14:08:23 2026
@@ -0,0 +1,37 @@
+$NetBSD: patch-dict-web1913-1.4_fmt.c,v 1.1 2026/01/04 14:08:23 wiz Exp $
+
+Fix ctype(3) abuse.
+
+--- dict-web1913-1.4/fmt.c.orig        1998-02-22 19:31:42.000000000 +0000
++++ dict-web1913-1.4/fmt.c
+@@ -174,18 +174,18 @@ static void _fmt_line( int c, int ind, i
+       }
+       break;
+    case FMT_LITERAL:
+-      line[offset].c       = (isspace(c) && c != '\n') ? ' ' : c;
++      line[offset].c       = (isspace((unsigned char)c) && c != '\n') ? ' ' : c;
+       line[offset].indent  = ind;
+       line[offset].special = special;
+       ++offset;
+       break;
+    default:
+-      if (isspace(c) && offset
++      if (isspace((unsigned char)c) && offset
+         && (line[offset-1].c == ' '
+             || line[offset-1].special == FMT_NEWLINE)) {
+           line[offset-1].indent  = ind;
+       } else {
+-       line[offset].c       = isspace(c) ? ' ' : c;
++       line[offset].c       = isspace((unsigned char)c) ? ' ' : c;
+        line[offset].indent  = ind;
+        line[offset].special = special;
+        ++offset;
+@@ -312,7 +312,7 @@ void fmt_add_index( const char *string )
+       fmt_flush_index();
+       stk = stk_create();
+    }
+-   while (isspace(*pt)) ++pt; /* skip leading spaces */
++   while (isspace((unsigned char)*pt)) ++pt;  /* skip leading spaces */
+ 
+    if (!*pt) return;          /* skip empties */
+    stk_push(stk, (void *)pt);
Index: pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_configure
diff -u /dev/null pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_configure:1.1
--- /dev/null   Sun Jan  4 14:08:24 2026
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_configure   Sun Jan  4 14:08:24 2026
@@ -0,0 +1,69 @@
+$NetBSD: patch-dict-web1913-1.4_libmaa_configure,v 1.1 2026/01/04 14:08:24 wiz Exp $
+
+Add missing return value.
+
+--- dict-web1913-1.4/libmaa/configure.orig     2026-01-04 13:58:32.629327896 +0000
++++ dict-web1913-1.4/libmaa/configure
+@@ -694,7 +694,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 696 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
+@@ -1812,7 +1812,7 @@ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1814 "configure"
+ #include "confdefs.h"
+-main () {
++int main () {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
+@@ -1858,7 +1858,7 @@ else
+ #line 1859 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
+@@ -1897,7 +1897,7 @@ else
+ #line 1898 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
+@@ -1936,7 +1936,7 @@ else
+ #line 1937 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
+@@ -1975,7 +1975,7 @@ else
+ #line 1976 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
+@@ -2209,7 +2209,7 @@ find_stack_direction ()
+   else
+     return (&dummy > addr) ? 1 : -1;
+ }
+-main ()
++int main ()
+ {
+   exit (find_stack_direction() < 0);
+ }
Index: pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_getopt.c
diff -u /dev/null pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_getopt.c:1.1
--- /dev/null   Sun Jan  4 14:08:24 2026
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_getopt.c    Sun Jan  4 14:08:24 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-dict-web1913-1.4_libmaa_getopt.c,v 1.1 2026/01/04 14:08:24 wiz Exp $
+
+Add missing header.
+
+--- dict-web1913-1.4/libmaa/getopt.c.orig      1998-02-22 19:32:21.000000000 +0000
++++ dict-web1913-1.4/libmaa/getopt.c
+@@ -43,6 +43,7 @@ Cambridge, MA 02139, USA.  */
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #ifdef __sparc__
+ extern int fprintf( FILE *, const char *, ... );
Index: pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_obstack.c
diff -u /dev/null pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_obstack.c:1.1
--- /dev/null   Sun Jan  4 14:08:24 2026
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-dict-web1913-1.4_libmaa_obstack.c   Sun Jan  4 14:08:24 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-dict-web1913-1.4_libmaa_obstack.c,v 1.1 2026/01/04 14:08:24 wiz Exp $
+
+Add missing header.
+
+--- dict-web1913-1.4/libmaa/obstack.c.orig     1998-02-22 19:32:33.000000000 +0000
++++ dict-web1913-1.4/libmaa/obstack.c
+@@ -23,6 +23,7 @@ Cambridge, MA 02139, USA.  */
+ 
+ /* This is just to get __GNU_LIBRARY__ defined.  */
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C
Index: pkgsrc/textproc/dict-dictionaries/patches/patch-dict-wn-1.5_configure
diff -u /dev/null pkgsrc/textproc/dict-dictionaries/patches/patch-dict-wn-1.5_configure:1.1
--- /dev/null   Sun Jan  4 14:08:24 2026
+++ pkgsrc/textproc/dict-dictionaries/patches/patch-dict-wn-1.5_configure       Sun Jan  4 14:08:24 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-dict-wn-1.5_configure,v 1.1 2026/01/04 14:08:24 wiz Exp $
+
+Add missing return value.
+
+--- dict-wn-1.5/configure.orig 2026-01-04 13:58:01.001664938 +0000
++++ dict-wn-1.5/configure
+@@ -690,7 +690,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 692 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes



Home | Main Index | Thread Index | Old Index