svn commit: r509420 - in head: devel/simgear games/flightgear games/flightgear-terragear

[Ganael LAPLANCHE]

Author: martymac
Date: Tue Aug 20 10:55:50 2019
New Revision: 509420
URL: https://svnweb.freebsd.org/changeset/ports/509420

Log:
  devel/simgear: Use expat from ports instead of internal version
  
  That prepares the port for the upcoming update of textproc/expat2.
  
  As a consequence, Simgear is now provided as a shared library (only). That
  commit chases dependencies to Simgear and fixes them for dependent ports [1].
  
  PR:		239282
  Submitted by:	Sergei Vyshenski <svysh.fbsd at gmail.com>
  Approved by:	portmgr blanket [1]

Modified:
  head/devel/simgear/Makefile
  head/devel/simgear/pkg-plist
  head/games/flightgear-terragear/Makefile
  head/games/flightgear/Makefile

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Tue Aug 20 10:53:56 2019	(r509419)
+++ head/devel/simgear/Makefile	Tue Aug 20 10:55:50 2019	(r509420)
@@ -2,7 +2,7 @@
 
 PORTNAME=	simgear
 PORTVERSION=	2018.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
@@ -14,7 +14,8 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
-		libosg.so:graphics/osg
+		libosg.so:graphics/osg \
+		libexpat.so:textproc/expat2
 
 USES=		alias cmake compiler:c++11-lib cpe gl jpeg openal:al,alut \
 		tar:bzip2
@@ -23,6 +24,8 @@ USE_GL=		gl glu glut
 
 LDFLAGS_gcc=	-losgDB
 LDFLAGS+=	${LDFLAGS_${CHOSEN_COMPILER_TYPE}}
+
+CMAKE_ARGS+=	-DSYSTEM_EXPAT:BOOL=ON
 
 post-patch:
 # Avoid conflict with C++20 <version> by adding .txt suffix

Modified: head/devel/simgear/pkg-plist
==============================================================================
--- head/devel/simgear/pkg-plist	Tue Aug 20 10:53:56 2019	(r509419)
+++ head/devel/simgear/pkg-plist	Tue Aug 20 10:55:50 2019	(r509420)
@@ -332,9 +332,11 @@ include/simgear/timing/timestamp.hxx
 include/simgear/timing/timezone.h
 include/simgear/version.h
 include/simgear/xml/easyxml.hxx
-lib/libSimGearCore.a
-lib/libSimGearScene.a
 lib/cmake/SimGear/SimGearConfig.cmake
 lib/cmake/SimGear/SimGearConfigVersion.cmake
 lib/cmake/SimGear/SimGearTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SimGear/SimGearTargets.cmake
+lib/libSimGearCore.so
+lib/libSimGearCore.so.2018.3.2
+lib/libSimGearScene.so
+lib/libSimGearScene.so.2018.3.2

Modified: head/games/flightgear-terragear/Makefile
==============================================================================
--- head/games/flightgear-terragear/Makefile	Tue Aug 20 10:53:56 2019	(r509419)
+++ head/games/flightgear-terragear/Makefile	Tue Aug 20 10:55:50 2019	(r509420)
@@ -2,7 +2,7 @@
 
 PORTNAME=	flightgear-terragear
 PORTVERSION=	20171007
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 
 MAINTAINER=	mike.d.ft402 at gmail.com
@@ -10,7 +10,6 @@ COMMENT=	Tools for building scenery for the FlightGear
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libSimGearCore.a:devel/simgear
 LIB_DEPENDS=	libCGAL.so:math/cgal \
 		libgdal.so:graphics/gdal \
 		libmpfr.so:math/mpfr \
@@ -20,8 +19,8 @@ LIB_DEPENDS=	libCGAL.so:math/cgal \
 		libboost_chrono.so:devel/boost-libs \
 		libboost_date_time.so:devel/boost-libs \
 		libboost_atomic.so:devel/boost-libs \
-		libtiff.so:graphics/tiff
-RUN_DEPENDS=	${LOCALBASE}/lib/libSimGearCore.a:devel/simgear
+		libtiff.so:graphics/tiff \
+		libSimGearCore.so:devel/simgear
 
 USES=	cmake compiler:c++11-lang
 

Modified: head/games/flightgear/Makefile
==============================================================================
--- head/games/flightgear/Makefile	Tue Aug 20 10:53:56 2019	(r509419)
+++ head/games/flightgear/Makefile	Tue Aug 20 10:55:50 2019	(r509420)
@@ -3,7 +3,7 @@
 
 PORTNAME=	flightgear
 PORTVERSION=	2018.3.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
@@ -20,12 +20,11 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libspeex.so:audio/speex \
 		libspeexdsp.so:audio/speexdsp \
 		libcurl.so:ftp/curl \
-		libudev.so:devel/libudev-devd
+		libudev.so:devel/libudev-devd \
+		libSimGearCore.so:devel/simgear
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
-		${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
-		${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \
 		${LOCALBASE}/share/flightgear/version:games/flightgear-data
 
 # Disable ninja, see https://sourceforge.net/p/flightgear/codetickets/2118/