ports/117997: Cleanups to the cad/spice port

[Pedro F. Giffuni]

>Number:         117997
>Category:       ports
>Synopsis:       Cleanups to the cad/spice port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 12 08:50:00 UTC 2007
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: