2 files changed, 54 insertions, 47 deletions

diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index 7befde7da1f5..ef8884348d8a 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-aircraft
-PORTVERSION=	20130221
+PORTVERSION=	20131001
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.10/ \
-		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.10/ \
-		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.10/ \
-		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.10/ \
-		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.10/
+MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.12/ \
+		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.12/ \
+		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.12/ \
+		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.12/ \
+		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.12/
 # Selection of production-ready/well-known planes
 # (planes already included in flightgear-data are excluded)
 # Please contact the MAINTAINER if a plane is missing
@@ -17,30 +17,30 @@ DISTFILES=	737-200_20120506.zip \
 		A-10_20121203.zip \
 		A300_20120717.zip \
 		Alouette-II_20120506.zip \
-		Alphajet_20120506.zip \
-		B-17_20120506.zip \
+		Alphajet_20130225.zip \
+		B-17_20130706.zip \
 		Breguet-XIX_20100829.zip \
-		C130_20120717.zip \
+		C130_20130810.zip \
 		Caravelle_20120506.zip \
 		Caudron-G3_20120506.zip \
 		F80C_20120717.zip \
-		Hurricane_20130117.zip \
+		Hurricane_20130315.zip \
 		IL-2_20110311.zip \
 		Lightning_20121005.zip \
 		Lockheed1049h_1.0.zip \
-		Messerschmitt-P1101_20101005.zip \
+		Messerschmitt-P1101_20130315.zip \
 		MirageIII_20120222.zip \
 		PaperAirplane_20101229.zip \
 		Pond-Racer_20120506.zip \
-		R44_20120506.zip \
-		Spitfire_20130117.zip \
+		R44_20130426.zip \
+		Spitfire_20130310.zip \
 		Stieglitz_20091025.zip \
 		Super-Etendard_20120501.zip \
-		Supermarine-S.6B_20110114.zip \
+		Supermarine-S.6B_20130312.zip \
 		Superwal_20100330.zip \
-		airwaveXtreme150_July-2012.zip \
-		asw20_20130115.zip \
-		bf109_20120717.zip \
+		airwaveXtreme150_July-2013.zip \
+		asw20_July-2013.zip \
+		bf109_20130615.zip \
 		c310_20130209.zip \
 		dhc3_20120506.zip \
 		f16_20120812.zip \
@@ -57,12 +57,18 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
 
-USE_ZIP=	yes
-NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST=	${WRKDIR}/.pkg-plist
+USE_ZIP=	yes
+WRKSRC=	${WRKDIR}/fgaircraft
+EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
+DATADIR=	${PREFIX}/share/flightgear/Aircraft
+
+PLIST=		${WRKDIR}/pkg-plist
+PLIST_DIRS=	%%DATADIR%%
+
+pre-extract:
+	@${MKDIR} ${WRKSRC}
 
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC} -type f \
 		\( -name COPYING -or -name LICENSE -or -name copyright \) -delete
@@ -71,13 +77,14 @@ pre-install:
 	@${RM} -f ${PLIST}
 	@cd ${WRKSRC} && \
 	${FIND} * -type d -empty | ${SORT} \
-		| ${SED} -e 's|^|@exec ${MKDIR} share/flightgear/Aircraft/|' >> ${PLIST} && \
+		| ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/Aircraft/|' >> ${PLIST} && \
 	${FIND} * -type f | ${SORT} \
-		| ${SED} -e 's|^|share/flightgear/Aircraft/|' >> ${PLIST} && \
+		| ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 	${FIND} * -type d | ${SORT} -r \
-		| ${SED} -e 's|^|@dirrm share/flightgear/Aircraft/|' >> ${PLIST}
+		| ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 
 do-install:
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/flightgear/Aircraft/)
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/games/flightgear-aircraft/distinfo b/games/flightgear-aircraft/distinfo
index 989a9932fc5f..bc38717ab715 100644
--- a/games/flightgear-aircraft/distinfo
+++ b/games/flightgear-aircraft/distinfo
@@ -6,54 +6,54 @@ SHA256 (flightgear-aircraft/A300_20120717.zip) = 913236da87fd3abe1177b7e59d2dff6
 SIZE (flightgear-aircraft/A300_20120717.zip) = 386184
 SHA256 (flightgear-aircraft/Alouette-II_20120506.zip) = 755bc4bc620d1cceb208def0d979f4c4535667df42abcd0adb30dbf317d1b42c
 SIZE (flightgear-aircraft/Alouette-II_20120506.zip) = 5381104
-SHA256 (flightgear-aircraft/Alphajet_20120506.zip) = 26fbc985759d0ec6050484644a14cdca485a67fe61014d007665983e0222b525
-SIZE (flightgear-aircraft/Alphajet_20120506.zip) = 18819048
-SHA256 (flightgear-aircraft/B-17_20120506.zip) = b0910020ec348ca461b617d1fbb8494ab5cab06ff7b16560f337d683c52d9b28
-SIZE (flightgear-aircraft/B-17_20120506.zip) = 11850690
+SHA256 (flightgear-aircraft/Alphajet_20130225.zip) = 2f6460be7c9948d53681830b05f55c6add7b2d4b12a9d56564698a9ac7ba9b10
+SIZE (flightgear-aircraft/Alphajet_20130225.zip) = 19410469
+SHA256 (flightgear-aircraft/B-17_20130706.zip) = bb01931aad4bf50cfc74ab98dd69cb64307fd4d68d1cb34272363b1f60fc0060
+SIZE (flightgear-aircraft/B-17_20130706.zip) = 12486789
 SHA256 (flightgear-aircraft/Breguet-XIX_20100829.zip) = 9405ec3e475e8b3ef63ed3357273dfc5f83e88074fb1ced90764a23eb3d5a1af
 SIZE (flightgear-aircraft/Breguet-XIX_20100829.zip) = 4323944
-SHA256 (flightgear-aircraft/C130_20120717.zip) = 36e4a819dd077f4896b4bb6e09ec28de7527bd2fa7662585cd754752e1b1561e
-SIZE (flightgear-aircraft/C130_20120717.zip) = 31813153
+SHA256 (flightgear-aircraft/C130_20130810.zip) = 38e9a897cd14a785a0848314484ff75c1698d50c2789e52e3f29a196fdee3b84
+SIZE (flightgear-aircraft/C130_20130810.zip) = 25474281
 SHA256 (flightgear-aircraft/Caravelle_20120506.zip) = b936271471312502cf3b755f9b1c8ca6a68c1d1172508c0274ea4b3cebb68412
 SIZE (flightgear-aircraft/Caravelle_20120506.zip) = 14686948
 SHA256 (flightgear-aircraft/Caudron-G3_20120506.zip) = 191a68c00fa75a034ee0d6f75e0cc456e152fd1cc735dac401da48ad8b283902
 SIZE (flightgear-aircraft/Caudron-G3_20120506.zip) = 4531626
 SHA256 (flightgear-aircraft/F80C_20120717.zip) = 633016a2ea70f9be59927d5201c48af985ef7d2414888ddff3488f25261526d5
 SIZE (flightgear-aircraft/F80C_20120717.zip) = 1528349
-SHA256 (flightgear-aircraft/Hurricane_20130117.zip) = d5a547b321245ff9533413d3eb8f75254f394ff9771473f409909b09c23b08c8
-SIZE (flightgear-aircraft/Hurricane_20130117.zip) = 12062365
+SHA256 (flightgear-aircraft/Hurricane_20130315.zip) = f224341124f6f696a0dd5991cc6ed925a3bf5b6098459e74a7287c7c027223b3
+SIZE (flightgear-aircraft/Hurricane_20130315.zip) = 12062920
 SHA256 (flightgear-aircraft/IL-2_20110311.zip) = 1c7e126956247f7a6ed93cd4fc2abe65c756b07275559ed1f0bd03d731a51ee0
 SIZE (flightgear-aircraft/IL-2_20110311.zip) = 3933481
 SHA256 (flightgear-aircraft/Lightning_20121005.zip) = 6f8a27edf887aceef8da17465c658c110cf6b1d55c10ba023cb2660dd61a66ab
 SIZE (flightgear-aircraft/Lightning_20121005.zip) = 4784876
 SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7374e32aab617e466c228262004d1c292d9667375e74481d74f7a5210dfd60fd
 SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529096
