From nobody@FreeBSD.org  Mon Nov 12 08:43:17 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EB3C416A419
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Nov 2007 08:43:16 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id BBD8213C4B8
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Nov 2007 08:43:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id lAC8gjRV086924
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Nov 2007 08:42:45 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id lAC8gjGA086923;
	Mon, 12 Nov 2007 08:42:45 GMT
	(envelope-from nobody)
Message-Id: <200711120842.lAC8gjGA086923@www.freebsd.org>
Date: Mon, 12 Nov 2007 08:42:45 GMT
From: "Pedro F. Giffuni" <giffunip@tutopia.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Cleanups to the cad/spice port
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         117997
>Category:       ports
>Synopsis:       Cleanups to the cad/spice port
>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:   Mon Nov 12 08:50:00 UTC 2007
>Closed-Date:    Sat Dec 15 19:42:47 UTC 2007
>Last-Modified:  Sat Dec 15 19:50:00 UTC 2007
>Originator:     Pedro F. Giffuni
>Release:        6.2-Release (amd64)
>Organization:
>Environment:
FreeBSD kakumen.cable.net.co 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 08:43:30 UTC 2007     root@portnoy.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP  amd64

>Description:
The tarball has been rerolled without notice so update the makesum. While here, cleaned a warning and did an attempt to properly sort out the os_bsd.h file.
No functional changes.
>How-To-Repeat:

>Fix:
diff -ruN spice.orig/distinfo spice/distinfo
--- spice.orig/distinfo	Mon Nov 12 03:27:07 2007
+++ spice/distinfo	Mon Nov 12 03:27:18 2007
@@ -1,6 +1,6 @@
-MD5 (spice/spice3f5.tar.gz) = 14d901bda437d4edda91c929b87eff51
-SHA256 (spice/spice3f5.tar.gz) = 233fe76233dc4071f43c902819a24050d3011fe6ece4c2fe2ac41f32b0e33bfb
-SIZE (spice/spice3f5.tar.gz) = 1226208
+MD5 (spice/spice3f5.tar.gz) = 2b6d1c346bea4b9914147bc30937f9e5
+SHA256 (spice/spice3f5.tar.gz) = cac11fe2a761241e6b6c9eaa31b938c7ffa76aeaecac09809609d3a4125cd269
+SIZE (spice/spice3f5.tar.gz) = 1226185
 MD5 (spice/cp.ps) = ee9065de6e11e82fa3fe34318c2373fc
 SHA256 (spice/cp.ps) = 3bab6c3487def4ce2e817bf7ef3c1a7d199ea8e790da3a786f936872b35d0920
 SIZE (spice/cp.ps) = 10297
diff -ruN spice.orig/files/patch-src_include_os_bsd_h spice/files/patch-src_include_os_bsd_h
--- spice.orig/files/patch-src_include_os_bsd_h	Mon Nov 12 03:27:07 2007
+++ spice/files/patch-src_include_os_bsd_h	Mon Nov 12 03:29:51 2007
@@ -1,43 +1,44 @@
 --- src/include/os_bsd.h.orig	Sat Apr 24 18:09:46 1993
-+++ src/include/os_bsd.h	Mon Apr  3 21:27:21 2006
-@@ -8,18 +8,36 @@
++++ src/include/os_bsd.h	Mon Nov 12 03:14:36 2007
+@@ -8,18 +8,35 @@
  
  #include "os_unix.h"
  
-+#ifdef __FreeBSD__
++#ifdef __FreeBSD__	/* BSD4_3 */
 +#define HAS_STDLIB		/* #include <stdlib.h> for libc defs	*/
 +#define HAS_SYSVDIRS		/* <sys/dirent.h>			*/
-+#define HAS_INTWAITSTATUS	/* wait(3)  takes an int *, not a union */
++#define HAS_INTWAITSTATUS	/* wait(2)  takes an int *, not a union */
 +#define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
-+#define HAS_STRCHR		/* strchr( ) instead of index( )	*/
++#define HAS_STRCHR		/* strchr(3) instead of index(3)	*/
++#define HAS_ATRIGH		/* acosh(3), asinh(3), atanh(3)         */
++#define HAS_FLOAT_H		/* float.h				*/
++#define HAS_BSDSOCKETS		/* <net/inet.h>, socket(2), etc.	*/
++#define HAS_BSDTIME		/* gettimeofday(2) return time		*/
 +#else
  #define HAS_NO_ATRIGH_DECL	/* if asinh( ) is not in math.h		*/
 -#define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
- #define HAS_FTIME		/* ftime( ), <times.h>			*/
+-#define HAS_FTIME		/* ftime( ), <times.h>			*/
++#define HAS_FTIME		/* ftime(3), <times.h>			*/
 +#define HAS_INDEX		/* index( ) instead of strchr( )	*/
 +#define HAS_BSDDIRS		/* <sys/dir.h>				*/
 +#endif
 +
-+#define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
  #define HAS_TERMCAP		/* tgetxxx( )				*/
  #define HAS_VFORK		/* BSD-ism, should not be necessary	*/
 -#define HAS_INDEX		/* index( ) instead of strchr( )	*/
  #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
  #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
-+#ifdef __FreeBSD__
++#ifdef __FreeBSD__	/* BSD4_4 */
 +#define HAS_POSIXTTY		/* <termios.h>				*/
++#define HAS_GETCWD		/* getcwd(buf,size)				*/
 +#else
  #define HAS_BSDTTY		/* <sgtty.h>				*/
 -#define HAS_BSDDIRS		/* <sys/dir.h>				*/
++#define HAS_GETWD		/* getwd(buf)				*/
 +#endif
++
  #define HAS_BSDRUSAGE		/* getrusage( )				*/
  #define HAS_BSDRLIMIT		/* getrlimit( )				*/
  #define HAS_DUP2
- #define HAS_GETWD		/* getwd(buf)				*/
+-#define HAS_GETWD		/* getwd(buf)				*/
 -#define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
-+
-+#ifdef __FreeBSD__
-+#define HAS_BSDSOCKETS		/* <net/inet.h>, socket( ), etc.	*/
-+#define HAS_BSDTIME		/* gettimeofday( ) return time		*/
-+#define HAS_FLOAT_H		/* float.h				*/
-+#endif
diff -ruN spice.orig/files/patch-src_lib_cp_cshpar_c spice/files/patch-src_lib_cp_cshpar_c
--- spice.orig/files/patch-src_lib_cp_cshpar_c	Wed Dec 31 19:00:00 1969
+++ spice/files/patch-src_lib_cp_cshpar_c	Mon Nov 12 03:28:04 2007
@@ -0,0 +1,10 @@
+--- src/lib/cp/cshpar.c.orig	Mon Nov 12 02:26:08 2007
++++ src/lib/cp/cshpar.c	Mon Nov 12 02:30:46 2007
+@@ -6,6 +6,7 @@
+ /*
+  * The main entry point for cshpar.
+  */
++#include <unistd.h>
+ 
+ #include "spice.h"
+ #include "misc.h"


>Release-Note:
>Audit-Trail:

