pkg/25720: pkgsrc/textproc/dict-server

[shannonjr%netbsd.org@localhost]

>Number:         25720
>Category:       pkg
>Synopsis:       syntax errors prevent compilation with gcc 3.4.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed May 26 18:23:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     John R. Shannon
>Release:        NetBSD 2.0_BETA
>Organization:
        johnrshannon.com
>Environment:
System: NetBSD colleen.internal.johnrshannon.com 2.0_BETA NetBSD 2.0_BETA 
(KERNEL) #0: Mon May 24 05:31:10 MDT 2004 
root%colleen.internal.johnrshannon.com@localhost:/usr/obj/usr/src/sys/arch/i386/compile/KERNEL
 i386
Architecture: i386
Machine: i386
>Description:
        Syntax errors:
        1) 4 instance of missing comma in argument list of function call
        2) label at end of block
>How-To-Repeat:
        Build with wip/gcc-3.4
>Fix:

Modification to existing patch:

RCS file: /cvsroot/pkgsrc/textproc/dict-server/patches/patch-al,v
retrieving revision 1.3
diff -r1.3 patch-al
1c1
< $NetBSD: patch-al,v 1.3 2003/09/30 21:50:55 seb Exp $
---
> $NetBSD$
3c3
< --- dictfmt.c.orig    2002-08-23 17:33:10.000000000 +0000
---
> --- dictfmt.c.orig    2002-08-23 11:33:10.000000000 -0600
13a14,21
> @@ -685,6 +685,7 @@ int main( int argc, char **argv )
>        fmt_newline();
>        }
>   skip:
> +     ;
>     }
>
>     fmt_newheadword(NULL,0);

New patch:


$NetBSD$

--- libmaa/parse.c.orig 2002-08-02 13:43:15.000000000 -0600
+++ 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,(__FUNCTION__, ": Using KHEPERA_CPP from %s\n",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,(__FUNCTION__, ": Using GNU cpp from %s\n",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));
+                      (__FUNCTION__, ": Using system cpp from %s\n",*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,(__FUNCTION__ ,": %s\n",buffer));
    if (!(yyin = popen( buffer, "r" )))
       err_fatal_errno( __FUNCTION__,
                       "Cannot open \"%s\" for read\n", filename );
>Release-Note:
>Audit-Trail:
>Unformatted: