ports/114795: games/glaxium fix segfaults

[Max Brazhnikov]

>Number:         114795
>Category:       ports
>Synopsis:       games/glaxium fix segfaults
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 21 19:20:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Jul  7 13:05:41 MSD 2007     root at luna.dio.ru:/usr/obj/usr/src/sys/LUNA  i386
>Description:
glaxium segfaults at start up. It looks like the game has been unplayable since the beginning.
>How-To-Repeat:
> glaxium
Depth buffer depth : 24
Stencil buffer will be used for shadows.
Found textures in /usr/local/share/glaxium
Number of texture units               : 2
Number of general combiners available : 2
Nvidia NV1x video card found (geforce 256/2)
Glaxium will use anisotropy texture : 2.000000
Opened audio at 22050 Hz 16 bit stereo, 1024 bytes audio buffer
Number of mixing channels : 22
YES !!! I found a joystick...
Segmentation fault
>Fix:
patch is attached 

Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/games/glaxium/Makefile /home/makc/porting/ports/games/glaxium/Makefile
--- /usr/ports/games/glaxium/Makefile	Tue Jun 19 14:23:22 2007
+++ /home/makc/porting/ports/games/glaxium/Makefile	Sat Jul 21 18:07:54 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	glaxium
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -26,6 +26,8 @@
 ALL_TARGET=	${PORTNAME}
 
 MAN6=		glaxium.6
+
+USE_DOS2UNIX=variables.cpp scene.cpp
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g; \
diff -ruN --exclude=CVS /usr/ports/games/glaxium/files/patch-scene.cpp /home/makc/porting/ports/games/glaxium/files/patch-scene.cpp
--- /usr/ports/games/glaxium/files/patch-scene.cpp	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/games/glaxium/files/patch-scene.cpp	Sat Jul 21 18:09:24 2007
@@ -0,0 +1,11 @@
+--- ./scene.cpp.orig	Thu Oct 10 16:57:58 2002
++++ ./scene.cpp	Sat Jul 21 17:54:40 2007
+@@ -2361,7 +2361,7 @@
+ 	oldTimer = newTimer;
+ 	globalList->move()	;
+ #ifndef PI
+-#define PI=3.151592653589793
++#define PI=3.141592653589793
+ #endif
+ 	benchFrames++;
+ 
diff -ruN --exclude=CVS /usr/ports/games/glaxium/files/patch-variables.cpp /home/makc/porting/ports/games/glaxium/files/patch-variables.cpp
--- /usr/ports/games/glaxium/files/patch-variables.cpp	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/games/glaxium/files/patch-variables.cpp	Sat Jul 21 18:09:15 2007
@@ -0,0 +1,10 @@
+--- ./variables.cpp.orig	Fri Oct 18 01:53:00 2002
++++ ./variables.cpp	Sat Jul 21 17:51:10 2007
+@@ -453,6 +453,7 @@
+ 	static char strReturn[1024];
+ 	strcpy(strReturn, getenv("HOME"));
+ 	strcat(strReturn, "/.glaxiumrc");
++	return strReturn;
+ #endif
+ }
+ 


>Release-Note:
>Audit-Trail:
>Unformatted: