1 files changed, 145 insertions, 64 deletions

diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index 41fcb90ca124..c6d10ce2a69e 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -6,84 +6,170 @@
 #
 
 PORTNAME=	flightgear-aircrafts
-PORTVERSION=	20060812
-PORTREVISION=	2
+PORTVERSION=	20080212
 CATEGORIES=	games
+# see http://www.flightgear.org/templates.js
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Aircraft/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft/ \
-		ftp://ftp.sunsite.org.uk/sites/ftp.flightgear.org/flightgear-ftp/Aircraft/ \
-		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft/
+		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft/ \
+		ftp://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft/ \
+		http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft/ \
+		http://flightgear.mxchange.org/pub/fgfs/Aircraft/ \
+		http://ftp3.linux.kiev.ua/pub/fgfs/Aircraft/
 DISTFILES=	707_20060324.zip \
+		737-300_20071217.zip \
+		747-200_1.0.zip \
 		747_20060315.zip \
-		777-200_20060701.zip \
-		A300_20060529.zip \
-		A320_20060405.zip \
-		a4_20060530.zip \
-		Aerostar-700_20060216.zip \
+		A-6E_20080212.zip \
+		A24-Viking_20080102.zip \
+		A300_20061009.zip \
+		A320-family_20070119.zip \
+		A320_20070119.zip \
+		A6M2_20080123.zip \
+		AN-225_20071107.zip \
+		ASK21_20070701.zip \
+		Aerostar-700_20071227.zip \
+		Albatross_20071217.zip \
+		Alouette-III_20071217.zip \
+		Alouette-II_20080107.zip \
+		Alphajet_20080102.zip \
+		Arsenal-VG33_20071129.zip \
+		B-1B_20071128.zip \
+		B-2_20071108.zip \
+		B-52F_20071203.zip \
+		BAC-TSR2_20080102.zip \
+		BV-141_20071228.zip \
+		Boeing314_1.3.zip \
+		Buccaneer_0.1.zip \
+		Bugatti_20080212.zip \
+		C130_20080212.zip \
+		CanberraBI8_20071108.zip \
+		Citation-Bravo_20071227.zip \
+		CitationX_20071001.zip \
+		Citation_20071203.zip \
+		ComperSwift_20071108.zip \
+		Concorde_2.4.zip \
+		DH-89_20080102.zip \
+		DO-335_20080212.zip \
+		DO-X_20080212.zip \
+		Dragonfly_0.4.zip \
+		E3B_20070509.zip \
+		F-86_20071217.zip \
+		F4U_20071217.zip \
+		F80C_20070521.zip \
+		FK9MK2_20071114.zip \
+		Farman-IV_20071009.zip \
+		Grob-G115_20071203.zip \
+		H-21C-Shawnee_20071217.zip \
+		H4-Hercules_0.68.zip \
+		HUP-Retriever_20071217.zip \
+		HondaJet_20080212.zip \
+		Hornet_20070709.zip \
+		Hunter_20070904.zip \
+		Hurricane_20070620.zip \
+		KC135_20080123.zip \
+		Ki-84_20080212.zip \
+		Lionceau_20080123.zip \
+		Lockheed-SR71_20070615.zip \
+		Lockheed1049_1.2.zip \
+		Lynx-WG13_20071218.zip \
+		MD11_20061018.zip \
+		ME-262_20080102.zip \
+		Macchi-Castoldi-MC72_20071114.zip \
+		Malolo1_0.0.zip \
+		MiG-15_20071108.zip \
+		Mig-29_20080205.zip \
+		Noratlas_20071108.zip \
+		OV10_20070509.zip \
+		P-38-Lightning_20071218.zip \
+		P180_20080212.zip \
+		PBY-Catalina_20071217.zip \
+		R22_20071218.zip \
+		Rascal_0.1.zip \
+		Ryan-SoSL_20080107.zip \
+		S-51-Dragonfly_20071218.zip \
+		SR71-BlackBird_20071121.zip \
+		SU-37_20080212.zip \
+		SaabJ35Draken_20071218.zip \
+		SeaVixen_20071217.zip \
+		Sikorsky-76C_20080102.zip \
+		Sikorsky-S58_20071203.zip \
+		Spitfire_20070618.zip \
+		Starship_20070914.zip \
+		Stiletto_20080116.zip \
+		Storch_20071217.zip \
+		Su-26M_1.0.zip \
+		Super-Frelon_20071120.zip \
+		T-4_20080211.zip \
+		T37_20060315.zip \
+		TU-114_20080101.zip \
+		UH-60_20071121.zip \
+		V22-Osprey_0.1.zip \
+		Vickers-Vimy_20080116.zip \
+		X15_20061204.zip \
+		YF-23_20060821.zip \
+		YardStik_0.0.zip \
+		Zlin-50lx_20080205.zip \
+		a4_20071029.zip \
 		airwaveXtreme150_20050502.zip \
-		AN-225_20060511.zip \
-		as350_20050502.zip \
+		an2_20070607.zip \
 		asw20_20050502.zip \
-		b1900d_20060410.zip \
 		b29_20060324.zip \
