Update to 0.9.6. Note that scenery, textures and aircraft models are now

installed by a separate port, games/fgfs-base, which this one lists as a
run-time dependency.

1 files changed, 17 insertions, 28 deletions

diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 2852beed6f88..9be1cacd7d96 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -6,57 +6,46 @@
 #
 
 PORTNAME=	FlightGear
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Source/:src \
-		ftp://ftp.flightgear.org/pub/fgfs/Shared/:dat
+MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Source/ \
+		ftp://ftp.de.flightgear.org/pub/fgfs/Source/
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	The FlightGear flight simulator
 
-BASEVERSION=	${PORTVERSION}
-BASEFILE=	fgfs-base-${BASEVERSION}${EXTRACT_SUFX}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
-		${BASEFILE}:dat
-
 LIB_DEPENDS=	glut:${PORTSDIR}/graphics/libglut
 BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${X11BASE}/include/simgear/threads/SGThread.hxx:${PORTSDIR}/devel/simgear \
 		${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
 RUN_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${X11BASE}/include/simgear/threads/SGThread.hxx:${PORTSDIR}/devel/simgear \
-		${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
+		${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \
+		${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-# Force configure to look in ${LOCALBASE}/{include,lib}
+# Force configure to look in ${LOCALBASE}/{include,lib}.  Note
+# that it already knows about ${X11BASE}/{include,lib}.
+# XXX Add ${PTHREAD_LIBS} to LDFLAGS to work around brokenness in
+# XXX FreeBSD's gcc: libopenal is linked with -pthread and should
+# XXX have a dependency on libpthread, but gcc ignores -pthread
+# XXX when building shared objects.
 CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-threads
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--program-transform-name='s/^${CONFIGURE_TARGET}-//' \
+		--datadir=${LOCALBASE}/share \
+		--with-threads
 
 MAN1=		est-epsilon.1 fgfs.1 fgjs.1 gl-info.1 js_demo.1 pstest.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 post-extract:
 	@${FIND} ${WRKSRC} \( -name '.#*' -or -name '*~' \) -delete
 
 do-install:
 	@${ECHO} ">> Installing program"
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-	@${ECHO} ">> Installing data"
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0755 ${DATADIR}
-	@(cd ${WRKSRC}/data && ${FIND} . -type d | (cd ${DATADIR} &&\
-		${XARGS} ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0755))
-	@(cd ${WRKSRC}/data && ${FIND} . -type f |\
-		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR})
-
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>