Index: head/games/lmarbles/Makefile
===================================================================
--- head/games/lmarbles/Makefile	(revision 377854)
+++ head/games/lmarbles/Makefile	(revision 377855)
@@ -1,56 +1,45 @@
 # Created by: verm@drunkmonk.net
 # $FreeBSD$
 
 PORTNAME=	lmarbles
 PORTVERSION=	1.0.8
 PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF/lgames/${PORTNAME} \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Atomix-like game of moving marbles in puzzles
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
 USE_SDL=	sdl mixer
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${ETCDIR}
+CONFIGURE_ARGS=	--localstatedir=/var/games/${PORTNAME}
 
 PORTDOCS=	*
 
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	AUTHORS ChangeLog README README-SDL.txt
-
-DOCSRCDIR2=	${WRKSRC}/src/manual
-DOCSDIR2=	${DOCSDIR}/manual
-DOC_FILES2=	*.jpg *.html
-
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(datadir)/icons|(datadir)/pixmaps|; \
-	s|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|' \
+		s|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-m 666||; \
 		s|lmarbles.prfs|lmarbles.prfs.sample|' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|icons/lmarbles48.gif|icons/lmarbles48.png|' \
 		${WRKSRC}/lmarbles.desktop.in
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-	@${CHMOD} -R 464 ${STAGEDIR}${ETCDIR}/lmarbles.prfs.sample
-	@${CHOWN} root:games ${STAGEDIR}${ETCDIR}/lmarbles.prfs.sample
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog README README-SDL.txt" ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/src && ${COPYTREE_SHARE} "manual" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/lmarbles/pkg-plist
===================================================================
--- head/games/lmarbles/pkg-plist	(revision 377854)
+++ head/games/lmarbles/pkg-plist	(revision 377855)
@@ -1,82 +1,73 @@
-bin/lmarbles
-@unexec if cmp -s %D/%%ETCDIR%%/lmarbles.prfs.sample %D/%%ETCDIR%%/lmarbles.prfs ; then rm -f %D/%%ETCDIR%%/lmarbles.prfs ; fi
-%%ETCDIR%%/lmarbles.prfs.sample
-@exec if [ ! -f %D/%%ETCDIR%%/lmarbles.prfs ] ; then cp -p %D/%F %B/lmarbles.prfs ; fi
+@(,games,2755) bin/lmarbles
 man/man6/lmarbles.6.gz
 share/applications/lmarbles.desktop
 %%DATADIR%%/gfx/board.bmp
 %%DATADIR%%/gfx/f_red.bmp
 %%DATADIR%%/gfx/f_small.bmp
 %%DATADIR%%/gfx/f_white.bmp
 %%DATADIR%%/gfx/f_yellow.bmp
 %%DATADIR%%/gfx/figure.bmp
 %%DATADIR%%/gfx/lights.bmp
 %%DATADIR%%/gfx/logo.bmp
 %%DATADIR%%/gfx/m_frame.bmp
 %%DATADIR%%/gfx/m_sframe.bmp
 %%DATADIR%%/gfx/marbles.bmp
 %%DATADIR%%/gfx/metal/arrow_d.bmp
 %%DATADIR%%/gfx/metal/arrow_l.bmp
 %%DATADIR%%/gfx/metal/arrow_r.bmp
 %%DATADIR%%/gfx/metal/arrow_u.bmp
 %%DATADIR%%/gfx/metal/background.bmp
 %%DATADIR%%/gfx/metal/barrier_lr.bmp
 %%DATADIR%%/gfx/metal/barrier_ud.bmp
 %%DATADIR%%/gfx/metal/floor.bmp
 %%DATADIR%%/gfx/metal/teleport0.bmp
 %%DATADIR%%/gfx/metal/teleport1.bmp
 %%DATADIR%%/gfx/metal/teleport2.bmp
 %%DATADIR%%/gfx/metal/teleport3.bmp
 %%DATADIR%%/gfx/metal/wall.bmp
 %%DATADIR%%/gfx/metal/wall_crumble.bmp
 %%DATADIR%%/gfx/stone/arrow_d.bmp
 %%DATADIR%%/gfx/stone/arrow_l.bmp
 %%DATADIR%%/gfx/stone/arrow_r.bmp
 %%DATADIR%%/gfx/stone/arrow_u.bmp
 %%DATADIR%%/gfx/stone/background.bmp
 %%DATADIR%%/gfx/stone/barrier_lr.bmp
 %%DATADIR%%/gfx/stone/barrier_ud.bmp
 %%DATADIR%%/gfx/stone/floor.bmp
 %%DATADIR%%/gfx/stone/teleport0.bmp
 %%DATADIR%%/gfx/stone/teleport1.bmp
 %%DATADIR%%/gfx/stone/teleport2.bmp
 %%DATADIR%%/gfx/stone/teleport3.bmp
 %%DATADIR%%/gfx/stone/wall.bmp
 %%DATADIR%%/gfx/stone/wall_crumble.bmp
 %%DATADIR%%/gfx/tiny.sdlfnt
 %%DATADIR%%/gfx/title.bmp
 %%DATADIR%%/gfx/win_icon.bmp
 %%DATADIR%%/gfx/wood/arrow_d.bmp
 %%DATADIR%%/gfx/wood/arrow_l.bmp
 %%DATADIR%%/gfx/wood/arrow_r.bmp
 %%DATADIR%%/gfx/wood/arrow_u.bmp
 %%DATADIR%%/gfx/wood/background.bmp
 %%DATADIR%%/gfx/wood/barrier_lr.bmp
 %%DATADIR%%/gfx/wood/barrier_ud.bmp
 %%DATADIR%%/gfx/wood/floor.bmp
 %%DATADIR%%/gfx/wood/teleport0.bmp
 %%DATADIR%%/gfx/wood/teleport1.bmp
 %%DATADIR%%/gfx/wood/teleport2.bmp
 %%DATADIR%%/gfx/wood/teleport3.bmp
 %%DATADIR%%/gfx/wood/wall.bmp
 %%DATADIR%%/gfx/wood/wall_crumble.bmp
 %%DATADIR%%/levels/Original
 %%DATADIR%%/sounds/alarm.wav
 %%DATADIR%%/sounds/arrow.wav
 %%DATADIR%%/sounds/click.wav
 %%DATADIR%%/sounds/explode.wav
 %%DATADIR%%/sounds/score.wav
 %%DATADIR%%/sounds/select.wav
 %%DATADIR%%/sounds/stop.wav
 %%DATADIR%%/sounds/teleport.wav
 share/pixmaps/lmarbles32.png
 share/pixmaps/lmarbles48.gif
 share/pixmaps/lmarbles48.png
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%/gfx/wood
-@dirrm %%DATADIR%%/gfx/stone
-@dirrm %%DATADIR%%/gfx/metal
-@dirrm %%DATADIR%%/gfx
-@dirrm %%DATADIR%%
-@dirrmtry %%ETCDIR%%
+@sample(,games,664) /var/games/lmarbles/lmarbles.prfs.sample
+@dir /var/games/lmarbles