Index: head/games/magicor/Makefile
===================================================================
--- head/games/magicor/Makefile	(revision 368896)
+++ head/games/magicor/Makefile	(revision 368897)
@@ -1,69 +1,69 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	magicor
 PORTVERSION=	1.1
 PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-data-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Old-school, puzzle game similar to Solomon's Key
 
 LICENSE=	unknown
 LICENSE_NAME=	Public Domain
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
 
-USE_PYTHON=	yes
+USES=		python
 NO_BUILD=	yes
 
 PORTDOCS=	*
 PORTDATA=	*
 
 DESKTOP_ENTRIES="Magicor" \
 		"Old-school, puzzle game similar to Solomon's Key" \
 		"" \
 		"${PORTNAME}" \
 		"Game;LogicGame;" \
 		false
 
 OPTIONS_DEFINE=	EDITOR DOCS
 OPTIONS_DEFAULT=EDITOR
 OPTIONS_SUB=	yes
 
 EDITOR_DESC=	Enable editor
 EDITOR_RUN_DEPEND=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|###CONFIG_PATH###|${PREFIX}/etc/magicor/magicor.conf|' \
 		${WRKSRC}/Magicor.py
 	@${REINPLACE_CMD} -e 's|###CONFIG_PATH###|${PREFIX}/etc/magicor/magicor-editor.conf|' \
 		${WRKSRC}/Magicor-LevelEditor.py
 	@${REINPLACE_CMD} -e '1,1 s|/usr/bin/python|/usr/bin/env python|' \
 		${WRKSRC}/Magicor.py ${WRKSRC}/Magicor-LevelEditor.py
 	@${REINPLACE_CMD} -e 's|###SHARE_PATH###|${DATADIR}|' ${WRKSRC}/etc/*.conf
 	@${FIND} ${WRKSRC}/magicor -name "*.pyc" -delete
 
 do-install:
 	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
 	cd ${WRKSRC}/magicor && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/magicor/
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/magicor
 	${INSTALL_SCRIPT} ${WRKSRC}/Magicor.py ${STAGEDIR}${PREFIX}/bin/magicor
 	${INSTALL_DATA} ${WRKSRC}/etc/magicor.conf \
 		${STAGEDIR}${PREFIX}/etc/magicor/magicor.conf.dist
 .if ${PORT_OPTIONS:MEDITOR}
 	${INSTALL_SCRIPT} ${WRKSRC}/Magicor-LevelEditor.py ${STAGEDIR}${PREFIX}/bin/magicor-editor
 	${INSTALL_DATA} ${WRKSRC}/etc/magicor-editor.conf \
 		${STAGEDIR}${PREFIX}/etc/magicor/magicor-editor.conf.dist
 .endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/games/magicor/pkg-plist
===================================================================
--- head/games/magicor/pkg-plist	(revision 368896)
+++ head/games/magicor/pkg-plist	(revision 368897)
@@ -1,35 +1,30 @@
 bin/magicor
 @unexec if cmp -s %D/etc/magicor/magicor.conf.dist %D/etc/magicor/magicor.conf; then rm -f %D/etc/magicor/magicor.conf; fi
 etc/magicor/magicor.conf.dist
 @exec if [ ! -f %B/magicor.conf ]; then cp -p %D/%F %B/magicor.conf; fi
 %%EDITOR%%bin/magicor-editor
 %%EDITOR%%@unexec if cmp -s %D/etc/magicor/magicor-editor.conf.dist %D/etc/magicor/magicor-editor.conf; then rm -f %D/etc/magicor/magicor-editor.conf; fi
 %%EDITOR%%etc/magicor/magicor-editor.conf.dist
 %%EDITOR%%@exec if [ ! -f %B/magicor-editor.conf ]; then cp -p %D/%F %B/magicor-editor.conf; fi
 %%PYTHON_SITELIBDIR%%/magicor/__init__.py
 %%PYTHON_SITELIBDIR%%/magicor/editor/__init__.py
 %%PYTHON_SITELIBDIR%%/magicor/editor/brushes.py
 %%PYTHON_SITELIBDIR%%/magicor/editor/gtkgui.py
 %%PYTHON_SITELIBDIR%%/magicor/level.py
 %%PYTHON_SITELIBDIR%%/magicor/resources.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/__init__.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/blocks.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/decorations.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/enemies.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/fires.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/lights.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/misc.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/player.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/seekers.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/stones.py
 %%PYTHON_SITELIBDIR%%/magicor/sprites/world.py
 %%PYTHON_SITELIBDIR%%/magicor/states/__init__.py
 %%PYTHON_SITELIBDIR%%/magicor/states/intro.py
 %%PYTHON_SITELIBDIR%%/magicor/states/options.py
 %%PYTHON_SITELIBDIR%%/magicor/states/play.py
 %%PYTHON_SITELIBDIR%%/magicor/states/title.py
-@dirrm %%PYTHON_SITELIBDIR%%/magicor/states
-@dirrm %%PYTHON_SITELIBDIR%%/magicor/sprites
-@dirrm %%PYTHON_SITELIBDIR%%/magicor/editor
-@dirrm %%PYTHON_SITELIBDIR%%/magicor
-@dirrmtry etc/magicor