Attachment #148602 for bug #194571

Lines 2-9 Link Here

(-)games/flightgear/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= flightgear	4	PORTNAME= flightgear
5	PORTVERSION= 3.0.0	5	PORTVERSION= 3.2.0
6	PORTREVISION= 4
7	CATEGORIES= games	6	CATEGORIES= games
8	# see http://www.flightgear.org/templates.js	7	# see http://www.flightgear.org/templates.js
9	MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Source/ \	8	MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Source/ \

Lines 1-2 Link Here

(-)games/flightgear/distinfo (-2 / +2 lines)
1	SHA256 (flightgear-3.0.0.tar.bz2) = e4bf1922825920a404539e6611c36eb5567b85d46a726fd8c6f9b19c138ba6e9	1	SHA256 (flightgear-3.2.0.tar.bz2) = addac512375b9f800a77e5733c7c0e4214442ed61a0b2712abedc0a506ac5f12
2	SIZE (flightgear-3.0.0.tar.bz2) = 5874662	2	SIZE (flightgear-3.2.0.tar.bz2) = 6950249




--- src/FDM/JSBSim/input_output/string_utilities.h.orig	2014-08-17 19:40:24.000000000 +0600
+++ src/FDM/JSBSim/input_output/string_utilities.h
@@ -166,6 +166,7 @@
   extern bool is_number(const std::string& str);
   std::vector <std::string> split(std::string str, char d);
 /* Comment out to_string functions when they are defined already - C++ 11 defines these */
+/*
   extern std::string to_string(int);
   extern std::string to_string(double);
   extern std::string to_string(float);
+*/
   extern std::string replace(std::string str, const std::string& old, const std::string& newstr);
 #else
   #include <cctype>
@@ -159,6 +161,7 @@
     return str_array;
   }
 /* Comment out to_string functions when they are defined already - C++ 11 defines these */

   string to_string(int i)
   {
     char buffer[32];
@@ -186,6 +187,7 @@
     if (!(o << x)) cerr << "Bad double to string conversion" << endl;
     return o.str();
   }




--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig	2014-08-17 19:40:24.000000000 +0600
+++ 3rdparty/iaxclient/lib/CMakeLists.txt
@@ -113,7 +113,7 @@
             libspeex/vq.c
             )
     
