3 files changed, 111 insertions, 8 deletions

diff --git a/games/jag/Makefile b/games/jag/Makefile
index 6ebe70cc2a8e..ea51e3cf26ce 100644
--- a/games/jag/Makefile
+++ b/games/jag/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	jag
-PORTVERSION=	0.2.6
-PORTREVISION=	3
+PORTVERSION=	0.3.2
 CATEGORIES=	games
 MASTER_SITES=	http://jag.xlabsoft.com/files/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME:C/src/data/}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	2d arcade-puzzle game like KDiamonds
@@ -24,15 +25,17 @@ QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build \
 		corelib svg xml opengl network
 MAKE_JOBS_SAFE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/jag
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/games/jag|${DATADIR}|' \
-		${WRKSRC}/gamewidget.cpp ${WRKSRC}/Game.pro
+		${WRKSRC}/main.cpp ${WRKSRC}/Game.pro
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Game.pro
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} ${QMAKEFLAGS} Game.pro
 
+post-install:
+	${MKDIR} ${DATADIR}
+	cd ${WRKDIR}/${DISTNAME:C/src/data/} && ${COPYTREE_SHARE} data ${DATADIR}/
+
 .include <bsd.port.mk>
diff --git a/games/jag/distinfo b/games/jag/distinfo
index fad00bdf1302..107e4aac0dba 100644
--- a/games/jag/distinfo
+++ b/games/jag/distinfo
@@ -1,2 +1,4 @@
-SHA256 (jag-0.2.6-src.zip) = edc7787f95ef4f294bf44849c1bd504a9ef3819c3e38b8848346112bebd6c402
-SIZE (jag-0.2.6-src.zip) = 2712676
+SHA256 (jag-0.3.2-src.zip) = 0b1fc46373d7b70bdd359ca93e553bc244a49721fa1a18d5225c5e887b54ca44
+SIZE (jag-0.3.2-src.zip) = 995053
+SHA256 (jag-0.3.2-data.zip) = d331b8b1ec20068de0f35d7747b3e4eb4567f505568c3d8621884d2ca46b6d22
+SIZE (jag-0.3.2-data.zip) = 6237911
diff --git a/games/jag/pkg-plist b/games/jag/pkg-plist
index 3129e249d1e5..7ba44d233bbe 100644
--- a/games/jag/pkg-plist
+++ b/games/jag/pkg-plist
@@ -7,11 +7,58 @@ bin/jag
 %%DATADIR%%/data/bonus/score.png
 %%DATADIR%%/data/bonus/timer.png
 %%DATADIR%%/data/bonus/x.png
+%%DATADIR%%/data/help/index.htm
+%%DATADIR%%/data/help/index_nl.htm
+%%DATADIR%%/data/help/index_ru.htm
+%%DATADIR%%/data/lang/jag_de.qm
+%%DATADIR%%/data/lang/jag_de.ts
+%%DATADIR%%/data/lang/jag_fr.qm
+%%DATADIR%%/data/lang/jag_fr.ts
+%%DATADIR%%/data/lang/jag_it.qm
+%%DATADIR%%/data/lang/jag_it.ts
+%%DATADIR%%/data/lang/jag_nl.qm
+%%DATADIR%%/data/lang/jag_nl.ts
 %%DATADIR%%/data/lang/jag_ru.qm
 %%DATADIR%%/data/lang/jag_ru.ts
 %%DATADIR%%/data/lang/langlist.dat
+%%DATADIR%%/data/levels/abc.lpk
 %%DATADIR%%/data/levels/default.lpk
 %%DATADIR%%/data/levels/sunzero.lpk
+%%DATADIR%%/data/schemes/african/bg1.jpg
+%%DATADIR%%/data/schemes/african/bg2.jpg
+%%DATADIR%%/data/schemes/african/bg3.jpg
+%%DATADIR%%/data/schemes/african/item1.png
+%%DATADIR%%/data/schemes/african/item2.png
+%%DATADIR%%/data/schemes/african/item3.png
+%%DATADIR%%/data/schemes/african/item4.png
+%%DATADIR%%/data/schemes/african/item5.png
+%%DATADIR%%/data/schemes/animals/bg1.jpg
+%%DATADIR%%/data/schemes/animals/bg2.jpg
+%%DATADIR%%/data/schemes/animals/bg3.jpg
+%%DATADIR%%/data/schemes/animals/item1.png
+%%DATADIR%%/data/schemes/animals/item2.png
+%%DATADIR%%/data/schemes/animals/item3.png
+%%DATADIR%%/data/schemes/animals/item4.png
+%%DATADIR%%/data/schemes/animals/item5.png
+%%DATADIR%%/data/schemes/animals/item6.png
+%%DATADIR%%/data/schemes/chinese/bg1.jpg
+%%DATADIR%%/data/schemes/chinese/bg2.jpg
+%%DATADIR%%/data/schemes/chinese/bg3.jpg
+%%DATADIR%%/data/schemes/chinese/item1.png
+%%DATADIR%%/data/schemes/chinese/item2.png
+%%DATADIR%%/data/schemes/chinese/item3.png
+%%DATADIR%%/data/schemes/chinese/item4.png
+%%DATADIR%%/data/schemes/chinese/item5.png
+%%DATADIR%%/data/schemes/chinese/item6.png
+%%DATADIR%%/data/schemes/creatures/bg1.jpg
+%%DATADIR%%/data/schemes/creatures/bg2.jpg
+%%DATADIR%%/data/schemes/creatures/bg3.jpg
+%%DATADIR%%/data/schemes/creatures/item1.png
+%%DATADIR%%/data/schemes/creatures/item2.png
+%%DATADIR%%/data/schemes/creatures/item3.png
+%%DATADIR%%/data/schemes/creatures/item4.png
+%%DATADIR%%/data/schemes/creatures/item5.png
+%%DATADIR%%/data/schemes/creatures/item6.png
 %%DATADIR%%/data/schemes/default/bg1.jpg
 %%DATADIR%%/data/schemes/default/bg2.jpg
 %%DATADIR%%/data/schemes/default/bg3.jpg
