3 files changed, 77 insertions, 68 deletions

diff --git a/games/trimines/Makefile b/games/trimines/Makefile
index 9b0e8eb2c18c..ceeff20321d8 100644
--- a/games/trimines/Makefile
+++ b/games/trimines/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	trimines
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.3.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.freewebs.com/trimines/
 
@@ -27,7 +26,9 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/trimines ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}
+.for dir in counter menu misc triangles
+	${MKDIR} ${DATADIR}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/data/${dir}/* ${DATADIR}/${dir}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/games/trimines/distinfo b/games/trimines/distinfo
index 0040a8e5083f..81b45628e1b7 100644
--- a/games/trimines/distinfo
+++ b/games/trimines/distinfo
@@ -1,3 +1,3 @@
-MD5 (trimines-1.2.1.tar.gz) = db0fd9b06789fa202d22475170602f83
-SHA256 (trimines-1.2.1.tar.gz) = f140fcea9fc9579e4f2650ca136de5083305cd7a18d8456f47949e2a23001483
-SIZE (trimines-1.2.1.tar.gz) = 83707
+MD5 (trimines-1.3.0.tar.gz) = c7471e77d037997d297f19e1ff808935
+SHA256 (trimines-1.3.0.tar.gz) = 87e6d48b474cf8097c0fac83f700fc098f8f4e65240ceaf0da81b5e644f7d65a
+SIZE (trimines-1.3.0.tar.gz) = 78590
diff --git a/games/trimines/pkg-plist b/games/trimines/pkg-plist
index 19922c3b86d6..b0baf1b1b6ae 100644
--- a/games/trimines/pkg-plist
+++ b/games/trimines/pkg-plist
@@ -1,63 +1,71 @@
 bin/trimines
-%%DATADIR%%/1.bmp
-%%DATADIR%%/10.bmp
-%%DATADIR%%/10_2.bmp
-%%DATADIR%%/11.bmp
-%%DATADIR%%/11_2.bmp
-%%DATADIR%%/12.bmp
-%%DATADIR%%/12_2.bmp
-%%DATADIR%%/1_2.bmp
-%%DATADIR%%/2.bmp
-%%DATADIR%%/2_2.bmp
-%%DATADIR%%/3.bmp
-%%DATADIR%%/3_2.bmp
-%%DATADIR%%/4.bmp
-%%DATADIR%%/4_2.bmp
-%%DATADIR%%/5.bmp
-%%DATADIR%%/5_2.bmp
-%%DATADIR%%/6.bmp
-%%DATADIR%%/6_2.bmp
-%%DATADIR%%/7.bmp
-%%DATADIR%%/7_2.bmp
-%%DATADIR%%/8.bmp
-%%DATADIR%%/8_2.bmp
-%%DATADIR%%/9.bmp
-%%DATADIR%%/9_2.bmp
-%%DATADIR%%/bar.bmp
-%%DATADIR%%/bar2.bmp
-%%DATADIR%%/button.bmp
-%%DATADIR%%/button2.bmp
-%%DATADIR%%/clicked.bmp
-%%DATADIR%%/clicked2.bmp
-%%DATADIR%%/counter_0.bmp
-%%DATADIR%%/counter_1.bmp
-%%DATADIR%%/counter_2.bmp
-%%DATADIR%%/counter_3.bmp
-%%DATADIR%%/counter_4.bmp
-%%DATADIR%%/counter_5.bmp
-%%DATADIR%%/counter_6.bmp
-%%DATADIR%%/counter_7.bmp
-%%DATADIR%%/counter_8.bmp
-%%DATADIR%%/counter_9.bmp
-%%DATADIR%%/counter_clear.bmp
-%%DATADIR%%/counter_m.bmp
-%%DATADIR%%/false.bmp
-%%DATADIR%%/false2.bmp
-%%DATADIR%%/flag.bmp
-%%DATADIR%%/flag2.bmp
-%%DATADIR%%/menu.bmp
-%%DATADIR%%/menu_select.bmp
-%%DATADIR%%/menu_select_clear.bmp
-%%DATADIR%%/mine.bmp
-%%DATADIR%%/mine2.bmp
-%%DATADIR%%/pointer.bmp
-%%DATADIR%%/pointer2.bmp
-%%DATADIR%%/question.bmp
-%%DATADIR%%/question2.bmp
-%%DATADIR%%/redmine.bmp
-%%DATADIR%%/redmine2.bmp
-%%DATADIR%%/smile.bmp
-%%DATADIR%%/smile2.bmp
-%%DATADIR%%/smile3.bmp
-%%DATADIR%%/smile4.bmp
+%%DATADIR%%/counter/counter_0.bmp
+%%DATADIR%%/counter/counter_1.bmp
+%%DATADIR%%/counter/counter_2.bmp
+%%DATADIR%%/counter/counter_3.bmp
+%%DATADIR%%/counter/counter_4.bmp
+%%DATADIR%%/counter/counter_5.bmp
+%%DATADIR%%/counter/counter_6.bmp
+%%DATADIR%%/counter/counter_7.bmp
+%%DATADIR%%/counter/counter_8.bmp
+%%DATADIR%%/counter/counter_9.bmp
+%%DATADIR%%/counter/counter_clear.bmp
+%%DATADIR%%/counter/counter_m.bmp
+%%DATADIR%%/menu/height.bmp
+%%DATADIR%%/menu/menu.bmp
+%%DATADIR%%/menu/mines.bmp
+%%DATADIR%%/menu/newgame.bmp
+%%DATADIR%%/menu/options.bmp
+%%DATADIR%%/menu/quit.bmp
+%%DATADIR%%/menu/width.bmp
+%%DATADIR%%/misc/bar.bmp
+%%DATADIR%%/misc/bar2.bmp
+%%DATADIR%%/misc/pointer.bmp
+%%DATADIR%%/misc/pointer2.bmp
+%%DATADIR%%/misc/smile.bmp
+%%DATADIR%%/misc/smile2.bmp
+%%DATADIR%%/misc/smile3.bmp
+%%DATADIR%%/misc/smile4.bmp
+%%DATADIR%%/triangles/1.bmp
+%%DATADIR%%/triangles/10.bmp
+%%DATADIR%%/triangles/10_2.bmp
+%%DATADIR%%/triangles/11.bmp
+%%DATADIR%%/triangles/11_2.bmp
+%%DATADIR%%/triangles/12.bmp
+%%DATADIR%%/triangles/12_2.bmp
+%%DATADIR%%/triangles/1_2.bmp
+%%DATADIR%%/triangles/2.bmp
+%%DATADIR%%/triangles/2_2.bmp
+%%DATADIR%%/triangles/3.bmp
+%%DATADIR%%/triangles/3_2.bmp
+%%DATADIR%%/triangles/4.bmp
+%%DATADIR%%/triangles/4_2.bmp
+%%DATADIR%%/triangles/5.bmp
+%%DATADIR%%/triangles/5_2.bmp
+%%DATADIR%%/triangles/6.bmp
+%%DATADIR%%/triangles/6_2.bmp
+%%DATADIR%%/triangles/7.bmp
+%%DATADIR%%/triangles/7_2.bmp
+%%DATADIR%%/triangles/8.bmp
+%%DATADIR%%/triangles/8_2.bmp
+%%DATADIR%%/triangles/9.bmp
+%%DATADIR%%/triangles/9_2.bmp
+%%DATADIR%%/triangles/button.bmp
+%%DATADIR%%/triangles/button2.bmp
+%%DATADIR%%/triangles/clicked.bmp
+%%DATADIR%%/triangles/clicked2.bmp
+%%DATADIR%%/triangles/false.bmp
+%%DATADIR%%/triangles/false2.bmp
+%%DATADIR%%/triangles/flag.bmp
+%%DATADIR%%/triangles/flag2.bmp
+%%DATADIR%%/triangles/mine.bmp
+%%DATADIR%%/triangles/mine2.bmp
+%%DATADIR%%/triangles/question.bmp
+%%DATADIR%%/triangles/question2.bmp
+%%DATADIR%%/triangles/redmine.bmp
+%%DATADIR%%/triangles/redmine2.bmp
+@dirrm %%DATADIR%%/counter
+@dirrm %%DATADIR%%/menu
+@dirrm %%DATADIR%%/misc
+@dirrm %%DATADIR%%/triangles
 @dirrm %%DATADIR%%