From: <pfgshield-freebsd@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/117997: Cleanups to the cad/spice port
Date: Thu, 22 Nov 2007 14:52:38 -0600 (CST)

 This patch is a little more evolved in that it also syncs a patch with NetBSD,
 avoiding some cosmetic changes we had made in previous revisions.
 
 diff -rNu spice.orig/distinfo spice/distinfo
 --- spice.orig/distinfo	Mon Nov 12 03:27:07 2007
 +++ spice/distinfo	Mon Nov 12 03:37:40 2007
 @@ -1,6 +1,6 @@
 -MD5 (spice/spice3f5.tar.gz) = 14d901bda437d4edda91c929b87eff51
 -SHA256 (spice/spice3f5.tar.gz) =
 233fe76233dc4071f43c902819a24050d3011fe6ece4c2fe2ac41f32b0e33bfb
 -SIZE (spice/spice3f5.tar.gz) = 1226208
 +MD5 (spice/spice3f5.tar.gz) = 2b6d1c346bea4b9914147bc30937f9e5
 +SHA256 (spice/spice3f5.tar.gz) =
 cac11fe2a761241e6b6c9eaa31b938c7ffa76aeaecac09809609d3a4125cd269
 +SIZE (spice/spice3f5.tar.gz) = 1226185
  MD5 (spice/cp.ps) = ee9065de6e11e82fa3fe34318c2373fc
  SHA256 (spice/cp.ps) =
 3bab6c3487def4ce2e817bf7ef3c1a7d199ea8e790da3a786f936872b35d0920
  SIZE (spice/cp.ps) = 10297
 diff -rNu spice.orig/files/patch-src_include_os_bsd_h
 spice/files/patch-src_include_os_bsd_h
 --- spice.orig/files/patch-src_include_os_bsd_h	Mon Nov 12 03:27:07 2007
 +++ spice/files/patch-src_include_os_bsd_h	Mon Nov 12 03:37:40 2007
 @@ -1,43 +1,44 @@
  --- src/include/os_bsd.h.orig	Sat Apr 24 18:09:46 1993
 -+++ src/include/os_bsd.h	Mon Apr  3 21:27:21 2006
 -@@ -8,18 +8,36 @@
 ++++ src/include/os_bsd.h	Mon Nov 12 03:14:36 2007
 +@@ -8,18 +8,35 @@
   
   #include "os_unix.h"
   
 -+#ifdef __FreeBSD__
 ++#ifdef __FreeBSD__	/* BSD4_3 */
  +#define HAS_STDLIB		/* #include <stdlib.h> for libc defs	*/
  +#define HAS_SYSVDIRS		/* <sys/dirent.h>			*/
 -+#define HAS_INTWAITSTATUS	/* wait(3)  takes an int *, not a union */
 ++#define HAS_INTWAITSTATUS	/* wait(2)  takes an int *, not a union */
  +#define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
 -+#define HAS_STRCHR		/* strchr( ) instead of index( )	*/
 ++#define HAS_STRCHR		/* strchr(3) instead of index(3)	*/
 ++#define HAS_ATRIGH		/* acosh(3), asinh(3), atanh(3)         */
 ++#define HAS_FLOAT_H		/* float.h				*/
 ++#define HAS_BSDSOCKETS		/* <net/inet.h>, socket(2), etc.	*/
 ++#define HAS_BSDTIME		/* gettimeofday(2) return time		*/
  +#else
   #define HAS_NO_ATRIGH_DECL	/* if asinh( ) is not in math.h		*/
  -#define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
 - #define HAS_FTIME		/* ftime( ), <times.h>			*/
 +-#define HAS_FTIME		/* ftime( ), <times.h>			*/
 ++#define HAS_FTIME		/* ftime(3), <times.h>			*/
  +#define HAS_INDEX		/* index( ) instead of strchr( )	*/
  +#define HAS_BSDDIRS		/* <sys/dir.h>				*/
  +#endif
  +
 -+#define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
   #define HAS_TERMCAP		/* tgetxxx( )				*/
   #define HAS_VFORK		/* BSD-ism, should not be necessary	*/
  -#define HAS_INDEX		/* index( ) instead of strchr( )	*/
   #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
   #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
 -+#ifdef __FreeBSD__
 ++#ifdef __FreeBSD__	/* BSD4_4 */
  +#define HAS_POSIXTTY		/* <termios.h>				*/
 ++#define HAS_GETCWD		/* getcwd(buf,size)				*/
  +#else
   #define HAS_BSDTTY		/* <sgtty.h>				*/
  -#define HAS_BSDDIRS		/* <sys/dir.h>				*/
 ++#define HAS_GETWD		/* getwd(buf)				*/
  +#endif
 ++
   #define HAS_BSDRUSAGE		/* getrusage( )				*/
   #define HAS_BSDRLIMIT		/* getrlimit( )				*/
   #define HAS_DUP2
 - #define HAS_GETWD		/* getwd(buf)				*/
 +-#define HAS_GETWD		/* getwd(buf)				*/
  -#define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
 -+
 -+#ifdef __FreeBSD__
 -+#define HAS_BSDSOCKETS		/* <net/inet.h>, socket( ), etc.	*/
 -+#define HAS_BSDTIME		/* gettimeofday( ) return time		*/
 -+#define HAS_FLOAT_H		/* float.h				*/
 -+#endif
 diff -rNu spice.orig/files/patch-src_lib_cp_cshpar_c
 spice/files/patch-src_lib_cp_cshpar_c
 --- spice.orig/files/patch-src_lib_cp_cshpar_c	Wed Dec 31 19:00:00 1969
 +++ spice/files/patch-src_lib_cp_cshpar_c	Mon Nov 12 03:37:40 2007
 @@ -0,0 +1,10 @@
 +--- src/lib/cp/cshpar.c.orig	Mon Nov 12 02:26:08 2007
 ++++ src/lib/cp/cshpar.c	Mon Nov 12 02:30:46 2007
 +@@ -6,6 +6,7 @@
 + /*
 +  * The main entry point for cshpar.
 +  */
 ++#include <unistd.h>
 + 
 + #include "spice.h"
 + #include "misc.h"
 diff -rNu spice.orig/files/patch-src_lib_fte_grid_c
 spice/files/patch-src_lib_fte_grid_c
 --- spice.orig/files/patch-src_lib_fte_grid_c	Mon Nov 12 03:27:07 2007
 +++ spice/files/patch-src_lib_fte_grid_c	Fri Nov 16 02:02:32 2007
 @@ -1,71 +1,76 @@
 ---- 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 @@
 +--- src/lib/fte/grid.c.orig	1993-04-25 23:53:11.000000000 +0200
 ++++ src/lib/fte/grid.c
 +@@ -17,11 +17,14 @@ Copyright 1990 Regents of the University
 + #include "suffix.h"
 + 
 + #define RAD_TO_DEG	(180.0 / M_PI)
 ++#define LABEL_CHARS	20
 + 
 + static double *lingrid(), *loggrid();
 + static void polargrid(), smithgrid();
 + static void drawpolargrid( );
 + static void drawsmithgrid( );
 ++static void drawlingrid( );
 ++static void drawloggrid( );
 + 
   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 */
 --    SetLinestyle(0);
 -+    /* SetLinestyle(0); */
 -+    /* linestyle 1 looks better
 -+       Guenther Roehrich 22-Jan-99 */
 -+    SetLinestyle(1);
 - 
 -     /* 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 +1414,10 @@
 -     /* Let's be lazy and just draw everything -- we won't get called too
 -      * much and the circles get clipped anyway...
 -      */
 --    SetColor(18);
 -+    /* SetColor(18); */
 -+    /* draw everything in black
 -+       Guenther Roehrich 22-Jan-99 */
 -+    SetColor(1);
 - 
 -     cliparc((double) (centx + xoffset + radoff - rad),
 - 	    (double) (centy + yoffset), rad, 2*angle,
 -@@ -1424,7 +1432,10 @@
 -             M_PI - 2 * angle, centx, centy, maxrad, 0);
 - 
 -     /* Draw the upper and lower circles.  */
 --    SetColor(19);
 -+    /* SetColor(19); */
 -+    /* draw everything in black
 -+       Guenther Roehrich 22-Jan-99 */
 -+    SetColor(1);
 -     aclip = cliparc((double) (centx + xoffset + radoff),
 - 	    (double) (centy + yoffset + irad), irad,
 - 	    (double) (M_PI * 1.5 + 2 * iangle),
 -@@ -1441,7 +1452,10 @@
 - 	adddeglabel(graph, ndeg, xlab, ylab,
 - 	    gr_xcenter, gr_ycenter, gr_xcenter, gr_ycenter);
 -  */
 --	SetColor(19);
 -+	/* SetColor(19); */
 -+	/* draw everything in black
 -+	   Guenther Roehrich 22-Jan-99 */
 -+	SetColor(1);
 - 	}
 -     }
 -     aclip = cliparc((double) (centx + xoffset + radoff),
 -@@ -1455,7 +1469,10 @@
 - 	SetColor(1);
 - 	adddeglabel(graph, ndeg, xlab, ylab,
 - 	    gr_xcenter, gr_ycenter, gr_xcenter, gr_ycenter);
 --	SetColor(19);
 -+	/* SetColor(19); */
 -+	/* draw everything in black
 -+	   Guenther Roehrich 22-Jan-99 */
 -+	SetColor(1);
 -     }
 -     
 -     /* Now toss the labels on... */
 +@@ -225,7 +228,7 @@ lingrid(graph, lo, hi, delta, type, axis
 +     int max;
 +     static double dd[2];
 +     int mult = 1;
 +-    char buf[16], *s;
 ++    char buf[LABEL_CHARS], *s;
 +     int slim, digits;
 + 
 +     if (axis == y_axis && graph->grid.ysized) {
 +@@ -473,11 +476,11 @@ lingrid(graph, lo, hi, delta, type, axis
 +     return (dd);
 + }
 + 
 +-static
 ++static void
 + drawlingrid(graph, units, spacing, nsp, dst, lmt, hmt, onedec, mult, mag,
 +     digits, axis)
 +     GRAPH *graph;
 +-    char units[16];
 ++    char *units;
 +     bool onedec;
 +     int nsp, spacing, mult;
 +     double hmt, lmt, dst;
 +@@ -488,7 +491,7 @@ drawlingrid(graph, units, spacing, nsp, 
 + 
 +     int i, j;
 +     double m, step;
 +-    char buf[16];
 ++    char buf[LABEL_CHARS];
 + 
 +     /* i counts how many pixels we have drawn, and j counts which unit
 +      * we are at.
 +@@ -567,7 +570,7 @@ loggrid(graph, lo, hi, type, axis)
 +     double k;
 +     double decs;
 +     double mag, gain;
 +-    char buf[32], *s;
 ++    char buf[LABEL_CHARS], *s;
 + 
 +     if (axis == x_axis && graph->grid.xsized) {
 +       lmt = graph->grid.xaxis.log.lmt;
 +@@ -661,7 +664,7 @@ loggrid(graph, lo, hi, type, axis)
 + 
 + }
 + 
 +-static
 ++static void
 + drawloggrid(graph, units, hmt, lmt, decsp, subs, pp, axis)
 +     GRAPH *graph;
 +     char *units;
 +@@ -671,7 +674,7 @@ drawloggrid(graph, units, hmt, lmt, decs
 + {
 +     int i, j, k, l, m;
 +     double t;
 +-    char buf[16];
 ++    char buf[LABEL_CHARS];
 + 
 +     /* Now plot every pp'th decade line, with subs lines between them. */
 +     if (subs > 1)
  :
 
 diff -rNu spice.orig/distinfo spice/distinfo
 --- spice.orig/distinfo	Mon Nov 12 03:27:07 2007
 +++ spice/distinfo	Mon Nov 12 03:37:40 2007
 @@ -1,6 +1,6 @@
 -MD5 (spice/spice3f5.tar.gz) = 14d901bda437d4edda91c929b87eff51
 -SHA256 (spice/spice3f5.tar.gz) =
 233fe76233dc4071f43c902819a24050d3011fe6ece4c2fe2ac41f32b0e33bfb
 -SIZE (spice/spice3f5.tar.gz) = 1226208
 +MD5 (spice/spice3f5.tar.gz) = 2b6d1c346bea4b9914147bc30937f9e5
 +SHA256 (spice/spice3f5.tar.gz) =
 cac11fe2a761241e6b6c9eaa31b938c7ffa76aeaecac09809609d3a4125cd269
 +SIZE (spice/spice3f5.tar.gz) = 1226185
  MD5 (spice/cp.ps) = ee9065de6e11e82fa3fe34318c2373fc
  SHA256 (spice/cp.ps) =
 3bab6c3487def4ce2e817bf7ef3c1a7d199ea8e790da3a786f936872b35d0920
  SIZE (spice/cp.ps) = 10297
 diff -rNu spice.orig/files/patch-src_include_os_bsd_h
 spice/files/patch-src_include_os_bsd_h
 --- spice.orig/files/patch-src_include_os_bsd_h	Mon Nov 12 03:27:07 2007
 +++ spice/files/patch-src_include_os_bsd_h	Mon Nov 12 03:37:40 2007
 @@ -1,43 +1,44 @@
  --- src/include/os_bsd.h.orig	Sat Apr 24 18:09:46 1993
 -+++ src/include/os_bsd.h	Mon Apr  3 21:27:21 2006
 -@@ -8,18 +8,36 @@
 ++++ src/include/os_bsd.h	Mon Nov 12 03:14:36 2007
 +@@ -8,18 +8,35 @@
   
   #include "os_unix.h"
   
 -+#ifdef __FreeBSD__
 ++#ifdef __FreeBSD__	/* BSD4_3 */
  +#define HAS_STDLIB		/* #include <stdlib.h> for libc defs	*/
  +#define HAS_SYSVDIRS		/* <sys/dirent.h>			*/
 -+#define HAS_INTWAITSTATUS	/* wait(3)  takes an int *, not a union */
 ++#define HAS_INTWAITSTATUS	/* wait(2)  takes an int *, not a union */
  +#define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
 -+#define HAS_STRCHR		/* strchr( ) instead of index( )	*/
 ++#define HAS_STRCHR		/* strchr(3) instead of index(3)	*/
 ++#define HAS_ATRIGH		/* acosh(3), asinh(3), atanh(3)         */
 ++#define HAS_FLOAT_H		/* float.h				*/
 ++#define HAS_BSDSOCKETS		/* <net/inet.h>, socket(2), etc.	*/
 ++#define HAS_BSDTIME		/* gettimeofday(2) return time		*/
  +#else
   #define HAS_NO_ATRIGH_DECL	/* if asinh( ) is not in math.h		*/
  -#define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
 - #define HAS_FTIME		/* ftime( ), <times.h>			*/
 +-#define HAS_FTIME		/* ftime( ), <times.h>			*/
 ++#define HAS_FTIME		/* ftime(3), <times.h>			*/
  +#define HAS_INDEX		/* index( ) instead of strchr( )	*/
  +#define HAS_BSDDIRS		/* <sys/dir.h>				*/
  +#endif
  +
 -+#define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
   #define HAS_TERMCAP		/* tgetxxx( )				*/
   #define HAS_VFORK		/* BSD-ism, should not be necessary	*/
  -#define HAS_INDEX		/* index( ) instead of strchr( )	*/
   #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
   #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
 -+#ifdef __FreeBSD__
 ++#ifdef __FreeBSD__	/* BSD4_4 */
  +#define HAS_POSIXTTY		/* <termios.h>				*/
 ++#define HAS_GETCWD		/* getcwd(buf,size)				*/
  +#else
   #define HAS_BSDTTY		/* <sgtty.h>				*/
  -#define HAS_BSDDIRS		/* <sys/dir.h>				*/
 ++#define HAS_GETWD		/* getwd(buf)				*/
  +#endif
 ++
   #define HAS_BSDRUSAGE		/* getrusage( )				*/
   #define HAS_BSDRLIMIT		/* getrlimit( )				*/
   #define HAS_DUP2
 - #define HAS_GETWD		/* getwd(buf)				*/
 +-#define HAS_GETWD		/* getwd(buf)				*/
  -#define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
 -+
 -+#ifdef __FreeBSD__
 -+#define HAS_BSDSOCKETS		/* <net/inet.h>, socket( ), etc.	*/
 -+#define HAS_BSDTIME		/* gettimeofday( ) return time		*/
 -+#define HAS_FLOAT_H		/* float.h				*/
 -+#endif
 diff -rNu spice.orig/files/patch-src_lib_cp_cshpar_c
 spice/files/patch-src_lib_cp_cshpar_c
 --- spice.orig/files/patch-src_lib_cp_cshpar_c	Wed Dec 31 19:00:00 1969
 +++ spice/files/patch-src_lib_cp_cshpar_c	Mon Nov 12 03:37:40 2007
 @@ -0,0 +1,10 @@
 +--- src/lib/cp/cshpar.c.orig	Mon Nov 12 02:26:08 2007
 ++++ src/lib/cp/cshpar.c	Mon Nov 12 02:30:46 2007
 +@@ -6,6 +6,7 @@
 + /*
 +  * The main entry point for cshpar.
 +  */
 ++#include <unistd.h>
 + 
 + #include "spice.h"
 + #include "misc.h"
 diff -rNu spice.orig/files/patch-src_lib_fte_grid_c
 spice/files/patch-src_lib_fte_grid_c
 --- spice.orig/files/patch-src_lib_fte_grid_c	Mon Nov 12 03:27:07 2007
 +++ spice/files/patch-src_lib_fte_grid_c	Fri Nov 16 02:02:32 2007
 @@ -1,71 +1,76 @@
 ---- 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 @@
 +--- src/lib/fte/grid.c.orig	1993-04-25 23:53:11.000000000 +0200
 ++++ src/lib/fte/grid.c
 +@@ -17,11 +17,14 @@ Copyright 1990 Regents of the University
 + #include "suffix.h"
 + 
 + #define RAD_TO_DEG	(180.0 / M_PI)
 ++#define LABEL_CHARS	20
 + 
 + static double *lingrid(), *loggrid();
 + static void polargrid(), smithgrid();
 + static void drawpolargrid( );
 + static void drawsmithgrid( );
 ++static void drawlingrid( );
 ++static void drawloggrid( );
 + 
   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 */
 --    SetLinestyle(0);
 -+    /* SetLinestyle(0); */
 -+    /* linestyle 1 looks better
 -+       Guenther Roehrich 22-Jan-99 */
 -+    SetLinestyle(1);
 - 
 -     /* 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 +1414,10 @@
 -     /* Let's be lazy and just draw everything -- we won't get called too
 -      * much and the circles get clipped anyway...
 -      */
 --    SetColor(18);
 -+    /* SetColor(18); */
 -+    /* draw everything in black
 -+       Guenther Roehrich 22-Jan-99 */
 -+    SetColor(1);
 - 
 -     cliparc((double) (centx + xoffset + radoff - rad),
 - 	    (double) (centy + yoffset), rad, 2*angle,
 -@@ -1424,7 +1432,10 @@
 -             M_PI - 2 * angle, centx, centy, maxrad, 0);
 - 
 -     /* Draw the upper and lower circles.  */
 --    SetColor(19);
 -+    /* SetColor(19); */
 -+    /* draw everything in black
 -+       Guenther Roehrich 22-Jan-99 */
 -+    SetColor(1);
 -     aclip = cliparc((double) (centx + xoffset + radoff),
 - 	    (double) (centy + yoffset + irad), irad,
 - 	    (double) (M_PI * 1.5 + 2 * iangle),
 -@@ -1441,7 +1452,10 @@
 - 	adddeglabel(graph, ndeg, xlab, ylab,
 - 	    gr_xcenter, gr_ycenter, gr_xcenter, gr_ycenter);
 -  */
 --	SetColor(19);
 -+	/* SetColor(19); */
 -+	/* draw everything in black
 -+	   Guenther Roehrich 22-Jan-99 */
 -+	SetColor(1);
 - 	}
 -     }
 -     aclip = cliparc((double) (centx + xoffset + radoff),
 -@@ -1455,7 +1469,10 @@
 - 	SetColor(1);
 - 	adddeglabel(graph, ndeg, xlab, ylab,
 - 	    gr_xcenter, gr_ycenter, gr_xcenter, gr_ycenter);
 --	SetColor(19);
 -+	/* SetColor(19); */
 -+	/* draw everything in black
 -+	   Guenther Roehrich 22-Jan-99 */
 -+	SetColor(1);
 -     }
 -     
 -     /* Now toss the labels on... */
 +@@ -225,7 +228,7 @@ lingrid(graph, lo, hi, delta, type, axis
 +     int max;
 +     static double dd[2];
 +     int mult = 1;
 +-    char buf[16], *s;
 ++    char buf[LABEL_CHARS], *s;
 +     int slim, digits;
 + 
 +     if (axis == y_axis && graph->grid.ysized) {
 +@@ -473,11 +476,11 @@ lingrid(graph, lo, hi, delta, type, axis
 +     return (dd);
 + }
 + 
 +-static
 ++static void
 + drawlingrid(graph, units, spacing, nsp, dst, lmt, hmt, onedec, mult, mag,
 +     digits, axis)
 +     GRAPH *graph;
 +-    char units[16];
 ++    char *units;
 +     bool onedec;
 +     int nsp, spacing, mult;
 +     double hmt, lmt, dst;
 +@@ -488,7 +491,7 @@ drawlingrid(graph, units, spacing, nsp, 
 + 
 +     int i, j;
 +     double m, step;
 +-    char buf[16];
 ++    char buf[LABEL_CHARS];
 + 
 +     /* i counts how many pixels we have drawn, and j counts which unit
 +      * we are at.
 +@@ -567,7 +570,7 @@ loggrid(graph, lo, hi, type, axis)
 +     double k;
 +     double decs;
 +     double mag, gain;
 +-    char buf[32], *s;
 ++    char buf[LABEL_CHARS], *s;
 + 
 +     if (axis == x_axis && graph->grid.xsized) {
 +       lmt = graph->grid.xaxis.log.lmt;
 +@@ -661,7 +664,7 @@ loggrid(graph, lo, hi, type, axis)
 + 
 + }
 + 
 +-static
 ++static void
 + drawloggrid(graph, units, hmt, lmt, decsp, subs, pp, axis)
 +     GRAPH *graph;
 +     char *units;
 +@@ -671,7 +674,7 @@ drawloggrid(graph, units, hmt, lmt, decs
 + {
 +     int i, j, k, l, m;
 +     double t;
 +-    char buf[16];
 ++    char buf[LABEL_CHARS];
 + 
 +     /* Now plot every pp'th decade line, with subs lines between them. */
 +     if (subs > 1)
 
 
 
       Comparte video en la ventana de tus mensajes (y tambin tus fotos de Flickr). Usa el nuevo Yahoo! Messenger versin Beta.
 http://e1.beta.messenger.yahoo.com/
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sat Dec 15 19:34:21 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117997: commit references a PR
Date: Sat, 15 Dec 2007 19:42:40 +0000 (UTC)

 pav         2007-12-15 19:42:35 UTC
 
   FreeBSD ports repository
 
   Modified files:
     cad/spice            distinfo 
     cad/spice/files      patch-src_include_os_bsd_h 
                          patch-src_lib_fte_grid_c 
   Added files:
     cad/spice/files      patch-src_lib_cp_cshpar_c 
   Log:
   - Distfile rerolled, changes limited to including a copy of BSDL
   - Sync patches with NetBSD. No functional changes
   
   PR:             ports/117997
   Submitted by:   Pedro F. Giffuni <giffunip@tutopia.com>
   
   Revision  Changes    Path
   1.8       +3 -3      ports/cad/spice/distinfo
   1.4       +16 -15    ports/cad/spice/files/patch-src_include_os_bsd_h
   1.1       +10 -0     ports/cad/spice/files/patch-src_lib_cp_cshpar_c (new)
   1.3       +74 -69    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:
