Re: PR 25725 Syntax errors prevent compilation of with gcc 3.4.0

The patch-ac corrects four instances of printf being called with an
uncompilable argument list; the patch follows a recommendation from
Christian Biere <christianbiere@gmx.de>.
The patch-ad corrects a situation where a label at end of block prevents
compilation; the fix adds a null statement as the label's target.

3 files changed, 55 insertions, 1 deletions

diff --git a/textproc/dict-dictionaries/distinfo b/textproc/dict-dictionaries/distinfo
index f04f9c50801..4da1e3dd2e1 100644
--- a/textproc/dict-dictionaries/distinfo
+++ b/textproc/dict-dictionaries/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/27 02:43:47 uebayasi Exp $
+$NetBSD: distinfo,v 1.2 2004/06/01 15:36:50 shannonjr Exp $
 
 SHA1 (dict-gazetteer-1.3.tar.gz) = d46d3e0aeb956bb2b49e1ec1cda271017eed94c4
 Size (dict-gazetteer-1.3.tar.gz) = 2857457 bytes
@@ -12,3 +12,5 @@ SHA1 (dict-wn-1.5.tar.gz) = 56cfd7200e4149504376b280e36aa37abcbe054e
 Size (dict-wn-1.5.tar.gz) = 6363650 bytes
 SHA1 (patch-aa) = fdc8ee511a2e5ebbacccae199e5e37b9c0a40666
 SHA1 (patch-ab) = 232c319e24e874703c441115c13af32c697f81c6
+SHA1 (patch-ac) = aa3956015efd2de7aff43ef0a8cc2bf2d751368f
+SHA1 (patch-ad) = 27b932ea47ec313d32548a66d975b777e42358fe
diff --git a/textproc/dict-dictionaries/patches/patch-ac b/textproc/dict-dictionaries/patches/patch-ac
new file mode 100644
index 00000000000..37be5fb5075
--- /dev/null
+++ b/textproc/dict-dictionaries/patches/patch-ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.1 2004/06/01 15:36:50 shannonjr Exp $
+
+--- dict-web1913-1.4/libmaa/parse.c.orig	1998-02-22 12:32:36.000000000 -0700
++++ dict-web1913-1.4/libmaa/parse.c
+@@ -75,7 +75,7 @@ void prs_file( const char *filename )
+ 
+    if (!cpp) {
+       if ((cpp = getenv( "KHEPERA_CPP" ))) {
+-         PRINTF(MAA_PARSE,(__FUNCTION__ ": Using KHEPERA_CPP from %s\n",cpp));
++         PRINTF(MAA_PARSE,("%s : Using KHEPERA_CPP from %s\n", __FUNCTION__, cpp));
+       }
+       
+                                 /* Always look for gcc's cpp first, since
+@@ -86,7 +86,7 @@ void prs_file( const char *filename )
+          
+          if (fread( buf, 1, 1023, tmp ) > 0) {
+             if ((t = strchr( buf, '\n' ))) *t = '\0';
+-            PRINTF(MAA_PARSE,(__FUNCTION__ ": Using GNU cpp from %s\n",buf));
++            PRINTF(MAA_PARSE,("%s : Using GNU cpp from %s\n",__FUNCTION__,buf));
+             cpp = str_find( buf );
+             extra_options = "-nostdinc -nostdinc++";
+          }
+@@ -103,7 +103,7 @@ void prs_file( const char *filename )
+          for (pt = cpps; **pt; pt++) {
+             if (!access( *pt, X_OK )) {
+                PRINTF(MAA_PARSE,
+-                      (__FUNCTION__ ": Using system cpp from %s\n",*pt));
++                      ("%s : Using system cpp from %s\n",__FUNCTION__,*pt));
+                cpp = *pt;
+                break;
+             }
+@@ -123,7 +123,7 @@ void prs_file( const char *filename )
+    sprintf( buffer, "%s -I. %s %s 2>/dev/null", cpp,
+ 	    _prs_cpp_options ? _prs_cpp_options : "", filename );
+ 
+-   PRINTF(MAA_PARSE,(__FUNCTION__ ": %s\n",buffer));
++   PRINTF(MAA_PARSE,("%s : %s\n",__FUNCTION__,buffer));
+    if (!(yyin = popen( buffer, "r" )))
+       err_fatal_errno( __FUNCTION__,
+ 		       "Cannot open \"%s\" for read\n", filename );
diff --git a/textproc/dict-dictionaries/patches/patch-ad b/textproc/dict-dictionaries/patches/patch-ad
new file mode 100644
index 00000000000..f99f9452ad3
--- /dev/null
+++ b/textproc/dict-dictionaries/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2004/06/01 15:36:50 shannonjr Exp $
+
+--- ./dict-misc-1.5/dictfmt.c.orig	1998-07-05 19:33:40.000000000 -0600
++++ ./dict-misc-1.5/dictfmt.c
+@@ -465,6 +465,7 @@ int main( int argc, char **argv )
+       fmt_string(buf);
+       fmt_newline();
+  skip:
++      ;
+    }
+    
+    fmt_newheadword(NULL,0);