Update to version 1.7

PR:		ports/106141
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 57 insertions, 52 deletions

diff --git a/games/thudboard/Makefile b/games/thudboard/Makefile
index 8fead3a38cc..3e17dc5b1b3 100644
--- a/games/thudboard/Makefile
+++ b/games/thudboard/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thudboard
-PORTVERSION=	1.5
+PORTVERSION=	1.7
 CATEGORIES=	games
 MASTER_SITES=	http://www.million.nl/file/
 
@@ -14,28 +14,27 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Discworld Boardgame Board
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_SITELIBDIR}/_xmlplus/sax/__init__.py:${PORTSDIR}/textproc/py-xml
+		${PYXML}
 
+NO_WRKSUBDIR=	yes
 USE_PYTHON=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 do-configure:
 	@${SED} -e "s#%%PREFIX%%#${PREFIX}# ; s#%%PYTHON_CMD%%#${PYTHON_CMD}#" \
 		${FILESDIR}/thudboard > ${WRKDIR}/thudboard.tmp
 
 do-build:
-	@${FIND} ${WRKSRC} -name "*.pyc" | ${XARGS} ${RM}
-	@${FIND} ${WRKSRC} \( -type f -or -type l \) | ${XARGS} ${CHMOD} 644
-	@${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} 755
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} 2>/dev/null
 
 do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/thudboard.tmp ${PREFIX}/bin/thudboard
 	@${MKDIR} ${DATADIR}
-	@${TAR} -C ${WRKSRC} --exclude="*.py.orig" --exclude="docs*" -cf - . | ${TAR} -C ${DATADIR} --unlink -xf -
-	@${INSTALL_SCRIPT} ${WRKDIR}/thudboard.tmp ${PREFIX}/bin/thudboard
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${TAR} -C ${WRKSRC}/docs/ -cf - . | ${TAR} -C ${DOCSDIR} --unlink -xf -
-.endif
+	${INSTALL_DATA} ${WRKSRC}/*.py ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pyc ${DATADIR}
+	@${TAR} -C ${WRKSRC} -cf - docs koomvalley img | \
+		${TAR} -C ${DATADIR} --unlink -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+	@${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+	@${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx
+
 .include <bsd.port.mk>
diff --git a/games/thudboard/distinfo b/games/thudboard/distinfo
index 782636dd66c..9b075523ca5 100644
--- a/games/thudboard/distinfo
+++ b/games/thudboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (thudboard-1.5.tar.gz) = 5cec7935baa293ecd0de3071d2babb31
-SHA256 (thudboard-1.5.tar.gz) = d832392817f217511d1c688cb0aa9a4dd3670a8873204e1950d29d5bfad4655f
-SIZE (thudboard-1.5.tar.gz) = 880819
+MD5 (thudboard-1.7.tar.gz) = e514eac57a7807826fdf2572533d215f
+SHA256 (thudboard-1.7.tar.gz) = 19b7390b18cc570eeec4f60da73d41752ece08eb18893985ab5b377f71ce22a0
+SIZE (thudboard-1.7.tar.gz) = 903876
diff --git a/games/thudboard/pkg-plist b/games/thudboard/pkg-plist
index 1d56205c2ca..e8335f0330f 100644
--- a/games/thudboard/pkg-plist
+++ b/games/thudboard/pkg-plist
@@ -1,65 +1,71 @@
 bin/thudboard
 %%DATADIR%%/battle.py
-%%DATADIR%%/skins.py
+%%DATADIR%%/battle.pyc
+%%DATADIR%%/bugfix_askyesno.py
+%%DATADIR%%/bugfix_askyesno.pyc
+%%DATADIR%%/docs/about.html
+%%DATADIR%%/docs/download.html
+%%DATADIR%%/docs/howto.html
+%%DATADIR%%/docs/img/battleline.gif
+%%DATADIR%%/docs/img/bcktile.gif
+%%DATADIR%%/docs/img/copyicon.gif
+%%DATADIR%%/docs/img/dwarf.gif
+%%DATADIR%%/docs/img/filemenu.gif
+%%DATADIR%%/docs/img/helpmenu.gif
+%%DATADIR%%/docs/img/moveinprogress.gif
+%%DATADIR%%/docs/img/movepiece.gif
+%%DATADIR%%/docs/img/optionsmenu.gif
+%%DATADIR%%/docs/img/pasteicon.gif
+%%DATADIR%%/docs/img/quicksavemenu.gif
+%%DATADIR%%/docs/img/quit.gif
+%%DATADIR%%/docs/img/rock.gif
+%%DATADIR%%/docs/img/selectname.gif
+%%DATADIR%%/docs/img/singleline.gif
+%%DATADIR%%/docs/img/thudpreview.gif
+%%DATADIR%%/docs/img/thudscreen.jpg
+%%DATADIR%%/docs/img/thudscroll.gif
+%%DATADIR%%/docs/img/troll.gif
+%%DATADIR%%/docs/img/valid-xhtml11.gif
+%%DATADIR%%/docs/img/vcss.gif
+%%DATADIR%%/docs/index.html
+%%DATADIR%%/docs/thudboard.css
 %%DATADIR%%/img/banner.gif
 %%DATADIR%%/img/bcktile.gif
 %%DATADIR%%/img/board-grid.gif
 %%DATADIR%%/img/board.gif
+%%DATADIR%%/img/capture.gif
 %%DATADIR%%/img/check.gif
 %%DATADIR%%/img/colors
 %%DATADIR%%/img/copy.gif
 %%DATADIR%%/img/down.gif
 %%DATADIR%%/img/dwarf.gif
+%%DATADIR%%/img/endmove.gif
 %%DATADIR%%/img/info.gif
 %%DATADIR%%/img/list.gif
 %%DATADIR%%/img/lock.gif
+%%DATADIR%%/img/move.gif
 %%DATADIR%%/img/noclip.gif
 %%DATADIR%%/img/nopaste.gif
 %%DATADIR%%/img/paste.gif
-%%DATADIR%%/img/score.gif
 %%DATADIR%%/img/rock.gif
+%%DATADIR%%/img/score.gif
 %%DATADIR%%/img/submenubottom.gif
 %%DATADIR%%/img/submenuitem.gif
 %%DATADIR%%/img/submenusep.gif
 %%DATADIR%%/img/submenutop.gif
 %%DATADIR%%/img/thudtitle.gif
 %%DATADIR%%/img/troll.gif
-%%DATADIR%%/thud.ico
-%%DATADIR%%/thud.py
-%%DATADIR%%/battle.pyc
+%%DATADIR%%/koomvalley/koomvalley.thud
+%%DATADIR%%/setup.py
+%%DATADIR%%/setup.pyc
+%%DATADIR%%/skins.py
 %%DATADIR%%/skins.pyc
+%%DATADIR%%/texts.py
+%%DATADIR%%/texts.pyc
+%%DATADIR%%/thud.py
 %%DATADIR%%/thud.pyc
-%%DATADIR%%/bugfix_askyesno.py
-%%DATADIR%%/bugfix_askyesno.pyc
-%%DATADIR%%/koomvalley/koomvalley.thud
-%%PORTDOCS%%%%DOCSDIR%%/about.html
-%%PORTDOCS%%%%DOCSDIR%%/download.html
-%%PORTDOCS%%%%DOCSDIR%%/howto.html
-%%PORTDOCS%%%%DOCSDIR%%/img/battleline.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/bcktile.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/copyicon.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/dwarf.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/filemenu.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/helpmenu.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/moveinprogress.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/movepiece.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/optionsmenu.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/pasteicon.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/quicksavemenu.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/quit.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/selectname.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/singleline.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/rock.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/thudpreview.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/thudscreen.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/thudscroll.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/troll.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/valid-xhtml11.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/vcss.gif
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/thudboard.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/img
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/img
 @dirrm %%DATADIR%%/koomvalley
+@dirrm %%DATADIR%%/docs/img
+@dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%