Index: head/games/moria/Makefile
===================================================================
--- head/games/moria/Makefile	(revision 405470)
+++ head/games/moria/Makefile	(revision 405471)
@@ -1,34 +1,35 @@
 # Created by: glewis@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	moria
 PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/games/moria/source/ \
 		ftp://ftp.greyhelm.com/pub/Games/Moria/source/
 DISTNAME=	um${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dungeon exploration game
 
 USES=		alias
 WRKSRC=		${WRKDIR}/umoria
 ALL_TARGET=	moria
 MAKE_ENV+=	DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}" TOUCH="${TOUCH}" \
 		STAGEDIR="${STAGEDIR}" DATADIR="${DATADIR}"
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 do-configure:
 	${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:g" ${WRKSRC}/source/config.h
 	cd ${WRKSRC} && ${LN} -sf source/* unix/* .
 
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
+post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/moria.6 ${STAGEDIR}${PREFIX}/man/man6/
+
+post-install-DOCS-on:
 	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
 
 .include <bsd.port.mk>
Index: head/games/moria/pkg-plist
===================================================================
--- head/games/moria/pkg-plist	(revision 405470)
+++ head/games/moria/pkg-plist	(revision 405471)
@@ -1,21 +1,17 @@
 @owner games
 @group games
-@mode 4711
-bin/moria
+@(,,4711) bin/moria
 @mode 444
 %%DATADIR%%/hours
 %%DATADIR%%/news
 %%DATADIR%%/origcmds.hlp
 %%DATADIR%%/owizcmds.hlp
 %%DATADIR%%/roglcmds.hlp
 %%DATADIR%%/rwizcmds.hlp
-@mode 644
-%%DATADIR%%/scores
-@mode 444
+@(,,644) %%DATADIR%%/scores
 %%DATADIR%%/version.hlp
 %%DATADIR%%/welcome.hlp
 @owner
 @group
 @mode
 man/man6/moria.6.gz
-@dirrm %%DATADIR%%