-		B-52F_20060702.zip \
-		BAC-TSR2_20060220.zip \
-		beech99_20050502.zip \
-		bell206_20050502.zip \
-		Boeing314_1.2.zip \
-		c150_20051116.zip \
-		c172-le_20031220.zip \
+		beaufighter_20071217.zip \
+		beech99_20080107.zip \
+		bleriot-XI_20080102.zip \
+		bluebird_5.0.zip \
+		c150_20071218.zip \
 		c172r_20060315.zip \
-		c182_20060315.zip \
-		CanberraBI8_20060604.zip \
-		ch47_20051128.zip \
+		c182_20070709.zip \
+		c182rg_20071218.zip \
+		c310_20070119.zip \
+		c310u3a_20070212.zip \
+		ch47_0.1.zip \
 		ch53e_0.1.zip \
-		Citation_20051216.zip \
-		colditz_20051108.zip \
-		ComperSwift_20060220.zip \
-		Concorde_2.2.zip \
+		colditz_20070515.zip \
+		cri-cri_20080112.zip \
 		dc3_20050616.zip \
-		dhc2_20060315.zip \
-		f104_20060315.zip \
+		dhc6_20080209.zip \
+		ec135_0.2.zip \
+		f104_20070718.zip \
 		f15_20060112.zip \
-		F80C_20060324.zip \
+		f15c_20070129.zip \
+		f16_20070119.zip \
+		f18_20070404.zip \
 		fkdr1_20050502.zip \
+		flash2a_20070509.zip \
 		fokker100_20060315.zip \
 		fokker50_20060228.zip \
-		harrier_20060530.zip \
-		Hurricane_20060419.zip \
+		fw190_20071217.zip \
+		harrier_20070618.zip \
 		j22_20050616.zip \
-		KC135_20060710.zip \
-		Lightning_20060530.zip \
-		Lockheed1049_1.1.zip \
-		Manta_20060206.zip \
+		j7w_20070404.zip \
+		jeep_20071217.zip \
+		ju52_20071217.zip \
 		marchetti_20050616.zip \
-		MD11_20060315.zip \
-		MiG-15_20060623.zip \
+		mirage2000_20070103.zip \
+		mosquito_20071217.zip \
 		ogel_20060509.zip \
 		ornithopter_20050502.zip \
-		OV10_20060619.zip \
-		OV10_USAFE_20060216.zip \
-		pa24-250_20060324.zip \
+		pa24-250_20080212.zip \
 		paraglider_20060112.zip \
-		pc7_20060315.zip \
+		payen-pa100_20080102.zip \
+		pc7_20070122.zip \
+		pittss1c_20071218.zip \
 		santa_20051027.zip \
-		seahawk_20060320.zip \
-		SenecaII_0.3.zip \
-		sgs233_20060511.zip \
+		sgs233_20070509.zip \
 		shuttle_20060112.zip \
-		sopwithCamel_20050502.zip \
-		Spitfire_20060419.zip \
+		snowplow_1.0.zip \
+		spitfireIX_20071217.zip \
 		sr20_20051009.zip \
-		T37_20060315.zip \
-		TU-114_20051027.zip \
 		tu154_20060501.zip \
-		X15_20060112.zip \
-		x24b_20060112.zip \
-		YF-23_20060226.zip
+		vulcanb2_20071010.zip \
+		wrightFlyer1903_20050502.zip \
+		x24b_20060112.zip
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Additional aircrafts for the FlightGear flight simulator
 
 RUN_DEPENDS=	${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
@@ -91,28 +177,23 @@ RUN_DEPENDS=	${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST=		${WRKDIR}/.plist
+PLIST=	${WRKDIR}/.pkg-plist
 
 post-patch:
-	@${RM} -f ${WRKSRC}/b29/LICENSE
-.for d in AN-225 B-52F BAC-TSR2 Boeing314/Models CanberraBI8 \
-	Lockheed1049/Models MiG-15 TU-114 YF-23
-	@${RM} -f ${WRKSRC}/${d}/COPYING
-.endfor
+	@${FIND} ${WRKSRC} -type f \
+		\( -name COPYING -or -name LICENSE -or -name copyright \) -delete
 
 pre-install:
 	@${RM} -f ${PLIST}
 	@cd ${WRKSRC} && \
+	${FIND} * -type d -empty | ${SORT} \
+		| ${SED} -e 's|^|@exec ${MKDIR} share/FlightGear/Aircraft/|' >> ${PLIST} && \
 	${FIND} * -type f | ${SORT} \
 		| ${SED} -e 's|^|share/FlightGear/Aircraft/|' >> ${PLIST} && \
-	${FIND} * -type d ! -empty | ${SORT} -r \
+	${FIND} * -type d | ${SORT} -r \
 		| ${SED} -e 's|^|@dirrm share/FlightGear/Aircraft/|' >> ${PLIST}
 
 do-install:
-	cd ${WRKSRC} && \
-	${FIND} * -type d ! -empty -exec \
-		${MKDIR} "${PREFIX}/share/FlightGear/Aircraft/{}" \; && \
-	${FIND} * -type f -exec \
-		${INSTALL_DATA} "{}" "${PREFIX}/share/FlightGear/Aircraft/{}" \;
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/FlightGear/Aircraft/)
 
 .include <bsd.port.mk>