- Update to 1.0.0

- Pass maintainership to submitter

PR:		123337
Submitted by:	Ganael Laplanche <ganael.laplanche@martymac.com>

7 files changed, 35 insertions, 43 deletions

diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile
index 26cd40a4be81..be059de14741 100644
--- a/games/fgfs-base/Makefile
+++ b/games/fgfs-base/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	fgfs-base
-PORTVERSION=	0.9.10
-PORTREVISION=	2
+PORTVERSION=	1.0.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Shared/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Shared/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	FlightGear scenery, textures and aircraft models
 
 NO_BUILD=	yes
@@ -24,7 +23,7 @@ PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-	@${RM} -f ${WRKSRC}/Aircraft/A-10/COPYING ${WRKSRC}/COPYING
+	@${RM} -f ${WRKSRC}/COPYING ${WRKSRC}/Aircraft/A-10/COPYING ${WRKSRC}/Aircraft/787/COPYING
 
 pre-install:
 	@${RM} -f ${PLIST}
@@ -37,8 +36,7 @@ pre-install:
 		| ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 
 do-install:
-	cd ${WRKSRC} && \
-	${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
-	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/games/fgfs-base/distinfo b/games/fgfs-base/distinfo
index e813ebc46e08..b2cb6d879953 100644
--- a/games/fgfs-base/distinfo
+++ b/games/fgfs-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (fgfs-base-0.9.10.tar.bz2) = 0ff82689a1877de95490c429e717d8a2
-SHA256 (fgfs-base-0.9.10.tar.bz2) = 7770a7bd9f2bfa6475e414f4a83438c6e1e29abf12bd1b30045e3cc1732698eb
-SIZE (fgfs-base-0.9.10.tar.bz2) = 146866758
+MD5 (fgfs-base-1.0.0.tar.bz2) = 105478648b01e8a16ee31ba7cbd201da
+SHA256 (fgfs-base-1.0.0.tar.bz2) = 52b20cbe61a47e5a51fdd0d492a326c19b0d323ec0c7304609acba53f1c787eb
+SIZE (fgfs-base-1.0.0.tar.bz2) = 191345428
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 26cd40a4be81..be059de14741 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	fgfs-base
-PORTVERSION=	0.9.10
-PORTREVISION=	2
+PORTVERSION=	1.0.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Shared/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Shared/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	FlightGear scenery, textures and aircraft models
 
 NO_BUILD=	yes
@@ -24,7 +23,7 @@ PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-	@${RM} -f ${WRKSRC}/Aircraft/A-10/COPYING ${WRKSRC}/COPYING
+	@${RM} -f ${WRKSRC}/COPYING ${WRKSRC}/Aircraft/A-10/COPYING ${WRKSRC}/Aircraft/787/COPYING
 
 pre-install:
 	@${RM} -f ${PLIST}
@@ -37,8 +36,7 @@ pre-install:
 		| ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 
 do-install:
-	cd ${WRKSRC} && \
-	${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
-	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index e813ebc46e08..b2cb6d879953 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (fgfs-base-0.9.10.tar.bz2) = 0ff82689a1877de95490c429e717d8a2
-SHA256 (fgfs-base-0.9.10.tar.bz2) = 7770a7bd9f2bfa6475e414f4a83438c6e1e29abf12bd1b30045e3cc1732698eb
-SIZE (fgfs-base-0.9.10.tar.bz2) = 146866758
+MD5 (fgfs-base-1.0.0.tar.bz2) = 105478648b01e8a16ee31ba7cbd201da
+SHA256 (fgfs-base-1.0.0.tar.bz2) = 52b20cbe61a47e5a51fdd0d492a326c19b0d323ec0c7304609acba53f1c787eb
+SIZE (fgfs-base-1.0.0.tar.bz2) = 191345428
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index a11367331e01..9e75f5f8af06 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -7,36 +7,32 @@
 
 PORTNAME?=	FlightGear
 PORTVERSION?=	${FGVERSION}
-PORTREVISION?=	1
 CATEGORIES=	games
-MASTER_SITES+=	ftp://ftp.flightgear.org/pub/fgfs/Source/:fg \
-		ftp://ftp.de.flightgear.org/pub/fgfs/Source/:fg
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}:fg
+MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Source/ \
+		ftp://ftp.de.flightgear.org/pub/fgfs/Source/
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	ganael.laplanche@martymac.com
 COMMENT?=	The FlightGear flight simulator
 
-LIB_DEPENDS=	glut:${PORTSDIR}/graphics/libglut \
-		openal.0:${PORTSDIR}/audio/openal
+LIB_DEPENDS=	openal.0:${PORTSDIR}/audio/openal
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \
 		${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
 
-FGVERSION=	0.9.10
+FGVERSION=	1.0.0
 
-USE_GL=		gl
+USE_XORG=	ice sm x11 xext xi xt xmu
+USE_GL=		gl glu glut
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--datadir=${LOCALBASE}/share	# location of fgfs-base
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
-.if ${PORTNAME} == FlightGear
-MAN1=		est-epsilon.1 fgfs.1 fgjs.1 gl-info.1 js_demo.1 pstest.1
-.endif
+MAN1=	est-epsilon.1 js_demo.1 pstest.1 fgjs.1 gl-info.1 fgfs.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-D_REENTRANT|${PTHREAD_CFLAGS}|' \
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index f149c81ddb4f..c4885ca8757f 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,3 +1,3 @@
-MD5 (FlightGear-0.9.10.tar.gz) = f4b89c9cafc18d56beab77a04f1ebdce
-SHA256 (FlightGear-0.9.10.tar.gz) = 6307ad26e4141d27dcd66962f9c8e117206197a468b4f8bc99a6a31deb2e4992
-SIZE (FlightGear-0.9.10.tar.gz) = 2072135
+MD5 (FlightGear-1.0.0.tar.gz) = fd960c6c8c537bdb8764c111ad4b1356
+SHA256 (FlightGear-1.0.0.tar.gz) = 7add44fe5742d9712cc3543e2de066eac55f435b49b266f623bf53762520813d
+SIZE (FlightGear-1.0.0.tar.gz) = 2123216
diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist
index 305be2baeb74..0bb19b6cc30d 100644
--- a/games/flightgear/pkg-plist
+++ b/games/flightgear/pkg-plist
@@ -1,10 +1,10 @@
-bin/al-info
-bin/est-epsilon
-bin/fgfs
-bin/fgjs
-bin/gl-info
 bin/js_demo
-bin/js_server
+bin/fgjs
+bin/est-epsilon
 bin/metar
 bin/terrasync
+bin/gl-info
 bin/yasim
+bin/js_server
+bin/al-info
+bin/fgfs