Update Simgear and Flightgear ports to 2.6.0

6 files changed, 68 insertions, 22 deletions

diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index ac4646be6462..1bf88af23aff 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	flightgear
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \
@@ -21,7 +20,9 @@ COMMENT=	The FlightGear flight simulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+		boost_thread.4:${PORTSDIR}/devel/boost-libs \
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk \
 		osg.80:${PORTSDIR}/graphics/osg
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
@@ -30,21 +31,22 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
 
 USE_BZIP2=	yes
-USE_XORG=	ice sm x11 xext xi xt xmu
+USE_XORG=	ice sm x11 xext xft xi xinerama xt xmu
 USE_GL=		gl glu glut
-USE_OPENAL=	al
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--datadir=${LOCALBASE}/share
-MAKE_JOBS_UNSAFE=yes
-
-MAN1=	est-epsilon.1 js_demo.1 pstest.1 fgjs.1 gl-info.1 fgfs.1
-
-post-patch:
-	@${REINPLACE_CMD} 's|-D_REENTRANT|${PTHREAD_CFLAGS}|' \
-		${WRKSRC}/configure
+USE_OPENAL=	al alut
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DJPEG_FACTORY:BOOL=ON \
+		-DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \
+		-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
+		-DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR}
+
+PORTDOCS=	README README.OSG README.OpenAL README.SimGear README.plib
+
+.if defined(NOPORTDOCS)
+CMAKE_ARGS+=	-DNOPORTDOCS:BOOL=ON
+.endif
+
+MAN1=	js_demo.1 fgjs.1 gl-info.1 fgfs.1 fgpanel.1 terrasync.1
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${PREFIX}/bin
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 682409d91003..7ed5b8470acd 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flightgear-2.4.0.tar.bz2) = 3f2fdad171b86746b0dfa67510aabfb0c24731951a6d5646c6f0a4f98f01dbe1
-SIZE (flightgear-2.4.0.tar.bz2) = 1909473
+SHA256 (flightgear-2.6.0.tar.bz2) = 1554efbe20ad5002ad169225605ae95fca46d381bdff03dd624d92cf24b1a40f
+SIZE (flightgear-2.6.0.tar.bz2) = 2280644
diff --git a/games/flightgear/files/patch-CMakeLists.txt b/games/flightgear/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..1abbcffbfb62
--- /dev/null
+++ b/games/flightgear/files/patch-CMakeLists.txt
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2012-02-17 23:41:13.982306000 +0100
++++ CMakeLists.txt	2012-03-09 15:39:46.949702574 +0100
+@@ -226,7 +226,7 @@
+ 	endif(LIBSVN_FOUND)
+ endif(ENABLE_LIBSVN)
+ 
+-find_package(PLIB REQUIRED puaux pu js fnt)
++find_package(PLIB REQUIRED puaux pu js fnt net)
+ find_package(SimGear 2.6.0 REQUIRED)
+ 
+ if (JPEG_FACTORY)
+@@ -342,7 +342,9 @@
+ 	README.OSG
+ 	README.SimGear)
+ 
+-INSTALL(FILES ${INSTALL_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
++if(NOT NOPORTDOCS)
++	INSTALL(FILES ${INSTALL_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
++endif()
+ 
+ #-----------------------------------------------------------------------------
+ ### uninstall target
diff --git a/games/flightgear/files/patch-utils-CMakeLists.txt b/games/flightgear/files/patch-utils-CMakeLists.txt
new file mode 100644
index 000000000000..035d1520ec7c
--- /dev/null
+++ b/games/flightgear/files/patch-utils-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- utils/CMakeLists.txt.orig	2012-03-09 13:50:13.026701925 +0100
++++ utils/CMakeLists.txt	2012-03-09 13:50:24.126886556 +0100
+@@ -1,6 +1,7 @@
+ add_subdirectory(TerraSync)
+ add_subdirectory(fgviewer)
+ add_subdirectory(GPSsmooth)
++add_subdirectory(js_server)
+ 
+ if (FLTK_FOUND)
+     if (EXISTS ${FLTK_FLUID_EXECUTABLE})
diff --git a/games/flightgear/files/patch-utils-js_server-CMakeLists.txt b/games/flightgear/files/patch-utils-js_server-CMakeLists.txt
new file mode 100644
index 000000000000..33d832907e15
--- /dev/null
+++ b/games/flightgear/files/patch-utils-js_server-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- utils/js_server/CMakeLists.txt.orig	2012-03-09 14:44:22.999701740 +0100
++++ utils/js_server/CMakeLists.txt	2012-03-09 14:59:36.643375244 +0100
+@@ -0,0 +1,7 @@
++add_executable(js_server js_server.cxx)
++
++target_link_libraries(js_server
++	${PLIB_LIBRARIES}
++)
++
++install(TARGETS js_server RUNTIME DESTINATION bin)
diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist
index db6b34a1d1cb..24131eba1ed9 100644
--- a/games/flightgear/pkg-plist
+++ b/games/flightgear/pkg-plist
@@ -1,11 +1,13 @@
 bin/fgfs
 bin/js_server
-bin/gl-info
-bin/est-epsilon
 bin/fgviewer
 bin/js_demo
-bin/alcinfo
 bin/fgjs
 bin/metar
 bin/terrasync
 bin/yasim
+bin/GPSsmooth
+bin/MIDGsmooth
+bin/UGsmooth
+bin/fgadmin
+bin/fgpanel