diff options
Diffstat (limited to 'games/flightgear-data/files')
| -rw-r--r-- | games/flightgear-data/files/patch-aa | 12 | ||||
| -rw-r--r-- | games/flightgear-data/files/patch-ab | 32 | ||||
| -rw-r--r-- | games/flightgear-data/files/patch-ac | 79 | ||||
| -rw-r--r-- | games/flightgear-data/files/patch-ad | 27 | ||||
| -rw-r--r-- | games/flightgear-data/files/patch-ae | 11 | ||||
| -rw-r--r-- | games/flightgear-data/files/patch-af | 11 | ||||
| -rw-r--r-- | games/flightgear-data/files/patch-ag | 94 |
7 files changed, 0 insertions, 266 deletions
diff --git a/games/flightgear-data/files/patch-aa b/games/flightgear-data/files/patch-aa deleted file mode 100644 index 714120858204..000000000000 --- a/games/flightgear-data/files/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ ---- Simulator/Main/splash.cxx.orig Wed May 12 19:16:17 1999 -+++ Simulator/Main/splash.cxx Sat Jun 26 22:31:54 1999 -@@ -123,7 +123,8 @@ - xglMatrixMode(GL_PROJECTION); - xglPushMatrix(); - xglLoadIdentity(); -- gluOrtho2D(0, current_view.get_winWidth(), 0, current_view.get_winHeight()); -+ if (current_view.get_winWidth() && current_view.get_winHeight()) -+ gluOrtho2D(0, current_view.get_winWidth(), 0, current_view.get_winHeight()); - xglMatrixMode(GL_MODELVIEW); - xglPushMatrix(); - xglLoadIdentity(); diff --git a/games/flightgear-data/files/patch-ab b/games/flightgear-data/files/patch-ab deleted file mode 100644 index 81840b3e61a7..000000000000 --- a/games/flightgear-data/files/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ ---- Tools/Construct/Parallel/client.cxx.orig Fri May 21 13:18:06 1999 -+++ Tools/Construct/Parallel/client.cxx Sat Jun 26 22:32:01 1999 -@@ -20,6 +20,11 @@ - - #include <Bucket/newbucket.hxx> - -+/* the next lines are to define BSD */ -+/* see http://www.freebsd.org/handbook/porting.html for why we do this */ -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - - #define MAXBUF 1024 - #define BUSY_WAIT_TIME 30 -@@ -45,6 +50,9 @@ - - // check if the host system is free of interactive users - int system_free() { -+ -+#ifndef BSD -+ - struct utmp *uptr; - - setutent(); -@@ -61,6 +69,7 @@ - } - - endutent(); -+#endif - return 1; - } - diff --git a/games/flightgear-data/files/patch-ac b/games/flightgear-data/files/patch-ac deleted file mode 100644 index e21b86479735..000000000000 --- a/games/flightgear-data/files/patch-ac +++ /dev/null @@ -1,79 +0,0 @@ ---- Simulator/Time/fg_time.cxx.orig Mon Apr 19 13:18:31 1999 -+++ Simulator/Time/fg_time.cxx Sun Jun 27 19:34:43 1999 -@@ -49,6 +49,13 @@ - # include <sys/time.h> // for get/setitimer, gettimeofday, struct timeval - #endif - -+// The next lines are to define BSD -+// See http://www.freebsd.org/handbook/porting.html for why we do this -+ -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include <Debug/logstream.hxx> - #include <Astro/sky.hxx> - #include <Astro/solarsystem.hxx> -@@ -366,6 +373,11 @@ - // For now we assume that if daylight is not defined in - // /usr/include/time.h that we have a machine with a BSD behaving - // mktime() -+# ifdef BSD -+# define USE_TIME_GM 1 -+# endif -+ -+ - # if !defined(HAVE_DAYLIGHT) - # define MK_TIME_IS_GMT 1 - # endif -@@ -383,6 +395,10 @@ - mt.tm_sec = sec; - mt.tm_isdst = -1; // let the system determine the proper time zone - -+# ifdef USE_TIME_GM -+ return ( timegm(&mt) ); -+# else -+ - # if defined( MK_TIME_IS_GMT ) - return ( mktime(&mt) ); - # else // ! defined ( MK_TIME_IS_GMT ) -@@ -424,6 +440,7 @@ - return ( start_gmt ); - # endif // ! defined( TIMEZONE_OFFSET_WORKS ) - # endif // ! defined ( MK_TIME_IS_GMT ) -+# endif - } - - // Fix up timezone if using ftime() ---- Tests/test-mktime.cxx.orig Sun Jun 27 19:21:42 1999 -+++ Tests/test-mktime.cxx Sun Jun 27 19:34:13 1999 -@@ -20,6 +20,12 @@ - # include <sys/time.h> // for get/setitimer, gettimeofday, struct timeval - #endif - -+// The next lines are to define BSD -+// See http://www.freebsd.org/handbook/porting.html for why we do this -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #define LST_MAGIC_TIME_1998 890481600 - - -@@ -73,6 +79,8 @@ - mt.tm_sec = 0; - mt.tm_isdst = -1; // let the system determine the proper time zone - -+# ifdef BSD -+ return ( timegm(&mt) ); - # if defined( MK_TIME_IS_GMT ) - return ( mktime(&mt) ); - # else // ! defined ( MK_TIME_IS_GMT ) -@@ -110,6 +118,7 @@ - return ( start_gmt ); - # endif // ! defined( TIMEZONE_OFFSET_WORKS ) - # endif // ! defined ( MK_TIME_IS_GMT ) -+# endif - } - - diff --git a/games/flightgear-data/files/patch-ad b/games/flightgear-data/files/patch-ad deleted file mode 100644 index f7a358370e18..000000000000 --- a/games/flightgear-data/files/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ ---- Simulator/Main/Makefile.in.orig Sun Jun 27 21:12:00 1999 -+++ Simulator/Main/Makefile.in Sun Jun 27 21:12:12 1999 -@@ -75,7 +75,7 @@ - - bin_PROGRAMS = fgfs - --bin_SCRIPTS = runfgfs runfgfs.bat -+bin_SCRIPTS = runfgfs - - fgfs_SOURCES = \ - GLUTkey.cxx GLUTkey.hxx GLUTmain.cxx \ ---- Simulator/Main/runfgfs.in.orig Tue Apr 6 16:39:22 1999 -+++ Simulator/Main/runfgfs.in Sun Jun 27 21:44:52 1999 -@@ -29,11 +29,11 @@ - # print "-> $prefix\n"; - - # potential names of Flight Gear executable to try --@files = ( "fg", "fg.exe" ); -+@files = ( "fgfs" ); - - # search for the executable - # potential paths where the executable may be found --@paths = ( ".", "Simulator/Main", $prefix ); -+@paths = ( ".", "Simulator/Main", $prefix, "$prefix/FlightGear" ); - - $savepath = ""; - $savefile = ""; diff --git a/games/flightgear-data/files/patch-ae b/games/flightgear-data/files/patch-ae deleted file mode 100644 index 09fd65c6ea1f..000000000000 --- a/games/flightgear-data/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/Makefile.in.orig Sun Jun 27 21:48:15 1999 -+++ Lib/Makefile.in Sun Jun 27 21:48:20 1999 -@@ -197,7 +197,7 @@ - install-data: install-data-recursive - @$(NORMAL_INSTALL) - --install: install-recursive -+install: #install-recursive - @: - - uninstall: uninstall-recursive diff --git a/games/flightgear-data/files/patch-af b/games/flightgear-data/files/patch-af deleted file mode 100644 index 8b08b48a85db..000000000000 --- a/games/flightgear-data/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- Include/Makefile.in.orig Thu Jul 1 15:20:48 1999 -+++ Include/Makefile.in Thu Jul 1 15:20:55 1999 -@@ -90,7 +90,7 @@ - - TAR = tar - GZIP = --best --all: Makefile config.h -+all: - - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) diff --git a/games/flightgear-data/files/patch-ag b/games/flightgear-data/files/patch-ag deleted file mode 100644 index b0cb8e6139bd..000000000000 --- a/games/flightgear-data/files/patch-ag +++ /dev/null @@ -1,94 +0,0 @@ -From brian@CSUA.Berkeley.EDU Thu Sep 9 20:25:32 1999 -Return-Path: <brian@CSUA.Berkeley.EDU> -Received: from soda.CSUA.Berkeley.EDU (soda.CSUA.Berkeley.EDU [128.32.43.52]) - by hub.freebsd.org (Postfix) with ESMTP id 4DD7F152D2 - for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Sep 1999 20:25:30 -0700 (PDT) - (envelope-from brian@CSUA.Berkeley.EDU) -Received: from smarter.than.nu (ida-89-77.Reshall.Berkeley.EDU [169.229.89.77]) - by soda.CSUA.Berkeley.EDU (8.8.8/) via ESMTP id UAA17320 - for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Sep 1999 20:24:55 -0700 (PDT) - env-from (brian@CSUA.Berkeley.EDU) -Message-Id: <Pine.BSF.4.10.9909092019290.691-100000@smarter.than.nu> -Date: Thu, 9 Sep 1999 20:24:54 -0700 (PDT) -From: "Brian W. Buchanan" <brian@CSUA.Berkeley.EDU> -To: FreeBSD-gnats-submit@freebsd.org -Subject: [PATCH] Fix games/flightgear build under 3.3RC - ->Number: 13674 ->Category: ports ->Synopsis: Patch for games/flightgear for 3.3 ->Confidential: no ->Severity: critical ->Priority: high ->Responsible: freebsd-ports ->State: open ->Quarter: ->Keywords: ->Date-Required: ->Class: sw-bug ->Submitter-Id: current-users ->Arrival-Date: Thu Sep 9 20:30:00 PDT 1999 ->Closed-Date: ->Last-Modified: ->Originator: Brian Buchanan ->Release: FreeBSD 4.0-CURRENT i386 ->Organization: ->Environment: ->Description: - -Satoshi's build logs show FlightGear failing under 3.3 due to some -implicit typecasting that the compiler has no problem with under 4.0, but -barfs at under 3.3. A patch is attached. I don't have any way to test -this under 3.3, nor do I know if anything later in the build process fails -under 3.3, so if someone could do a quick check and fix any other trivial -little things before the ports freeze, it would be appreciated. - ->How-To-Repeat: ->Fix: - -Add patches/patch-ag: - ---- Simulator/GUI/gui.cxx.old Thu Sep 9 20:11:55 1999 -+++ Simulator/GUI/gui.cxx Thu Sep 9 20:13:07 1999 -@@ -149,7 +149,7 @@ - glutSetCursor(GLUT_CURSOR_INHERIT); - #endif - #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -- glutWarpPointer( glutGet(GLUT_SCREEN_WIDTH)/2, glutGet(GLUT_SCREEN_HEIGHT)/2); -+ glutWarpPointer( glutGet((GLenum)GLUT_SCREEN_WIDTH)/2, glutGet((GLenum)GLUT_SCREEN_HEIGHT)/2); - #endif - } - -@@ -160,7 +160,7 @@ - glutSetCursor(GLUT_CURSOR_NONE); - #else // I guess this is what we want to do ?? - #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -- glutWarpPointer( glutGet(GLUT_SCREEN_WIDTH), glutGet(GLUT_SCREEN_HEIGHT)); -+ glutWarpPointer( glutGet((GLenum)GLUT_SCREEN_WIDTH), glutGet((GLenum)GLUT_SCREEN_HEIGHT)); - #endif - #endif - } -@@ -195,7 +195,7 @@ - if( restore ) { - glutSetCursor(cursor); - } else { -- cursor = glutGet( GLUT_WINDOW_CURSOR ); -+ cursor = glutGet( (GLenum)GLUT_WINDOW_CURSOR ); - #ifdef WIN32 - TurnCursorOn(); - #endif -@@ -595,7 +595,7 @@ - // Install our fast fonts - fntpath.append( "typewriter.txf" ); - guiFntHandle = new fntTexFont ; -- guiFntHandle -> load ( fntpath.c_str() ) ; -+ guiFntHandle -> load ( (char *)fntpath.c_str() ) ; - puFont GuiFont ( guiFntHandle, 15 ) ; - puSetDefaultFonts( GuiFont, GuiFont ) ; - guiFnt = puGetDefaultLabelFont(); - - ->Release-Note: ->Audit-Trail: ->Unformatted: - |