Index: head/games/marsnomercy/Makefile
===================================================================
--- head/games/marsnomercy/Makefile	(revision 371454)
+++ head/games/marsnomercy/Makefile	(revision 371455)
@@ -1,59 +1,51 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	marsnomercy
 PORTVERSION=	0.2.1
 PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	SF/mars/mars/${PORTVERSION}
 DISTNAME=	mars-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Turn-based strategy game setting on Mars
 
 BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons
 
 USE_GL=		gl
 USE_SDL=	sdl image ttf
 SCONS_ARGS=	prefix=${PREFIX}
 
-PLIST=		${WRKDIR}/pkg-plist
-PLIST_FILES=	bin/mars-nomercy libexec/mars
-PLIST_DIRS=	%%DATADIR%%
 SUB_FILES=	mars-nomercy pkg-message
 WRKSRC=		${WRKDIR}/mars-${PORTVERSION}
 
+PLIST_FILES=	bin/mars-nomercy libexec/mars
+PORTDATA=	*
+
 OPTIONS_DEFINE=	DEBUG OPENGL
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 SCONS_ARGS+=	debug=1
 .else
 SCONS_ARGS+=	debug=0
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
 SCONS_ARGS+=	with_opengl=1
 .else
 SCONS_ARGS+=	with_opengl=0
 .endif
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} scons ${SCONS_ARGS}
 
-pre-install:
-	@${RM} -f ${PLIST}
-	@cd ${WRKSRC}/data && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
-		${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
-
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@cd ${WRKSRC}/data && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/{}" \;
-	@${INSTALL_SCRIPT} ${WRKDIR}/mars-nomercy ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/mars ${STAGEDIR}${PREFIX}/libexec/mars
+	${INSTALL_SCRIPT} ${WRKDIR}/mars-nomercy ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/mars ${STAGEDIR}${PREFIX}/libexec/mars
+	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	@${RM} -f ${STAGEDIR}${DATADIR}/SConscript
 
 .include <bsd.port.mk>