Date: Sun, 29 Jul 2001 19:15:28 -0700 (PDT) From: John Merryweather Cooper <jmcoopr@webmail.bmi.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/29314: Fix battleball-2.1 for bento Message-ID: <200107300215.f6U2FSk17685@johncoop.MSHOME>
next in thread | raw e-mail | index | archive | help
>Number: 29314
>Category: ports
>Synopsis: Fix battleball-2.1 for bento
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 29 19:20:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: John Merryweather Cooper
>Release: FreeBSD 4.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD johncoop.MSHOME 4.3-STABLE FreeBSD 4.3-STABLE #36: Sun Jul 29 11:47:43 PDT 2001 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386
>Description:
Yet Another (tm) port broken on bento because of a want of -pthread
flags on the compile/link.
>How-To-Repeat:
N/A
>Fix:
diff -ruN battleball/files/patch-Makefile battleball.new/files/patch-Makefile
--- battleball/files/patch-Makefile Wed Dec 31 16:00:00 1969
+++ battleball.new/files/patch-Makefile Sun Jul 29 19:08:53 2001
@@ -0,0 +1,39 @@
+--- Makefile Thu Sep 2 19:25:18 1999
++++ Makefile.new Sun Jul 29 19:08:13 2001
+@@ -1,17 +1,18 @@
+-CXX = g++
++CXX ?= c++
+
+ # If you don't have OpenGL or Mesa, you can still compile BattleBall;
+ # just define the symbol NO_OPENGL when compiling, and don't link with
+ # $(GLLIBS) when linking
+-CXXFLAGS = -O2 -funroll-loops
++CXXFLAGS ?= -O -pipe
+ #CXXFLAGS = -O2 -funroll-loops -DNO_OPENGL
+
+ INCS = -Ibsp -Ilib3d
+-XLIBS = -L/usr/X11R6/lib -lX11
++X11BASE ?=/usr/X11R6
++XLIBS = -L$(X11BASE)/lib -lX11
+ LIBS = -lm $(XLIBS)
+
+-GLINCS = -I/usr/local/X11/include
+-GLLIBS = -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL
++GLINCS = -I$(X11BASE)/include
++GLLIBS = -lXi -lXmu -lXext -L$(X11BASE)/lib -lGL
+ #GLLIBS =
+
+ BSPOBJS = bsp/brep.o bsp/bsp.o bsp/polygon.o
+@@ -25,10 +26,10 @@
+
+
+ .C.o:
+- $(CXX) -c $(CXXFLAGS) $(INCS) $(GLINCS) -o $@ $<
++ $(CXX) -c $(CXXFLAGS) $(INCS) $(GLINCS) -pthread -o $@ $<
+
+ battleball: $(OBJS)
+- $(CXX) */*.o -o battleball $(LIBS) $(GLLIBS)
++ $(CXX) */*.o -o battleball $(LIBS) $(GLLIBS) -pthread
+
+ all: battleball
+
diff -ruN battleball/files/patch-ab battleball.new/files/patch-ab
--- battleball/files/patch-ab Sat Aug 19 13:15:21 2000
+++ battleball.new/files/patch-ab Wed Dec 31 16:00:00 1969
@@ -1,22 +0,0 @@
---- bb/main.C Thu Sep 2 22:25:19 1999
-+++ bb/main.C.new Sun Apr 16 17:23:35 2000
-@@ -11,6 +11,9 @@
- #include <stdio.h> // to get sprintf()
- #include <string.h> // to get strncpy()
- #include <time.h> // to get time(time_t *)
-+#if defined(__FreeBSD__) && !defined(__alpha__)
-+#include <floatingpoint.h>
-+#endif
- #include "bb.h"
- #include "bbgfxtarget.h"
- #include "player.h"
-@@ -803,6 +806,9 @@
- /*=========================================================================*/
- // A long and complicated main() function!
- main (int argc, char *argv[]) {
-+#if defined(__FreeBSD__) && !defined(__alpha__)
-+ fpsetmask(0);
-+#endif
- bb= new battleBall(argc,argv);
- bb->Play();
- delete bb;
diff -ruN battleball/files/patch-af battleball.new/files/patch-af
--- battleball/files/patch-af Sun Apr 16 15:03:02 2000
+++ battleball.new/files/patch-af Wed Dec 31 16:00:00 1969
@@ -1,26 +0,0 @@
---- Makefile Thu Sep 2 22:25:18 1999
-+++ Makefile.new Sun Apr 16 17:28:19 2000
-@@ -1,17 +1,18 @@
--CXX = g++
-+CXX ?= c++
-
- # If you don't have OpenGL or Mesa, you can still compile BattleBall;
- # just define the symbol NO_OPENGL when compiling, and don't link with
- # $(GLLIBS) when linking
--CXXFLAGS = -O2 -funroll-loops
-+CXXFLAGS ?= -O -pipe
- #CXXFLAGS = -O2 -funroll-loops -DNO_OPENGL
-
- INCS = -Ibsp -Ilib3d
--XLIBS = -L/usr/X11R6/lib -lX11
-+X11BASE ?=/usr/X11R6
-+XLIBS = -L$(X11BASE)/lib -lX11
- LIBS = -lm $(XLIBS)
-
--GLINCS = -I/usr/local/X11/include
--GLLIBS = -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL
-+GLINCS = -I$(X11BASE)/include
-+GLLIBS = -lXi -lXmu -lXext -L$(X11BASE)/lib -lGL
- #GLLIBS =
-
- BSPOBJS = bsp/brep.o bsp/bsp.o bsp/polygon.o
diff -ruN battleball/files/patch-bb::main.c battleball.new/files/patch-bb::main.c
--- battleball/files/patch-bb::main.c Wed Dec 31 16:00:00 1969
+++ battleball.new/files/patch-bb::main.c Sun Jul 29 19:04:07 2001
@@ -0,0 +1,22 @@
+--- bb/main.C Thu Sep 2 22:25:19 1999
++++ bb/main.C.new Sun Apr 16 17:23:35 2000
+@@ -11,6 +11,9 @@
+ #include <stdio.h> // to get sprintf()
+ #include <string.h> // to get strncpy()
+ #include <time.h> // to get time(time_t *)
++#if defined(__FreeBSD__) && !defined(__alpha__)
++#include <floatingpoint.h>
++#endif
+ #include "bb.h"
+ #include "bbgfxtarget.h"
+ #include "player.h"
+@@ -803,6 +806,9 @@
+ /*=========================================================================*/
+ // A long and complicated main() function!
+ main (int argc, char *argv[]) {
++#if defined(__FreeBSD__) && !defined(__alpha__)
++ fpsetmask(0);
++#endif
+ bb= new battleBall(argc,argv);
+ bb->Play();
+ delete bb;
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107300215.f6U2FSk17685>