Index: head/games/monsterz/Makefile
===================================================================
--- head/games/monsterz/Makefile	(revision 408698)
+++ head/games/monsterz/Makefile	(revision 408699)
@@ -1,56 +1,58 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	monsterz
 PORTVERSION=	0.7.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	http://sam.zoy.org/monsterz/ \
 		SF/nemysisfreebsdp/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Monsterz - arcade puzzle game
 
 LICENSE=	WTFPL
 LICENSE_NAME=	Do What The [expletive] You Want To Public License, Version 2
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	${PYGAME}
 
 USES=		python
 MAKE_ENV=	prefix=${PREFIX}
 
 PORTDOCS=	AUTHORS README TODO
 
 SCOREDIR=	/var/games
 PLIST_SUB=	SCOREDIR=${SCOREDIR}
 
 DESKTOP_ENTRIES="Monsterz" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" false
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+pre-configure:
+	${REINPLACE_CMD} '/test -f/ s|scorefile)|&.sample|g' \
+		${WRKSRC}/Makefile
 
 post-install:
 .for d in graphics sound
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${DATADIR}
 	(cd ${STAGEDIR}${PREFIX}	\
 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DATADIR}	\
 		-f ${DATADIR:S;${PREFIX}/;;}	\
 	&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${DATADIR}\
 		-f ${DATADIR:S;${PREFIX}/;;})
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/monsterz
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
Index: head/games/monsterz/pkg-plist
===================================================================
--- head/games/monsterz/pkg-plist	(revision 408698)
+++ head/games/monsterz/pkg-plist	(revision 408699)
@@ -1,34 +1,26 @@
-@group games
-@mode 2555
-bin/monsterz
-@mode
-@group
+@(,games,2555) bin/monsterz
 %%DATADIR%%/graphics/background.png
 %%DATADIR%%/graphics/bigtiles.png
 %%DATADIR%%/graphics/board.png
 %%DATADIR%%/graphics/graphics.svg
 %%DATADIR%%/graphics/icon.png
 %%DATADIR%%/graphics/logo.png
 %%DATADIR%%/graphics/pattern.png
 %%DATADIR%%/graphics/tiles.png
 %%DATADIR%%/monsterz.py
 %%DATADIR%%/monsterz.pyc
 %%DATADIR%%/monsterz.pyo
 %%DATADIR%%/sound/applause.wav
 %%DATADIR%%/sound/boing.wav
 %%DATADIR%%/sound/click.wav
 %%DATADIR%%/sound/ding.wav
 %%DATADIR%%/sound/duh.wav
 %%DATADIR%%/sound/grunt.wav
 %%DATADIR%%/sound/laugh.wav
 %%DATADIR%%/sound/music.s3m
 %%DATADIR%%/sound/pop.wav
 %%DATADIR%%/sound/warning.wav
 %%DATADIR%%/sound/whip.wav
 share/pixmaps/monsterz.png
-@dirrm %%DATADIR%%/sound
-@dirrm %%DATADIR%%/graphics
-@dirrm %%DATADIR%%
-@exec if [ ! -e %%SCOREDIR%% ] ; then mkdir -p -m 775 %%SCOREDIR%% ; fi
-@unexec if [ ! -s %%SCOREDIR%%/monsterz ] ; then rm -f %%SCOREDIR%%/monsterz && rm -r %%SCOREDIR%% || true ; fi
-@exec [ -e %%SCOREDIR%%/monsterz ] || touch %%SCOREDIR%%/monsterz && chmod 664 %%SCOREDIR%%/monsterz && chgrp games %%SCOREDIR%%/monsterz
+@sample(,games,664) %%SCOREDIR%%/monsterz.sample
+@dir(,,775) %%SCOREDIR%%