-SHA256 (flightgear-aircraft/Messerschmitt-P1101_20101005.zip) = 76c1a79348a59fa2eccd0a6eb1218db4d706ba967b7d626ddc263abda6d12ed1
-SIZE (flightgear-aircraft/Messerschmitt-P1101_20101005.zip) = 4565272
+SHA256 (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 6a1a53902ffd6ff33c412a1d605e2a43615b3dcdaa7efebdff1f647ebe4b40ec
+SIZE (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 4359275
 SHA256 (flightgear-aircraft/MirageIII_20120222.zip) = f99bd3f446a5d861a0ee04df08c6e6ced04ebff2cb3c810ea9f9a78fdfa57a7b
 SIZE (flightgear-aircraft/MirageIII_20120222.zip) = 11112429
 SHA256 (flightgear-aircraft/PaperAirplane_20101229.zip) = b458c06510d1687b2be5769db5823fa0bb9165a3e5aef6094e4a23803efb3bb4
 SIZE (flightgear-aircraft/PaperAirplane_20101229.zip) = 867872
 SHA256 (flightgear-aircraft/Pond-Racer_20120506.zip) = 707d8401d394095475e0f3442cd01a66b9c3e7f8c08512dd685824e8d782ef94
 SIZE (flightgear-aircraft/Pond-Racer_20120506.zip) = 3063526
-SHA256 (flightgear-aircraft/R44_20120506.zip) = 4a8534af61ceb7749b7596cae6b30edbac23d2ee6c1473dd40277423ad9ad097
-SIZE (flightgear-aircraft/R44_20120506.zip) = 11161383
-SHA256 (flightgear-aircraft/Spitfire_20130117.zip) = 30641c30d53f437447ae7cecf1c4dd38ce01587a394d427984ca0beda5b98d40
-SIZE (flightgear-aircraft/Spitfire_20130117.zip) = 21051159
+SHA256 (flightgear-aircraft/R44_20130426.zip) = fef35003f5d8c10df1deaeab1f70d00825ba376bb837d1f58ffbd5bf35b10a89
+SIZE (flightgear-aircraft/R44_20130426.zip) = 8909152
+SHA256 (flightgear-aircraft/Spitfire_20130310.zip) = cb886772228c4cea6a301b037dad4f9c6ee5afee593c04822369bff422c88ed8
+SIZE (flightgear-aircraft/Spitfire_20130310.zip) = 21052226
 SHA256 (flightgear-aircraft/Stieglitz_20091025.zip) = 05393d31f11bc718bbbe43d539f18020b2ab9ed34b68c6bf7dff8c543b6fb3bd
 SIZE (flightgear-aircraft/Stieglitz_20091025.zip) = 4499810
 SHA256 (flightgear-aircraft/Super-Etendard_20120501.zip) = e89f96034f2ee64f34917a8062e6e87f75674ff7f595be5a884ae4b4904a5eb5
 SIZE (flightgear-aircraft/Super-Etendard_20120501.zip) = 9855236
-SHA256 (flightgear-aircraft/Supermarine-S.6B_20110114.zip) = 0c197f1b2ca811bf40f2fe0fc90dae760ade845659c3af4f96c41ec58f023325
-SIZE (flightgear-aircraft/Supermarine-S.6B_20110114.zip) = 3154967
+SHA256 (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 4222889bf64693630d1a0c9abcaefcc1a61af2529c3a00730f1f6a36bdaba5d4
+SIZE (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 3275253
 SHA256 (flightgear-aircraft/Superwal_20100330.zip) = cd013f6c6ab073cea4c5eef59acb3b51c8a40d47652a3dfcbebfc79c30504384
 SIZE (flightgear-aircraft/Superwal_20100330.zip) = 2654839
-SHA256 (flightgear-aircraft/airwaveXtreme150_July-2012.zip) = 9c20e9bd435c35921003aae82954e7538636710c1f3f0c34665bd670acf33b3e
-SIZE (flightgear-aircraft/airwaveXtreme150_July-2012.zip) = 1208012
-SHA256 (flightgear-aircraft/asw20_20130115.zip) = 3dc1529520d468dd5c357e56637cf3f42f425be757239964a6d6774ddbf9b2b3
-SIZE (flightgear-aircraft/asw20_20130115.zip) = 2576605
-SHA256 (flightgear-aircraft/bf109_20120717.zip) = a34162707163a871cf5456559a3bf0f8a161cbbdb635d395ce924cdd1b2e13ec
-SIZE (flightgear-aircraft/bf109_20120717.zip) = 24201651
+SHA256 (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 12ca13fe06e7ff4e7a2e9bf7971c2397b86a06b2e83f2eb2e21b640edc5ab817
+SIZE (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 1209981
+SHA256 (flightgear-aircraft/asw20_July-2013.zip) = 4c5aeb273f2f9e2ae3f4c2f3bcdc44b1079681fdfbef20e8f669891cccc73064
+SIZE (flightgear-aircraft/asw20_July-2013.zip) = 3588458
+SHA256 (flightgear-aircraft/bf109_20130615.zip) = 1245ba5d1c00a01b74cef208f28f70ffe27f6285f7d52c4ddd901b370e3aca94
+SIZE (flightgear-aircraft/bf109_20130615.zip) = 24201689
 SHA256 (flightgear-aircraft/c310_20130209.zip) = 07d765eac4a6cb9bc115dc4d302fed972776f5148cb1154f666b6a7f3c27543a
 SIZE (flightgear-aircraft/c310_20130209.zip) = 615078
 SHA256 (flightgear-aircraft/dhc3_20120506.zip) = 808215533d23b9e2a23b0249bacff9504b72a8e4263a562058dea9c6060c12f9