-        include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
+        include_directories(BEFORE ${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
     endif(SPEEX_FOUND AND SPEEXDSP_FOUND)
 endif(ENABLE_SPEXX)
 
 if (ENABLE_ALSA)

Lines 1-11 Link Here

(-)games/flightgear/files/patch-3rdparty-iaxclient-lib-iaxclient.h (-11 lines)
1	--- 3rdparty/iaxclient/lib/iaxclient.h.orig 2014-03-17 07:06:55.000000000 +0100
2	+++ 3rdparty/iaxclient/lib/iaxclient.h 2014-03-17 07:09:42.000000000 +0100
3	@@ -45,6 +45,8 @@
4	#include <sys/socket.h>
5	#endif
6
7	+#include <sys/time.h>
8	+
9	#ifdef BUILDING_DLL
10	# if defined(WIN32) \|\| defined(_WIN32_WCE)
11	# ifdef _MSC_VER

Lines 1-11 Link Here

(-)games/flightgear/files/patch-3rdparty-iaxclient-lib-libiax2-src-iax.c (-11 lines)
1	--- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig 2014-03-12 18:16:21.000000000 +0100
2	+++ 3rdparty/iaxclient/lib/libiax2/src/iax.c 2014-03-12 18:18:38.000000000 +0100
3	@@ -72,7 +72,7 @@
4	#include <arpa/inet.h>
5	#include <time.h>
6
7	-#if !defined(MACOSX) && !defined(__OpenBSD__)
8	+#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
9	#include <malloc.h>
10	#if !defined(SOLARIS)
11	#include <error.h>

Lines 1-9 Link Here

(-)games/flightgear/files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2012-08-27 18:14:13.000000000 +0200	1	--- CMakeLists.txt.orig 2014-08-17 19:40:24.000000000 +0600
2	+++ CMakeLists.txt 2012-08-27 18:14:52.000000000 +0200	2	+++ CMakeLists.txt
3	@@ -225,7 +225,7 @@	3	@@ -269,7 +269,7 @@
4	endif(LIBSVN_FOUND)
5	endif(ENABLE_LIBSVN)
6		4
		5	##############################################################################
		6
7	-find_package(PLIB REQUIRED puaux pu js fnt)	7	-find_package(PLIB REQUIRED puaux pu js fnt)
8	+find_package(PLIB REQUIRED puaux pu js fnt net)	8	+find_package(PLIB REQUIRED puaux pu js fnt net)
9		9

Lines 1-10 Link Here

(-)games/flightgear/files/patch-src-Airports-airports_fwd.hxx (-10 lines)
1	--- src/Airports/airports_fwd.hxx.orig 2013-10-09 15:45:38.000000000 +0200
2	+++ src/Airports/airports_fwd.hxx 2013-10-09 10:56:51.000000000 +0200
3	@@ -25,6 +25,7 @@
4	#include <map>
5	#include <vector>
6	#include <string>
7	+#include <ctime>
8
9	// forward decls
10	class FGAirport;




--- src/FDM/JSBSim/JSBSim.cxx.orig	2012-04-30 11:31:18.119554386 +0300
+++ src/FDM/JSBSim/JSBSim.cxx	2012-04-30 11:31:38.251553602 +0300
@@ -28,7 +28,7 @@
 #include <simgear/compiler.h>
 #include <simgear/sg_inlines.h>
 
-#include <stdio.h>    //    size_t
+#include <cstdlib>    //    size_t
 #include <string>
 
 #include <simgear/constants.h>


Lines 1-13 Link Here

(-)games/flightgear/files/patch-utils-CMakeLists.txt (-9 / +9 lines)
1	--- utils/CMakeLists.txt.orig 2013-10-01 16:13:22.000000000 +0200	1	--- utils/CMakeLists.txt.orig 2014-08-17 19:40:24.000000000 +0600
2	+++ utils/CMakeLists.txt 2013-10-01 16:13:47.000000000 +0200	2	+++ utils/CMakeLists.txt
3	@@ -29,4 +29,8 @@	3	@@ -27,6 +27,10 @@
		4	add_subdirectory(TerraSync)
		5	endif()
4		6
5	if(ENABLE_TERRASYNC)
6	add_subdirectory(TerraSync)
7	-endif()
8	\ No newline at end of file
9	+endif()
10	+
11	+if(ENABLE_JS_SERVER)	7	+if(ENABLE_JS_SERVER)
12	+ add_subdirectory(js_server)	8	+ add_subdirectory(js_server)
13	+endif()	9	+endif()
		10	+
		11	if(ENABLE_FGCOM)
		12	add_subdirectory(fgcom)
		13	endif()

Lines 21-23 Link Here

(-)games/flightgear/pkg-plist (+1 lines)
21	man/man1/terrasync.1.gz	21	man/man1/terrasync.1.gz
22	%%DATADIR%%/positions.txt	22	%%DATADIR%%/positions.txt
23	%%DATADIR%%/special_frequencies.txt	23	%%DATADIR%%/special_frequencies.txt
		24	@dir %%DATADIR%%

Return to bug 194571

Lines 1-18 Link Here

(-)games/flightgear/files/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h (-16 / +4 lines)
1	--- src/FDM/JSBSim/input_output/string_utilities.h.orig 2014-03-12 18:30:00.000000000 +0100	1	--- src/FDM/JSBSim/input_output/string_utilities.h.orig 2014-08-17 19:40:24.000000000 +0600
2	+++ src/FDM/JSBSim/input_output/string_utilities.h 2014-03-12 18:31:18.000000000 +0100	2	+++ src/FDM/JSBSim/input_output/string_utilities.h
3	@@ -73,9 +73,11 @@	3	@@ -166,6 +166,7 @@
4	extern bool is_number(const std::string& str);
5	std::vector <std::string> split(std::string str, char d);
6	/* Comment out to_string functions when they are defined already - C++ 11 defines these */
7	+/*
8	extern std::string to_string(int);
9	extern std::string to_string(double);
10	extern std::string to_string(float);
11	+*/
12	extern std::string replace(std::string str, const std::string& old, const std::string& newstr);
13	#else
14	#include <cctype>
15	@@ -159,6 +161,7 @@
16	return str_array;	4	return str_array;
17	}	5	}
18	/* Comment out to_string functions when they are defined already - C++ 11 defines these */	6	/* Comment out to_string functions when they are defined already - C++ 11 defines these */
Lines 20-26 Link Here
20	string to_string(int i)	8	string to_string(int i)
21	{	9	{
22	char buffer[32];	10	char buffer[32];
23	@@ -179,6 +182,7 @@	11	@@ -186,6 +187,7 @@
24	if (!(o << x)) cerr << "Bad double to string conversion" << endl;	12	if (!(o << x)) cerr << "Bad double to string conversion" << endl;
25	return o.str();	13	return o.str();
26	}	14	}

Lines 1-11 Link Here

(-)games/flightgear/files/patch-3rdparty-iaxclient-lib-CMakeLists.txt (-8 / +8 lines)
1	--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-03-12 18:13:58.000000000 +0100	1	--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-08-17 19:40:24.000000000 +0600
2	+++ 3rdparty/iaxclient/lib/CMakeLists.txt 2014-03-12 18:14:39.000000000 +0100	2	+++ 3rdparty/iaxclient/lib/CMakeLists.txt
3	@@ -88,7 +88,7 @@	3	@@ -113,7 +113,7 @@
4	libspeex/vq.c	4	libspeex/vq.c
5	)	5	)
6		6
7	- include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)	7	- include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
8	+ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)	8	+ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
		9	endif(SPEEX_FOUND AND SPEEXDSP_FOUND)
9	endif(ENABLE_SPEXX)	10	endif(ENABLE_SPEXX)
10		11
11	if (ENABLE_ALSA)

Lines 1-12 Link Here

(-)games/flightgear/files/patch-src-FDM-JSBSim-JSBSim.cxx (-12 lines)
1	--- src/FDM/JSBSim/JSBSim.cxx.orig 2012-04-30 11:31:18.119554386 +0300
2	+++ src/FDM/JSBSim/JSBSim.cxx 2012-04-30 11:31:38.251553602 +0300
3	@@ -28,7 +28,7 @@
4	#include <simgear/compiler.h>
5	#include <simgear/sg_inlines.h>
6
7	-#include <stdio.h> // size_t
8	+#include <cstdlib> // size_t
9	#include <string>
10
11	#include <simgear/constants.h>
12