From trasz@pin.if.uz.zgora.pl  Sat Oct  7 14:17:14 2006
Return-Path: <trasz@pin.if.uz.zgora.pl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 15BB116A40F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Oct 2006 14:17:14 +0000 (UTC)
	(envelope-from trasz@pin.if.uz.zgora.pl)
Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8D57743D46
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Oct 2006 14:17:13 +0000 (GMT)
	(envelope-from trasz@pin.if.uz.zgora.pl)
Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001)
	id 3B4CB39DB8; Sat,  7 Oct 2006 16:17:31 +0200 (CEST)
Message-Id: <20061007141731.3B4CB39DB8@pin.if.uz.zgora.pl>
Date: Sat,  7 Oct 2006 16:17:31 +0200 (CEST)
From: trasz <trasz@pin.if.uz.zgora.pl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] cad/spice: fix build with gcc41
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         104109
>Category:       ports
>Synopsis:       [PATCH] cad/spice: fix build with gcc41
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 07 14:20:26 GMT 2006
>Closed-Date:    Sat Oct 07 14:44:59 GMT 2006
>Last-Modified:  Sat Oct  7 14:50:27 GMT 2006
>Originator:     trasz
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat Jun  3 01:12:10 CEST
>Description:
Fix buidl with gcc41.

Added file(s):
- files/patch-src-lib-mfb-mfbcaps.c

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- spice-3f5.2_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/cad/spice/files/patch-src-lib-mfb-mfbcaps.c /home/trasz/spice/files/patch-src-lib-mfb-mfbcaps.c
--- /usr/ports/cad/spice/files/patch-src-lib-mfb-mfbcaps.c	Thu Jan  1 01:00:00 1970
+++ /home/trasz/spice/files/patch-src-lib-mfb-mfbcaps.c	Sat Oct  7 16:16:38 2006
@@ -0,0 +1,14 @@
+--- src/lib/mfb/mfbcaps.c.orig	Sat Oct  7 15:56:38 2006
++++ src/lib/mfb/mfbcaps.c	Sat Oct  7 15:57:51 2006
+@@ -43,9 +43,9 @@
+ 
+ FILE   *POpen();
+ char   *strcpy();
+-char   *MFBSkip();
++static char   *MFBSkip();
+ char   *MFBGetStr();
+-char   *MFBCapDecod();
++static char   *MFBCapDecod();
+ int    MFBGetNum();
+ int    MFBGetFlag();
+ int    MFBGetEnt();
diff -ruN --exclude=CVS /usr/ports/cad/spice/files/patch-src_lib_fte_graf_c /home/trasz/spice/files/patch-src_lib_fte_graf_c
--- /usr/ports/cad/spice/files/patch-src_lib_fte_graf_c	Sat Jul 19 05:13:48 2003
+++ /home/trasz/spice/files/patch-src_lib_fte_graf_c	Sat Oct  7 16:16:37 2006
@@ -1,6 +1,15 @@
---- src/lib/fte/graf.c.orig	Tue Jan  5 16:43:44 1993
-+++ src/lib/fte/graf.c	Thu Jul 17 12:16:42 2003
-@@ -289,9 +289,11 @@
+--- src/lib/fte/graf.c.orig	Tue Jan  5 22:43:44 1993
++++ src/lib/fte/graf.c	Sat Oct  7 16:02:45 2006
+@@ -48,6 +48,8 @@
+ static char *ticlist = ticbuf;
+ #define MAXTICS 100
+ double *readtics();
++static gr_resize_internal();
++static drawlegend();
+ 
+ #define XFACTOR 2       /* How much to expand the X scale during iplot. */
+ #define YFACTOR 1.5     /* How much to expand the Y scale during iplot. */
+@@ -289,9 +291,11 @@
  		if (*tics == (double) np) {
  		    Text("x", (int) (tox - currentgraph->fontwidth / 2),
  			(int) (toy - currentgraph->fontheight / 2));
@@ -14,7 +23,7 @@
  		    break;
  		}
  	    }
-@@ -301,9 +303,11 @@
+@@ -301,9 +305,11 @@
  	    /* Draw an 'x' */
  	    Text("x", (int) (tox - currentgraph->fontwidth / 2),
  		(int) (toy - currentgraph->fontheight / 2));
diff -ruN --exclude=CVS /usr/ports/cad/spice/files/patch-src_lib_fte_grid_c /home/trasz/spice/files/patch-src_lib_fte_grid_c
--- /usr/ports/cad/spice/files/patch-src_lib_fte_grid_c	Sat Jul 19 05:13:48 2003
+++ /home/trasz/spice/files/patch-src_lib_fte_grid_c	Sat Oct  7 16:16:37 2006
@@ -1,6 +1,15 @@
---- src/lib/fte/grid.c.orig	Sun Apr 25 16:53:11 1993
-+++ src/lib/fte/grid.c	Thu Jul 17 00:47:51 2003
-@@ -1230,7 +1230,10 @@
+--- src/lib/fte/grid.c.orig	Sun Apr 25 23:53:11 1993
++++ src/lib/fte/grid.c	Sat Oct  7 16:00:37 2006
+@@ -26,6 +26,8 @@
+ static void arcset();
+ static double cliparc();
+ static void adddeglabel(), addradlabel();
++static drawloggrid();
++static drawlingrid();
+ 
+ typedef enum { x_axis, y_axis } Axis;
+ 
+@@ -1230,7 +1232,10 @@
  
      /* SetLinestyle(1); takes too long */
      /* Problems with Suns on very large radii && linestyle */
@@ -12,7 +21,7 @@
  
      /* Now plot all the arc sets.  Go as high as 5 times the radius that
       * will fit on the screen.  The base magnitude is one more than 
-@@ -1409,7 +1412,10 @@
+@@ -1409,7 +1414,10 @@
      /* Let's be lazy and just draw everything -- we won't get called too
       * much and the circles get clipped anyway...
       */
@@ -24,7 +33,7 @@
  
      cliparc((double) (centx + xoffset + radoff - rad),
  	    (double) (centy + yoffset), rad, 2*angle,
-@@ -1424,7 +1430,10 @@
+@@ -1424,7 +1432,10 @@
              M_PI - 2 * angle, centx, centy, maxrad, 0);
  
      /* Draw the upper and lower circles.  */
@@ -36,7 +45,7 @@
      aclip = cliparc((double) (centx + xoffset + radoff),
  	    (double) (centy + yoffset + irad), irad,
  	    (double) (M_PI * 1.5 + 2 * iangle),
-@@ -1441,7 +1450,10 @@
+@@ -1441,7 +1452,10 @@
  	adddeglabel(graph, ndeg, xlab, ylab,
  	    gr_xcenter, gr_ycenter, gr_xcenter, gr_ycenter);
   */
@@ -48,7 +57,7 @@
  	}
      }
      aclip = cliparc((double) (centx + xoffset + radoff),
-@@ -1455,7 +1467,10 @@
+@@ -1455,7 +1469,10 @@
  	SetColor(1);
  	adddeglabel(graph, ndeg, xlab, ylab,
  	    gr_xcenter, gr_ycenter, gr_xcenter, gr_ycenter);
--- spice-3f5.2_3.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Oct 7 14:44:58 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104109 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104109: commit references a PR
Date: Sat,  7 Oct 2006 14:44:51 +0000 (UTC)

 miwi        2006-10-07 14:44:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     cad/spice/files      patch-src_lib_fte_graf_c 
                          patch-src_lib_fte_grid_c 
   Added files:
     cad/spice/files      patch-src-lib-mfb-mfbcaps.c 
   Log:
   - Fix build with gcc4.1
   
   PR:             ports/104109
   Submitted by:   trasz <trasz@pin.if.uz.zgora.pl>
   
   Revision  Changes    Path
   1.1       +14 -0     ports/cad/spice/files/patch-src-lib-mfb-mfbcaps.c (new)
   1.2       +13 -4     ports/cad/spice/files/patch-src_lib_fte_graf_c
   1.2       +16 -7     ports/cad/spice/files/patch-src_lib_fte_grid_c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
