ports/77809: [PATCH] pipenightdreams un-BROKEN for new GCC
Eric Anholt
anholt at FreeBSD.org
Sun Feb 20 22:20:15 UTC 2005
>Number: 77809
>Category: ports
>Synopsis: [PATCH] pipenightdreams un-BROKEN for new GCC
>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: Sun Feb 20 22:20:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Eric Anholt
>Release: FreeBSD 5.3-STABLE amd64
>Organization:
>Environment:
System: FreeBSD leguin.anholt.net 5.3-STABLE FreeBSD 5.3-STABLE #5: Fri Feb 4 17:09:17 PST 2005 anholt at leguin.anholt.net:/usr/src/stable/sys/amd64/compile/MYKERNEL amd64
>Description:
Removes BROKEN on -current and fixes the build. Tested briefly.
>How-To-Repeat:
>Fix:
--- pipenightdreams-c++.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/pipenightdreams/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 16 Mar 2004 04:23:45 -0000 1.12
+++ Makefile 1 Jan 2005 22:40:05 -0000
@@ -25,10 +25,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 500113
-BROKEN= "Does not compile (bad C++ code)"
-.endif
-
post-patch:
${REINPLACE_CMD} 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g; \
s|SDL_LIBSS|SDL_LIBS|g; s|datadir/games|datadir|;' \
Index: files/patch-eventmanager.cpp
===================================================================
RCS file: files/patch-eventmanager.cpp
diff -N files/patch-eventmanager.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-eventmanager.cpp 1 Jan 2005 22:53:05 -0000
@@ -0,0 +1,11 @@
+--- src/eventmanager.cpp.orig Sat Jan 1 14:52:51 2005
++++ src/eventmanager.cpp Sat Jan 1 14:52:55 2005
+@@ -40,7 +40,7 @@
+ lista_streams->remove(lista_streams->indexOf(s));
+ }
+
+-void EventManager::pumpEvents(bool wait=false){
++void EventManager::pumpEvents(bool wait){
+ SDL_Event event;
+ Index * stream;
+ bool got=false;
Index: files/patch-graphic.cpp
===================================================================
RCS file: files/patch-graphic.cpp
diff -N files/patch-graphic.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-graphic.cpp 1 Jan 2005 22:52:37 -0000
@@ -0,0 +1,25 @@
+--- src/graphic.cpp.orig Sat Jan 1 14:51:18 2005
++++ src/graphic.cpp Sat Jan 1 14:52:31 2005
+@@ -44,11 +44,11 @@
+ if (pixels) free(pixels);
+ }
+
+-void Graphic::setAlpha(char value=OPAQUE){
++void Graphic::setAlpha(char value){
+ SDL_SetAlpha(surface, SDL_SRCALPHA, value);
+ }
+
+-void Graphic::enableClipping(bool flag=true){
++void Graphic::enableClipping(bool flag){
+
+ if (flag){
+ SDL_Rect rect;
+@@ -68,7 +68,7 @@
+ clip_height=height;
+ }
+
+-void Graphic::flip(Axis a=HAxis){
++void Graphic::flip(Axis a){
+ if (surface){
+ if (SDL_MUSTLOCK(surface))
+ if (SDL_LockSurface(surface)<0) return;
Index: files/patch-hash.cpp
===================================================================
RCS file: files/patch-hash.cpp
diff -N files/patch-hash.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-hash.cpp 1 Jan 2005 22:51:11 -0000
@@ -0,0 +1,35 @@
+--- src/hash.cpp.orig Sat Jan 1 14:48:35 2005
++++ src/hash.cpp Sat Jan 1 14:50:49 2005
+@@ -55,10 +55,12 @@
+ return(sum % nbuckets);
+ }
+
+-Hash::Hash(int bs=256){
++typedef List *ListPtr;
++
++Hash::Hash(int bs){
+ int i;
+ nbuckets=bs;
+- lbuckets=new (List *)[nbuckets];
++ lbuckets=new ListPtr[nbuckets];
+
+ for (i=0;i<nbuckets;i++)
+ lbuckets[i]=new List();
+@@ -99,7 +101,7 @@
+ return NotAdded;
+ }
+
+-Hash::Result Hash::remove(Str * str, bool del=false){
++Hash::Result Hash::remove(Str * str, bool del){
+ if (str){
+ Index * i;
+ List * list=lbuckets[function(str)];
+@@ -135,7 +137,7 @@
+ return NULL;
+ }
+
+-void Hash::empty(bool del=true){
++void Hash::empty(bool del){
+ int i;
+ List * list;
+ for (i=0;i<nbuckets;i++){
Index: files/patch-image.cpp
===================================================================
RCS file: files/patch-image.cpp
diff -N files/patch-image.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-image.cpp 1 Jan 2005 22:47:41 -0000
@@ -0,0 +1,11 @@
+--- src/image.cpp.orig Sat Jan 1 14:47:18 2005
++++ src/image.cpp Sat Jan 1 14:47:24 2005
+@@ -19,7 +19,7 @@
+ #include "SDL_image.h"
+ #include <stdio.h>
+
+-Image::Image(Str * filename=NULL):Graphic(){
++Image::Image(Str * filename):Graphic(){
+ if (filename) load(filename);
+ }
+
Index: files/patch-list.cpp
===================================================================
RCS file: files/patch-list.cpp
diff -N files/patch-list.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-list.cpp 1 Jan 2005 22:47:11 -0000
@@ -0,0 +1,20 @@
+--- src/list.cpp.orig Sat Jan 1 14:45:36 2005
++++ src/list.cpp Sat Jan 1 14:47:10 2005
+@@ -125,7 +125,7 @@
+ return (insert(indexOf(i), obj));
+ }
+
+-List::Result List::remove(Index * index, bool del=false){
++List::Result List::remove(Index * index, bool del){
+ if (isEmpty()) return EmptyList;
+ if (!index) return NullIndex;
+
+@@ -155,7 +155,7 @@
+ return Removed;
+ }
+
+-void List::empty(bool del=true){
++void List::empty(bool del){
+ while (!isEmpty())
+ remove(getFirst(), del);
+ }
Index: files/patch-pipe.cpp
===================================================================
RCS file: files/patch-pipe.cpp
diff -N files/patch-pipe.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-pipe.cpp 1 Jan 2005 22:45:29 -0000
@@ -0,0 +1,16 @@
+--- src/pipe.cpp.orig Sat Jan 1 14:45:09 2005
++++ src/pipe.cpp Sat Jan 1 14:45:19 2005
+@@ -43,11 +43,11 @@
+ return !(full_level>0) && !fixed;
+ }
+
+-void Pipe::setFixed(bool flag=true){
++void Pipe::setFixed(bool flag){
+ fixed=flag;
+ }
+
+-void Pipe::setBonus(Bonus bonus=NormalBonus){
++void Pipe::setBonus(Bonus bonus){
+ this->bonus=bonus;
+ }
+
Index: files/patch-player.h
===================================================================
RCS file: files/patch-player.h
diff -N files/patch-player.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-player.h 1 Jan 2005 22:56:59 -0000
@@ -0,0 +1,15 @@
+--- src/pointer.h.orig Sat Jan 1 14:55:27 2005
++++ src/pointer.h Sat Jan 1 14:56:09 2005
+@@ -45,9 +45,9 @@
+
+ inline void setRow(int row);
+ inline void setColumn(int column);
+- inline void setRowColumn(int row, int column);
+- inline void setMoved(bool flag);
+- inline bool moved();
++ void setRowColumn(int row, int column);
++ void setMoved(bool flag);
++ bool moved();
+
+ Str * image_name;
+ Image * ima;
Index: files/patch-pointer.cpp
===================================================================
RCS file: files/patch-pointer.cpp
diff -N files/patch-pointer.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-pointer.cpp 1 Jan 2005 22:44:57 -0000
@@ -0,0 +1,11 @@
+--- src/pointer.cpp.orig Sat Jan 1 14:44:34 2005
++++ src/pointer.cpp Sat Jan 1 14:44:44 2005
+@@ -17,7 +17,7 @@
+
+ #include "pointer.h"
+
+-Pointer::Pointer(int row=0, int column=0){
++Pointer::Pointer(int row, int column){
+ this->row=row;
+ this->column=column;
+ this->moved_flag=true;
Index: files/patch-score.cpp
===================================================================
RCS file: files/patch-score.cpp
diff -N files/patch-score.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-score.cpp 1 Jan 2005 22:44:21 -0000
@@ -0,0 +1,11 @@
+--- src/score.cpp.orig Sat Jan 1 14:44:00 2005
++++ src/score.cpp Sat Jan 1 14:44:07 2005
+@@ -18,7 +18,7 @@
+ #include "score.h"
+ #include <math.h>
+
+-Score::Score(int value=0){
++Score::Score(int value){
+ this->value=value;
+ delta=0;
+ changed=true;
Index: files/patch-str.cpp
===================================================================
RCS file: files/patch-str.cpp
diff -N files/patch-str.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-str.cpp 1 Jan 2005 22:43:41 -0000
@@ -0,0 +1,29 @@
+--- src/str.cpp.orig Sat Jan 1 14:43:20 2005
++++ src/str.cpp Sat Jan 1 14:43:25 2005
+@@ -11,7 +11,7 @@
+
+ const char Str::nul = '\0';
+
+-Str::Str(const char * string=NULL){
++Str::Str(const char * string){
+ s=NULL;
+ set(string);
+ }
+@@ -25,7 +25,7 @@
+ if (s) delete[] s;
+ }
+
+-void Str::set(const char * string=NULL){
++void Str::set(const char * string){
+ if (s) delete[] s;
+ if (string){
+ s=new char[strlen(string)+1];
+@@ -71,7 +71,7 @@
+ return (strlen(s));
+ }
+
+-bool Str::isEqual(Str * str, bool case_sensitive = true){
++bool Str::isEqual(Str * str, bool case_sensitive){
+ if (case_sensitive){
+ return (!strcmp(s, str->s));
+ }
--- pipenightdreams-c++.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list