@@ -30,6 +77,49 @@ bin/jag
 %%DATADIR%%/data/schemes/default/item6.png
 %%DATADIR%%/data/schemes/default/target1.png
 %%DATADIR%%/data/schemes/default/target2.png
+%%DATADIR%%/data/schemes/futurama/bg1.jpg
+%%DATADIR%%/data/schemes/futurama/bg2.jpg
+%%DATADIR%%/data/schemes/futurama/bg3.jpg
+%%DATADIR%%/data/schemes/futurama/item1.png
+%%DATADIR%%/data/schemes/futurama/item2.png
+%%DATADIR%%/data/schemes/futurama/item3.png
+%%DATADIR%%/data/schemes/futurama/item4.png
+%%DATADIR%%/data/schemes/futurama/item5.png
+%%DATADIR%%/data/schemes/futurama/item6.png
+%%DATADIR%%/data/schemes/kde-crystal/bg1.jpg
+%%DATADIR%%/data/schemes/kde-crystal/bg2.jpg
+%%DATADIR%%/data/schemes/kde-crystal/bg3.jpg
+%%DATADIR%%/data/schemes/kde-crystal/bg4.jpg
+%%DATADIR%%/data/schemes/kde-crystal/block1.png
+%%DATADIR%%/data/schemes/kde-crystal/block2.png
+%%DATADIR%%/data/schemes/kde-crystal/item1.png
+%%DATADIR%%/data/schemes/kde-crystal/item2.png
+%%DATADIR%%/data/schemes/kde-crystal/item3.png
+%%DATADIR%%/data/schemes/kde-crystal/item4.png
+%%DATADIR%%/data/schemes/kde-crystal/item5.png
+%%DATADIR%%/data/schemes/kde-crystal/item6.png
+%%DATADIR%%/data/schemes/kde-crystal/target1.png
+%%DATADIR%%/data/schemes/kde-crystal/target2.png
+%%DATADIR%%/data/schemes/kde-nuvola/bg1.jpg
+%%DATADIR%%/data/schemes/kde-nuvola/bg2.jpg
+%%DATADIR%%/data/schemes/kde-nuvola/bg3.jpg
+%%DATADIR%%/data/schemes/kde-nuvola/bg4.jpg
+%%DATADIR%%/data/schemes/kde-nuvola/bg5.jpg
+%%DATADIR%%/data/schemes/kde-nuvola/item1.png
+%%DATADIR%%/data/schemes/kde-nuvola/item2.png
+%%DATADIR%%/data/schemes/kde-nuvola/item3.png
+%%DATADIR%%/data/schemes/kde-nuvola/item4.png
+%%DATADIR%%/data/schemes/kde-nuvola/item5.png
+%%DATADIR%%/data/schemes/kde-nuvola/item6.png
+%%DATADIR%%/data/schemes/toys/bg1.jpg
+%%DATADIR%%/data/schemes/toys/bg2.jpg
+%%DATADIR%%/data/schemes/toys/bg3.jpg
+%%DATADIR%%/data/schemes/toys/item1.png
+%%DATADIR%%/data/schemes/toys/item2.png
+%%DATADIR%%/data/schemes/toys/item3.png
+%%DATADIR%%/data/schemes/toys/item4.png
+%%DATADIR%%/data/schemes/toys/item5.png
+%%DATADIR%%/data/schemes/toys/item6.png
 %%DATADIR%%/data/sounds/beep.wav
 %%DATADIR%%/data/sounds/bighammer.wav
 %%DATADIR%%/data/sounds/bomb.wav
@@ -62,11 +152,19 @@ bin/jag
 %%DATADIR%%/data/tools/unblock.png
 @dirrm %%DATADIR%%/data/tools
 @dirrm %%DATADIR%%/data/sounds
+@dirrm %%DATADIR%%/data/schemes/toys
+@dirrm %%DATADIR%%/data/schemes/kde-nuvola
+@dirrm %%DATADIR%%/data/schemes/kde-crystal
+@dirrm %%DATADIR%%/data/schemes/futurama
 @dirrm %%DATADIR%%/data/schemes/default
+@dirrm %%DATADIR%%/data/schemes/creatures
+@dirrm %%DATADIR%%/data/schemes/chinese
+@dirrm %%DATADIR%%/data/schemes/animals
+@dirrm %%DATADIR%%/data/schemes/african
 @dirrm %%DATADIR%%/data/schemes
-@dirrm %%DATADIR%%/data/music
 @dirrm %%DATADIR%%/data/levels
 @dirrm %%DATADIR%%/data/lang
+@dirrm %%DATADIR%%/data/help
 @dirrm %%DATADIR%%/data/bonus
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%