From nobody@FreeBSD.org  Sun Dec 31 07:55:49 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3F7F416A40F
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 31 Dec 2006 07:55:49 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 3099F13C459
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 31 Dec 2006 07:55:49 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id kBV7tmnX055644
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 31 Dec 2006 07:55:48 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id kBV7tml4055642;
	Sun, 31 Dec 2006 07:55:48 GMT
	(envelope-from nobody)
Message-Id: <200612310755.kBV7tml4055642@www.freebsd.org>
Date: Sun, 31 Dec 2006 07:55:48 GMT
From: Jeremy Karlson<karlj000@unbc.ca>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update games/magiccube4d: Update for GCC4
X-Send-Pr-Version: www-3.0

>Number:         107369
>Category:       ports
>Synopsis:       Update games/magiccube4d: Update for GCC4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 31 08:00:31 GMT 2006
>Closed-Date:    Mon Jan 01 00:06:13 GMT 2007
>Last-Modified:  Mon Jan  1 00:10:19 GMT 2007
>Originator:     Jeremy Karlson
>Release:        FreeBSD 5.5-STABLE
>Organization:
>Environment:
FreeBSD rubik 5.5-STABLE FreeBSD 5.5-STABLE #8: Fri Aug 25 20:48:17 PDT 2006 root@rubik:/usr/obj/usr/src/sys/RUBIK  i386

>Description:
I received a message stating that this port will not build using GCC4.  This patch corrects this.
>How-To-Repeat:

>Fix:
Apply the following port diff.

Patch attached with submission follows:

diff -r -u -N magiccube4d.orig/files/patch-EventHandler.h magiccube4d/files/patch-EventHandler.h
--- magiccube4d.orig/files/patch-EventHandler.h	Wed Dec 31 16:00:00 1969
+++ magiccube4d/files/patch-EventHandler.h	Sat Dec 30 23:42:57 2006
@@ -0,0 +1,11 @@
+--- EventHandler.h.orig	Sat Dec 30 23:41:44 2006
++++ EventHandler.h	Sat Dec 30 23:42:05 2006
+@@ -165,7 +165,7 @@
+ 
+     int  number_of_reference_stickers_needed;
+     int  (*reference_stickers_needed)[4];
+-    void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg = NULL);
++    void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg);
+     void* cur_ui_data;
+ 
+     bool quick_mode;
diff -r -u -N magiccube4d.orig/files/patch-Machine.h magiccube4d/files/patch-Machine.h
--- magiccube4d.orig/files/patch-Machine.h	Wed Dec 31 16:00:00 1969
+++ magiccube4d/files/patch-Machine.h	Sat Dec 30 23:44:32 2006
@@ -0,0 +1,11 @@
+--- Machine.h.orig	Sat Dec 30 23:43:10 2006
++++ Machine.h	Sat Dec 30 23:43:24 2006
+@@ -31,7 +31,7 @@
+ {
+ public:
+     typedef void (EventHandler::*event_handler)(EventHandler::Event*,
+-                                                void *arg = 0);
++                                                void *arg);
+     virtual ~Machine() {};
+ 
+     static Machine* createMachine(EventHandler*, int& argc, char *argv[],
diff -r -u -N magiccube4d.orig/files/patch-MagicCube.h magiccube4d/files/patch-MagicCube.h
--- magiccube4d.orig/files/patch-MagicCube.h	Wed Dec 31 16:00:00 1969
+++ magiccube4d/files/patch-MagicCube.h	Wed Oct 25 19:05:13 2000
@@ -0,0 +1,19 @@
+*** MagicCube.h.BACKUP	Mon Sep 25 19:46:07 2000
+--- MagicCube.h	Mon Sep 25 19:46:39 2000
+***************
+*** 22,28 ****
+  #include <assert.h>
+  #include <math.h>
+  #include <string.h>
+! #include <malloc.h>
+  #include "Vec.h"
+  
+  // Version number of this program.  Must also be updated in
+--- 22,28 ----
+  #include <assert.h>
+  #include <math.h>
+  #include <string.h>
+! #include <stdlib.h>
+  #include "Vec.h"
+  
+  // Version number of this program.  Must also be updated in
diff -r -u -N magiccube4d.orig/files/patch-aa magiccube4d/files/patch-aa
--- magiccube4d.orig/files/patch-aa	Sat Dec 16 14:56:51 2006
+++ magiccube4d/files/patch-aa	Wed Dec 31 16:00:00 1969
@@ -1,19 +0,0 @@
-*** MagicCube.h.BACKUP	Mon Sep 25 19:46:07 2000
---- MagicCube.h	Mon Sep 25 19:46:39 2000
-***************
-*** 22,28 ****
-  #include <assert.h>
-  #include <math.h>
-  #include <string.h>
-! #include <malloc.h>
-  #include "Vec.h"
-  
-  // Version number of this program.  Must also be updated in
---- 22,28 ----
-  #include <assert.h>
-  #include <math.h>
-  #include <string.h>
-! #include <stdlib.h>
-  #include "Vec.h"
-  
-  // Version number of this program.  Must also be updated in
diff -r -u -N magiccube4d.orig/files/patch-ac magiccube4d/files/patch-ac
--- magiccube4d.orig/files/patch-ac	Sat Dec 16 14:56:51 2006
+++ magiccube4d/files/patch-ac	Wed Dec 31 16:00:00 1969
@@ -1,11 +0,0 @@
---- configure.orig	Sat Sep 28 23:44:47 2002
-+++ configure	Sat Sep 28 23:44:38 2002
-@@ -686,7 +686,7 @@
- 
- 
- if test "$GXX" = "yes" ; then
--   WFLAGS="$WFLAGS -pedantic -Wall -W -Wunused -Werror"
-+   WFLAGS="$WFLAGS -pedantic -Wall -W -Wunused"
- fi
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:693: checking how to run the C preprocessor" >&5
diff -r -u -N magiccube4d.orig/files/patch-configure magiccube4d/files/patch-configure
--- magiccube4d.orig/files/patch-configure	Wed Dec 31 16:00:00 1969
+++ magiccube4d/files/patch-configure	Sat Sep 28 23:37:58 2002
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Sep 28 23:44:47 2002
++++ configure	Sat Sep 28 23:44:38 2002
+@@ -686,7 +686,7 @@
+ 
+ 
+ if test "$GXX" = "yes" ; then
+-   WFLAGS="$WFLAGS -pedantic -Wall -W -Wunused -Werror"
++   WFLAGS="$WFLAGS -pedantic -Wall -W -Wunused"
+ fi
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+ echo "configure:693: checking how to run the C preprocessor" >&5

>Release-Note:
>Audit-Trail:
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Sun Dec 31 08:00:39 UTC 2006 
Class-Changed-Why:  
Fix category (submitter is maintainer) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107369 
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sun Dec 31 09:05:18 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107369 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jan 1 00:06:12 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107369: commit references a PR
Date: Mon,  1 Jan 2007 00:00:48 +0000 (UTC)

 miwi        2007-01-01 00:00:25 UTC
 
   FreeBSD ports repository
 
   Added files:
     games/magiccube4d/files patch-EventHandler.h patch-Machine.h 
                             patch-MagicCube.h patch-configure 
   Removed files:
     games/magiccube4d/files patch-aa patch-ac 
   Log:
   - Fix build with gcc 4.X
   
   PR:             ports/107369
   Submitted by:   Jeremy Karlson<karlj000@unbc.ca> (maintainer)
   
   Revision  Changes    Path
   1.1       +11 -0     ports/games/magiccube4d/files/patch-EventHandler.h (new)
   1.1       +11 -0     ports/games/magiccube4d/files/patch-Machine.h (new)
   1.1       +19 -0     ports/games/magiccube4d/files/patch-MagicCube.h (new)
   1.2       +0 -19     ports/games/magiccube4d/files/patch-aa (dead)
   1.2       +0 -11     ports/games/magiccube4d/files/patch-ac (dead)
   1.1       +11 -0     ports/games/magiccube4d/files/patch-configure (new)
 _______________________________________________
 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:
