head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.114 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.112 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.110 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.108 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.106 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.104 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.102 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.100 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.98 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.96 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.94 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.92 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.90 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.88 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.86 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.84 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.82 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.80 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.78 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.76 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.74 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.72 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.70 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.66 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.46 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.68 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.64 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.62 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.60 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.58 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.56 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.54 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.52 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.50 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.48 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.44 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.42 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.40 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.38 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.36 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.34 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.32 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.30 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.28 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.26 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.24 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.22 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.20 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.18 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.16 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.14 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.12 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.10 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.6 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.4 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.2 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.2.0.40 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.38 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.36 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.34 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.32 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.30 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.28 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.26 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.24 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.22 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.20 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.18 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.16 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.14 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.12 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.10 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.8 pkgsrc-2008Q1:1.2.0.6 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.4 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.2 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.1.0.38 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.36 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.34 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.3 date 2012.01.25.09.56.08; author he; state Exp; branches; next 1.2; 1.2 date 2007.10.02.20.23.08; author heinz; state Exp; branches; next 1.1; 1.1 date 2002.04.01.00.04.44; author dmcmahill; state Exp; branches; next ; desc @@ 1.3 log @Update patches for this package so that it builds with -Werror and -Wall with the gcc in NetBSD 5.1, i.e. gcc 4.1.3. Fixes prompted by reports that a build outside of pkgsrc for "64-bit Linux" (amd64) but using this set of patches, gets a segfault, and this fixes that problem. Bump pkgrevision. @ text @$NetBSD$ A number of changes to make this build with no warnings under -Wall. --- classes/dict.c.orig 1994-10-05 05:20:48.000000000 +0000 +++ classes/dict.c @@@@ -13,9 +13,15 @@@@ * [X] provide sequencing over all elements. */ +#include #include +#include #include +#ifdef HAVE_STRERROR +#include +#else extern char* strdup(); +#endif extern int strcasecmp(); #define _CLASS_Dict_PRIVATE_ @@@@ -51,16 +57,18 @@@@ struct _SymEnt_ { int mayAdd ); static SymEnt syment_new (void); - static SymEnt syment_dispose (SymEnt sep); static Hash_t symhash (Key_t key); static Hash_t symcasehash (Key_t key); +#if 0 +static void dict_printOn(Dict, FILE*); +#endif + #else static Dict dict_expand (); static SymEnt* dict_locationOf (); static SymEnt syment_new (); - static SymEnt syment_dispose (); static Hash_t symhash (); static Hash_t symcasehash (); @@@@ -164,7 +172,6 @@@@ Value_t v; { SymEnt* psep, sep; struct _SymEnt_ tmp; - Hash_t hsh; tmp.name = n; psep = dict_locationOf (self, &tmp, 1); @@@@ -205,7 +212,6 @@@@ Key_t n; { register SymEnt* psep, sep; struct _SymEnt_ tmp; - Value_t v = 0; tmp.name = n; psep = dict_locationOf (self, &tmp, 0); @@@@ -270,7 +276,6 @@@@ Value_t v; { SymEnt* psep, sep; struct _SymEnt_ tmp; - Hash_t hsh; Value_t oldValue; @@@@ -389,15 +394,18 @@@@ int yesno; return 0; } +#if 0 +static void dict_printOn (self, file) -Dict self; -FILE* file; + Dict self; + FILE* file; { fprintf (file, "Dict(0x%x): nhead=%d; nheadinuse=%d\n", - self, self->nhead, self->nheadinuse); + (intptr_t)self, self->nhead, self->nheadinuse); fprintf (file, " nitems=%d; avgChain = %.2f\n", self->nitems, self->nheadinuse ? (double)self->nitems/self->nheadinuse : (double )0); } +#endif /* Private Functions: * @@@@ -477,7 +485,7 @@@@ Key_t ptr; { Hash_t ret = 0; register unsigned char* nhp = (unsigned char*)ptr; - register cv; + int cv; while (*nhp) { cv = *nhp++; @@@@ -545,8 +553,8 @@@@ int mayAdd; static SymEnt syment_new() { - register SymEnt sep; - register n; + SymEnt sep; + int n; sep = (SymEnt) calloc (DFLTSYMENT, sizeof (*sep)); for (n = 0; n < DFLTSYMENT; n++, sep++) @ 1.2 log @Added compatibility fixes for NetBSD/FreeBSD/Linux/Solaris provided by Yakovetsky Vladimir in PR pkg/36942. Shut up warning by pkglint (PLIST). Introduced PKGMANDIR in software Makefile. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2002/04/01 00:04:44 dmcmahill Exp $ d3 3 a5 1 --- classes/dict.c.orig 1994-10-05 06:20:48.000000000 +0100 d7 2 a8 1 @@@@ -14,8 +14,13 @@@@ d11 1 d23 87 @ 1.1 log @fix for LP64 systems. Mostly just adding missing header files. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- classes/dict.c.orig Wed Oct 5 01:20:48 1994 d5 1 a5 1 @@@@ -14,6 +14,7 @@@@ d11 3 d15 1 d17 2 @