5 files changed, 372 insertions, 0 deletions

diff --git a/games/Makefile b/games/Makefile
index c0e57c2dc5df..fb60853c6ce4 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -470,6 +470,7 @@
     SUBDIR += madbomber
     SUBDIR += maelstrom
     SUBDIR += magiccube4d
+    SUBDIR += magicor
     SUBDIR += mahjong
     SUBDIR += maitretarot
     SUBDIR += mangband
diff --git a/games/magicor/Makefile b/games/magicor/Makefile
new file mode 100644
index 000000000000..2ee77ac3845e
--- /dev/null
+++ b/games/magicor/Makefile
@@ -0,0 +1,74 @@
+# New ports collection makefile for:	magicor
+# Date created:		09 Jul 2008
+# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	magicor
+PORTVERSION=	1.1
+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
+
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+
+USE_PYTHON=	yes
+NO_BUILD=	yes
+
+PORTDOCS=	README
+
+OPTIONS=	EDITOR	"Enable editor"	on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_EDITOR)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk2
+PLIST_SUB+=	EDITOR=""
+.else
+PLIST_SUB+=	EDITOR="@comment "
+.endif
+
+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:
+	${MKDIR} ${DATADIR}
+	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}
+	mkdir ${PYTHON_SITELIBDIR}/magicor
+	cd ${WRKSRC}/magicor && ${COPYTREE_SHARE} . ${PYTHON_SITELIBDIR}/magicor
+	${MKDIR} ${PREFIX}/etc/magicor
+	${INSTALL_SCRIPT} ${WRKSRC}/Magicor.py ${PREFIX}/bin/magicor
+	${INSTALL_DATA} ${WRKSRC}/etc/magicor.conf \
+		${PREFIX}/etc/magicor/magicor.conf.dist
+	if [ ! -f ${PREFIX}/etc/magicor/magicor.conf ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/magicor/magicor.conf.dist \
+			${PREFIX}/etc/magicor/magicor.conf; \
+	fi
+.if !defined(WITHOUT_EDITOR)
+	${INSTALL_SCRIPT} ${WRKSRC}/Magicor-LevelEditor.py ${PREFIX}/bin/magicor-editor
+	${INSTALL_DATA} ${WRKSRC}/etc/magicor-editor.conf \
+		${PREFIX}/etc/magicor/magicor-editor.conf.dist
+	if [ ! -f ${PREFIX}/etc/magicor/magicor-editor.conf ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/magicor/magicor-editor.conf.dist \
+			${PREFIX}/etc/magicor/magicor-editor.conf; \
+	fi
+.endif
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/games/magicor/distinfo b/games/magicor/distinfo
new file mode 100644
index 000000000000..35b845e0076a
--- /dev/null
+++ b/games/magicor/distinfo
@@ -0,0 +1,6 @@
+MD5 (magicor-source-1.1.tar.gz) = 0ba83ba61ec7db1a0d4fed6b937ae527
+SHA256 (magicor-source-1.1.tar.gz) = a0fa1dde6c15dfa2eb8a416811aea71ffd8386302fe334204bf2ea8eeb71de36
+SIZE (magicor-source-1.1.tar.gz) = 114726
+MD5 (magicor-data-1.1.tar.gz) = b681fc820d0f900120a87ae6163ee777
+SHA256 (magicor-data-1.1.tar.gz) = d2a1720c8b85195b1855f4a65b1fca79742abab9daaa3a0b5477ca72b6b6ad6c
+SIZE (magicor-data-1.1.tar.gz) = 17101141
diff --git a/games/magicor/pkg-descr b/games/magicor/pkg-descr
new file mode 100644
index 000000000000..7bc267328556
--- /dev/null
+++ b/games/magicor/pkg-descr
@@ -0,0 +1,8 @@
+Old-school, puzzle game similar to Solomon's Key, but with modern
+features.
+
+Magicor is a puzzle game using "fancy" 2D graphics. The objective
+is to extinguish fires using blocks of ice. Levels may have one or
+more solutions, but thinking ahead is the key to victory in Magicor.
+
+WWW: http://magicor.sourceforge.net/
diff --git a/games/magicor/pkg-plist b/games/magicor/pkg-plist
new file mode 100644
index 000000000000..cfab92950404
--- /dev/null
+++ b/games/magicor/pkg-plist
@@ -0,0 +1,283 @@
+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
+%%DATADIR%%/backgrounds/maroon.png
+%%DATADIR%%/backgrounds/stone.png
+%%DATADIR%%/brushes
+%%DATADIR%%/editor/magicor-editor.glade
+%%DATADIR%%/editor/magicor-editor.gladep
+%%DATADIR%%/fonts/info-inactive.png
+%%DATADIR%%/fonts/info.png
+%%DATADIR%%/images/footstep.png
+%%DATADIR%%/images/gnu-logo.png
+%%DATADIR%%/images/linux-logo.png
+%%DATADIR%%/images/magicor-tmp.png
+%%DATADIR%%/images/magicor.png
+%%DATADIR%%/images/menu/continue_game-active.png
+%%DATADIR%%/images/menu/continue_game-inactive.png
+%%DATADIR%%/images/menu/new_game-active.png
+%%DATADIR%%/images/menu/new_game-inactive.png
+%%DATADIR%%/images/menu/options-active.png
+%%DATADIR%%/images/menu/options-inactive.png
+%%DATADIR%%/images/menu/quit-active.png
+%%DATADIR%%/images/menu/quit-inactive.png
+%%DATADIR%%/images/pygame-logo.png
+%%DATADIR%%/images/python-logo.png
+%%DATADIR%%/images/sdl-logo.png
+%%DATADIR%%/images/title-clouds.png
+%%DATADIR%%/images/title-ice.png
+%%DATADIR%%/images/title-sky.jpg
+%%DATADIR%%/levels/_test/blob-die.wav
+%%DATADIR%%/levels/_test/brushes
+%%DATADIR%%/levels/_test/level-05.lvl
+%%DATADIR%%/levels/_test/level-07a.lvl
+%%DATADIR%%/levels/_test/level-07d.lvl
+%%DATADIR%%/levels/_test/level-07e.lvl
+%%DATADIR%%/levels/_test/level-07f.lvl
+%%DATADIR%%/levels/_test/level-07g.lvl
+%%DATADIR%%/levels/_test/level-08.lvl
+%%DATADIR%%/levels/_test/level-09.lvl
+%%DATADIR%%/levels/_test/level-10a.lvl
+%%DATADIR%%/levels/_test/level-11a.lvl
+%%DATADIR%%/levels/_test/walking_blob.png
+%%DATADIR%%/levels/egypt/_bg-bricks.png
+%%DATADIR%%/levels/egypt/_bg-hieroglyphs.png
+%%DATADIR%%/levels/egypt/_bg-wall.png
+%%DATADIR%%/levels/egypt/bricks.png
+%%DATADIR%%/levels/egypt/brushes
+%%DATADIR%%/levels/egypt/climbing-scarab.png
+%%DATADIR%%/levels/egypt/egypt-01.lvl
+%%DATADIR%%/levels/egypt/egypt-02.lvl
+%%DATADIR%%/levels/egypt/egypt-03.lvl
+%%DATADIR%%/levels/egypt/egypt-04.lvl
+%%DATADIR%%/levels/egypt/egypt-05.lvl
+%%DATADIR%%/levels/egypt/egypt-06.lvl
+%%DATADIR%%/levels/egypt/egypt-07.lvl
+%%DATADIR%%/levels/egypt/egypt-08.lvl
+%%DATADIR%%/levels/egypt/egypt-09.lvl
+%%DATADIR%%/levels/egypt/egypt-10.lvl
+%%DATADIR%%/levels/egypt/egypt-11.lvl
+%%DATADIR%%/levels/egypt/egypt-12.lvl
+%%DATADIR%%/levels/egypt/egypt-13.lvl
+%%DATADIR%%/levels/egypt/egypt-14.lvl
+%%DATADIR%%/levels/egypt/egypt-15.lvl
+%%DATADIR%%/levels/egypt/egyptian-akward.xm
+%%DATADIR%%/levels/egypt/egyptian-sadness.xm
+%%DATADIR%%/levels/egypt/egyptian-trance.xm
+%%DATADIR%%/levels/egypt/h1.png
+%%DATADIR%%/levels/egypt/scarab-die.wav
+%%DATADIR%%/levels/egypt/spider.png
+%%DATADIR%%/levels/egypt/walking-scarab.png
+%%DATADIR%%/levels/forest/_bg-green.png
+%%DATADIR%%/levels/forest/_bg-wines.png
+%%DATADIR%%/levels/forest/blippy.xm
+%%DATADIR%%/levels/forest/brushes
+%%DATADIR%%/levels/forest/decor-drop-left.png
+%%DATADIR%%/levels/forest/decor-drop-right.png
+%%DATADIR%%/levels/forest/decor-drops.png
+%%DATADIR%%/levels/forest/decor-flower.png
+%%DATADIR%%/levels/forest/decor-moist.png
+%%DATADIR%%/levels/forest/decor-water.png
+%%DATADIR%%/levels/forest/f2.png
+%%DATADIR%%/levels/forest/f3.png
+%%DATADIR%%/levels/forest/forest-01.lvl
+%%DATADIR%%/levels/forest/forest-02.lvl
+%%DATADIR%%/levels/forest/forest-03.lvl
+%%DATADIR%%/levels/forest/forest-04.lvl
+%%DATADIR%%/levels/forest/forest-05.lvl
+%%DATADIR%%/levels/forest/forest-06.lvl
+%%DATADIR%%/levels/forest/forest-07.lvl
+%%DATADIR%%/levels/forest/forest-08.lvl
+%%DATADIR%%/levels/forest/forest-09.lvl
+%%DATADIR%%/levels/forest/forest-10.lvl
+%%DATADIR%%/levels/forest/forest-11.lvl
+%%DATADIR%%/levels/forest/forest-12.lvl
+%%DATADIR%%/levels/forest/forest-13.lvl
+%%DATADIR%%/levels/forest/forest-14.lvl
+%%DATADIR%%/levels/forest/forest-15.lvl
+%%DATADIR%%/levels/forest/rainforest.xm
+%%DATADIR%%/levels/forest/tile-wood.png
+%%DATADIR%%/levels/level-01.lvl
+%%DATADIR%%/levels/level-02.lvl
+%%DATADIR%%/levels/level-03.lvl
+%%DATADIR%%/levels/pompei/B100M801.png
+%%DATADIR%%/levels/pompei/box_3_lindo_fog_halo1.png
+%%DATADIR%%/levels/pompei/box_3_lindo_fog_sinnormal.png
+%%DATADIR%%/levels/pompei/brushes
+%%DATADIR%%/levels/pompei/decor-hcenter.png
+%%DATADIR%%/levels/pompei/decor-left.png
+%%DATADIR%%/levels/pompei/decor-right.png
+%%DATADIR%%/levels/pompei/huevospline_3_lindo_fog_b.png
+%%DATADIR%%/levels/pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow.png
+%%DATADIR%%/levels/pompei/pompei-01.lvl
+%%DATADIR%%/levels/pompei/pompei-02.lvl
+%%DATADIR%%/levels/pompei/pompei-03.lvl
+%%DATADIR%%/levels/pompei/pompei-04.lvl
+%%DATADIR%%/levels/pompei/pompei-05.lvl
+%%DATADIR%%/levels/pompei/pompei-06.lvl
+%%DATADIR%%/levels/pompei/pompei-07.lvl
+%%DATADIR%%/levels/pompei/pompei-08.lvl
+%%DATADIR%%/levels/pompei/pompei-09.lvl
+%%DATADIR%%/levels/pompei/pompei-10.lvl
+%%DATADIR%%/levels/pompei/pompei-11.lvl
+%%DATADIR%%/levels/pompei/pompei-12.lvl
+%%DATADIR%%/levels/pompei/pompei-13.lvl
+%%DATADIR%%/levels/pompei/pompei-14.lvl
+%%DATADIR%%/levels/pompei/pompei-15.lvl
+%%DATADIR%%/levels/pompei/pompei1.xm
+%%DATADIR%%/levels/pompei/pompei2.xm
+%%DATADIR%%/levels/pompei/rect_cz_touched_2c3.png
+%%DATADIR%%/levels/pompei/tile-hmosaic.png
+%%DATADIR%%/levels/snow/brushes
+%%DATADIR%%/levels/snow/i1.png
+%%DATADIR%%/levels/snow/ice.xm
+%%DATADIR%%/levels/snow/ice1.png
+%%DATADIR%%/levels/snow/ice2.png
+%%DATADIR%%/levels/snow/ice2.xm
+%%DATADIR%%/levels/snow/ice3.png
+%%DATADIR%%/levels/snow/snow-01.lvl
+%%DATADIR%%/levels/snow/snow-02.lvl
+%%DATADIR%%/levels/snow/snow-03.lvl
+%%DATADIR%%/levels/snow/snow-04.lvl
+%%DATADIR%%/levels/snow/snow-05.lvl
+%%DATADIR%%/levels/snow/snow-06.lvl
+%%DATADIR%%/levels/snow/snow-07.lvl
+%%DATADIR%%/levels/snow/snow-08.lvl
+%%DATADIR%%/levels/snow/snow-09.lvl
+%%DATADIR%%/levels/snow/snow-10.lvl
+%%DATADIR%%/levels/snow/snow-11.lvl
+%%DATADIR%%/levels/snow/snow-12.lvl
+%%DATADIR%%/levels/snow/snow-13.lvl
+%%DATADIR%%/levels/snow/snow-14.lvl
+%%DATADIR%%/levels/snow/snow-15.lvl
+%%DATADIR%%/levels/snow/snow.png
+%%DATADIR%%/levels/snow/snowman.png
+%%DATADIR%%/levels/snow/snowtop.png
+%%DATADIR%%/levels/space/_bg-landscape.png
+%%DATADIR%%/levels/space/_bg-nebula.png
+%%DATADIR%%/levels/space/_bg-nova.png
+%%DATADIR%%/levels/space/blob-die.wav
+%%DATADIR%%/levels/space/brushes
+%%DATADIR%%/levels/space/decor-small-star.png
+%%DATADIR%%/levels/space/decor-star.png
+%%DATADIR%%/levels/space/space-01.lvl
+%%DATADIR%%/levels/space/space-02.lvl
+%%DATADIR%%/levels/space/space-03.lvl
+%%DATADIR%%/levels/space/space-04.lvl
+%%DATADIR%%/levels/space/space-05.lvl
+%%DATADIR%%/levels/space/space-06.lvl
+%%DATADIR%%/levels/space/space-07.lvl
+%%DATADIR%%/levels/space/space-08.lvl
+%%DATADIR%%/levels/space/space-09.lvl
+%%DATADIR%%/levels/space/space-10.lvl
+%%DATADIR%%/levels/space/space-11.lvl
+%%DATADIR%%/levels/space/space-12.lvl
+%%DATADIR%%/levels/space/space-13.lvl
+%%DATADIR%%/levels/space/space-14.lvl
+%%DATADIR%%/levels/space/space-15.lvl
+%%DATADIR%%/levels/space/strange.xm
+%%DATADIR%%/levels/space/tile-01.png
+%%DATADIR%%/levels/space/walking-blob.png
+%%DATADIR%%/music/menu.xm
+%%DATADIR%%/music/playing.xm
+%%DATADIR%%/music/soft-trance.xm
+%%DATADIR%%/music/title.xm
+%%DATADIR%%/samples/blockhit.wav
+%%DATADIR%%/samples/blockland.wav
+%%DATADIR%%/samples/bonus.wav
+%%DATADIR%%/samples/createice.wav
+%%DATADIR%%/samples/done.wav
+%%DATADIR%%/samples/erupt.wav
+%%DATADIR%%/samples/fall.wav
+%%DATADIR%%/samples/icebreak.wav
+%%DATADIR%%/samples/jump.wav
+%%DATADIR%%/samples/menu.wav
+%%DATADIR%%/samples/playerdie.wav
+%%DATADIR%%/samples/playerland.wav
+%%DATADIR%%/samples/push.wav
+%%DATADIR%%/samples/spikes.wav
+%%DATADIR%%/samples/start.wav
+%%DATADIR%%/samples/walk.wav
+%%DATADIR%%/sprites/arrow.png
+%%DATADIR%%/sprites/ball_b.png
+%%DATADIR%%/sprites/burning.png
+%%DATADIR%%/sprites/cloud.png
+%%DATADIR%%/sprites/dust.png
+%%DATADIR%%/sprites/fire-normal.png
+%%DATADIR%%/sprites/frost.png
+%%DATADIR%%/sprites/ice-hard.png
+%%DATADIR%%/sprites/ice-normal.png
+%%DATADIR%%/sprites/lava.png
+%%DATADIR%%/sprites/light-white.png
+%%DATADIR%%/sprites/light-yellow.png
+%%DATADIR%%/sprites/player-penguin.png
+%%DATADIR%%/sprites/player-test.png
+%%DATADIR%%/sprites/seeker3x18.png
+%%DATADIR%%/sprites/sparkle-star.png
+%%DATADIR%%/sprites/sparkle-yellow.png
+%%DATADIR%%/sprites/spikes.png
+%%DATADIR%%/sprites/spiting_lava.png
+%%DATADIR%%/sprites/sun.png
+%%DATADIR%%/sprites/sunlight.png
+%%DATADIR%%/sprites/trapola.png
+%%DATADIR%%/sprites/trapola2_q.png
+%%DATADIR%%/sprites/trapola2b_exp.png
+%%DATADIR%%/sprites/tube-endings.png
+%%DATADIR%%/tiles/shadow.png
+%%DATADIR%%/tiles/squares.png
+%%DATADIR%%/tiles/stone.png
+%%DATADIR%%/tiles/tube-horizontal.png
+%%DATADIR%%/tiles/tube-left-down.png
+%%DATADIR%%/tiles/tube-left-up.png
+%%DATADIR%%/tiles/tube-right-down.png
+%%DATADIR%%/tiles/tube-right-up.png
+%%DATADIR%%/tiles/tube-vertical.png
+%%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
+@dirrm %%DATADIR%%/tiles
+@dirrm %%DATADIR%%/sprites
+@dirrm %%DATADIR%%/samples
+@dirrm %%DATADIR%%/music
+@dirrm %%DATADIR%%/levels/space
+@dirrm %%DATADIR%%/levels/snow
+@dirrm %%DATADIR%%/levels/pompei
+@dirrm %%DATADIR%%/levels/forest
+@dirrm %%DATADIR%%/levels/egypt
+@dirrm %%DATADIR%%/levels/_test
+@dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/images/menu
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/editor
+@dirrm %%DATADIR%%/backgrounds
+@dirrm %%DATADIR%%
+@dirrmtry etc/magicor