>Number:         23646
>Category:       pkg
>Synopsis:       povray fails to build on NetBSD/alpha 1.6.X
>Confidential:   yes
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Dec 04 05:19:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Eric Schnoebelen
>Release:        NetBSD 1.6.1_STABLE
>Organization:
Central Iowa (Model) Railroad, Plano, TX US
>Environment:
System: NetBSD milo.cirr.com 1.6.1_STABLE NetBSD 1.6.1_STABLE (MILO) #1: Sun Jun 1 20:44:15 CDT 2003 eric@milo.cirr.com:/rmt/.amd/egsner/root/work/eric/NetBSD-1.6/src/sys/arch/alpha/compile/MILO alpha
Architecture: alpha
Machine: alpha
>Description:
	povray fails to build with a number of problems on NetBSD/alpha.
	The first problem is attempting to use -malign-double on gcc;
	The second problem is attempting to typedef a long as int32;
	The third problem is a mis-match of prototypes because of the
	above.
>How-To-Repeat:
	rlogin cs20;
	cd /usr/pkgsrc/graphics/povray;
	make;
>Fix:
? README.html
? patches/patch-ae
? patches/patch-af
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/povray/distinfo,v
retrieving revision 1.6
diff -u -b -w -b -u -w -r1.6 distinfo
--- distinfo	2003/09/10 22:35:54	1.6
+++ distinfo	2003/12/04 05:16:32
@@ -3,6 +3,8 @@
 SHA1 (povray-3.50c/povuni_s.tgz) = 95b6687cc9e2a23b412be17da731cc7b84e5f7ab
 Size (povray-3.50c/povuni_s.tgz) = 6602380 bytes
 SHA1 (patch-aa) = a7ed2a8effbbc6ad424c3af3c63f9b0eb7e5caf4
-SHA1 (patch-ab) = 75cd81585cf333f7a18c89a39a90f0e3f58bf99e
+SHA1 (patch-ab) = c116b5dde3ab9cd82bdc997309ecf244ad3c6108
 SHA1 (patch-ac) = 34be7bbf31d2205b55082ad7d4e6b981c61cd7f0
 SHA1 (patch-ad) = df647e2e1ed9a25e84f74ae1fc2d49b0cf4c873f
+SHA1 (patch-ae) = 05d946ad9facaeb6b5c176702eced4dd6fc94d8d
+SHA1 (patch-af) = dc24ee30ef79f06a9920e20ebab0d8bfbe3d9c1c
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/povray/patches/patch-ab,v
retrieving revision 1.4
diff -u -b -w -b -u -w -r1.4 patch-ab
--- patches/patch-ab	2003/08/31 23:04:15	1.4
+++ patches/patch-ab	2003/12/04 05:16:32
@@ -18,8 +18,8 @@
 -CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
 -LDFLAGS = @X_CFLAGS@
 +.ifdef GCC
-+CFLAGS = -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -Wno-multichar
-+CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -Wno-multichar
++CFLAGS = @CFLAGS@ -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
++CXXFLAGS = @CXXFLAGS@ $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 +.else
 +CFLAGS = @CFLAGS@
 +CXXFLAGS = @CXXFLAGS@
--- /dev/null	Wed Dec  3 23:16:58 2003
+++ patches/patch-ae	Wed Dec  3 12:11:04 2003
@@ -0,0 +1,37 @@
+$NetBSD$
+
+--- src/frame.h.orig	Mon Jan  6 19:08:30 2003
++++ src/frame.h
+@@ -44,12 +44,12 @@
+ class pov_istream_class;
+ class pov_ostream_class;
+ 
+-typedef unsigned long u_int32 ;
++typedef unsigned int u_int32 ;
+ typedef unsigned short u_int16 ;
+ typedef unsigned char u_int8 ;
+ typedef unsigned char byte ;
+ 
+-typedef signed long int32 ;
++typedef signed int int32 ;
+ typedef signed short int16 ;
+ typedef signed char int8 ;
+ 
+@@ -256,7 +256,7 @@ typedef signed char int8 ;
+ #endif
+ 
+ #ifndef UCS4
+-#define UCS4 unsigned long
++#define UCS4 unsigned int
+ #endif
+ 
+ #ifndef M_PI
+@@ -972,7 +972,7 @@ struct Counter_Struct
+ 
+ /* 32bit counter. */
+ 
+-typedef unsigned long COUNTER;
++typedef unsigned int COUNTER;
+ 
+ #define DBL_Counter(x)     ( (DBL)(x) )
+ #define Long_To_Counter(i,x) { (x) = i; }
--- /dev/null	Wed Dec  3 23:17:26 2003
+++ patches/patch-af	Wed Dec  3 12:30:14 2003
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/optin.cpp.orig	Mon Jan  6 19:08:28 2003
++++ src/optin.cpp
+@@ -364,7 +364,7 @@ int process_switch(struct Cmd_Parser_Tab
+ 
+ static bool matches(char *v1, char *v2);
+ 
+-POV_ISTREAM *Opts_Locate_File(char *filename, unsigned long stype, char *buffer, int err_flag, POVMSObjectPtr obj);
++POV_ISTREAM *Opts_Locate_File(char *filename, u_int32 stype, char *buffer, int err_flag, POVMSObjectPtr obj);
+ 
+ 
+ /*****************************************************************************
>Release-Note:
>Audit-Trail:
>Unformatted: