Maintainer update to version 0.70, with lots of new levels!

4 files changed, 232 insertions, 19 deletions

diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 6a0f6c35b6c5..0c7e2bad80b6 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	enigma
-PORTVERSION=	0.60
+PORTVERSION=	0.70
 CATEGORIES=	games
 MASTER_SITES=	http://savannah.nongnu.org/download/enigma/
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Enigma is a reimplementation of Oxyd, a puzzle game
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/sdl11-config:${PORTSDIR}/devel/sdl12 \
+BUILD_DEPENDS=	sdl11-config:${PORTSDIR}/devel/sdl12 \
 		lua:${PORTSDIR}/lang/lua
 LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer	\
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image
@@ -21,12 +21,16 @@ LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer	\
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ARGS=	--target=""
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+		CXXFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
 
 MAN6=		enigma.6
 
 post-install:
-	${CAT} pkg-message
+	@${CAT} pkg-message
 
 .include <bsd.port.mk>
diff --git a/games/enigma/distinfo b/games/enigma/distinfo
index 253af5a75e7c..38d22890b9a8 100644
--- a/games/enigma/distinfo
+++ b/games/enigma/distinfo
@@ -1 +1 @@
-MD5 (enigma-0.60.tar.gz) = 900739587d483c505b7553d6eda2db62
+MD5 (enigma-0.70.tar.gz) = 8cdbf6aaeec13d545fa9d2382cfae032
diff --git a/games/enigma/files/patch-video.cc b/games/enigma/files/patch-video.cc
deleted file mode 100644
index 096477854c99..000000000000
--- a/games/enigma/files/patch-video.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- px/video.cc.orig	Sat Aug 17 12:06:45 2002
-+++ px/video.cc	Sat Aug 17 12:06:56 2002
-@@ -21,7 +21,6 @@
- #include "tools.hh"
- 
- #include "SDL_image.h"
--#include "SDL_syswm.h"
- 
- #include <cassert>
- #include <string>
diff --git a/games/enigma/pkg-plist b/games/enigma/pkg-plist
index 05946824f7f7..3f4a4724f4da 100644
--- a/games/enigma/pkg-plist
+++ b/games/enigma/pkg-plist
@@ -3,6 +3,8 @@ bin/enigma
 share/enigma/fonts/dreamorp.txt
 share/enigma/fonts/dreamorp24.bmf
 share/enigma/fonts/dreamorp24.png
+share/enigma/fonts/labelfont.bmf
+share/enigma/fonts/labelfont.png
 share/enigma/fonts/levelmenu.bmf
 share/enigma/fonts/levelmenu.png
 share/enigma/fonts/menufont.bmf
@@ -13,6 +15,7 @@ share/enigma/fonts/timefont.bmf
 share/enigma/fonts/timefont.png
 
 share/enigma/sound/ballcollision.wav
+share/enigma/sound/boing.wav
 share/enigma/sound/boink.wav
 share/enigma/sound/drip.wav
 share/enigma/sound/drown.wav
@@ -38,8 +41,8 @@ share/enigma/sound/st-move.wav
 share/enigma/sound/st-oxydopen.wav
 share/enigma/sound/st-oxydopened.wav
 share/enigma/sound/st-stone.wav
-share/enigma/sound/st-thud.wav
 share/enigma/sound/st-switch.wav
+share/enigma/sound/st-thud.wav
 share/enigma/sound/switch.wav
 
 share/enigma/gfx/ac-blackball-fall.png
@@ -87,22 +90,29 @@ share/enigma/gfx/fl-dunes.png
 share/enigma/gfx/fl-floor_001.png
 share/enigma/gfx/fl-gradient-wiz.png
 share/enigma/gfx/fl-gradient.png
+share/enigma/gfx/fl-gradient2.png
 share/enigma/gfx/fl-gray-8bpp.png
 share/enigma/gfx/fl-gray.png
 share/enigma/gfx/fl-hay.png
+share/enigma/gfx/fl-himalaya.png
 share/enigma/gfx/fl-ice_001.png
 share/enigma/gfx/fl-inverse.png
 share/enigma/gfx/fl-leaves.png
 share/enigma/gfx/fl-marble.png
 share/enigma/gfx/fl-metal.png
+share/enigma/gfx/fl-metalb.png
 share/enigma/gfx/fl-normal.png
+share/enigma/gfx/fl-normal_x.png
 share/enigma/gfx/fl-plank.png
 share/enigma/gfx/fl-rock1.png
 share/enigma/gfx/fl-rock2.png
 share/enigma/gfx/fl-rough.png
+share/enigma/gfx/fl-sahara.png
+share/enigma/gfx/fl-samba.png
 share/enigma/gfx/fl-sand.png
 share/enigma/gfx/fl-space.png
 share/enigma/gfx/fl-stone.png
+share/enigma/gfx/fl-tigris.png
 share/enigma/gfx/fl-water.png
 share/enigma/gfx/fl-wood.png
 share/enigma/gfx/fl-woven.png
@@ -121,6 +131,7 @@ share/enigma/gfx/ic-top1.png
 share/enigma/gfx/ic-up.png
 share/enigma/gfx/ic-up1.png
 share/enigma/gfx/inv-blackball.png
+share/enigma/gfx/inv-whiteball.png
 share/enigma/gfx/inventory.png
 share/enigma/gfx/invisible.png
 share/enigma/gfx/it-blackbomb-burning.png
@@ -147,6 +158,7 @@ share/enigma/gfx/it-magicwand.png
 share/enigma/gfx/it-magnet-off.png
 share/enigma/gfx/it-magnet-on.png
 share/enigma/gfx/it-pipe.png
+share/enigma/gfx/it-seed.png
 share/enigma/gfx/it-shogun-big.png
 share/enigma/gfx/it-shogun-med.png
 share/enigma/gfx/it-shogun-small.png
@@ -161,6 +173,7 @@ share/enigma/gfx/it-trigger.png
 share/enigma/gfx/it-trigger1.png
 share/enigma/gfx/it-umbrella.png
 share/enigma/gfx/it-wormhole.png
+share/enigma/gfx/it-yanying.png
 share/enigma/gfx/it-yinyang.png
 share/enigma/gfx/menu_bg.png
 share/enigma/gfx/ring-anim_0001.png
@@ -188,9 +201,12 @@ share/enigma/gfx/st-black1.png
 share/enigma/gfx/st-black2.png
 share/enigma/gfx/st-black3.png
 share/enigma/gfx/st-black4.png
+share/enigma/gfx/st-block.png
 share/enigma/gfx/st-bluegray.png
 share/enigma/gfx/st-bolder.png
 share/enigma/gfx/st-bombs2.png
+share/enigma/gfx/st-break.png
+share/enigma/gfx/st-break_invisible.png
 share/enigma/gfx/st-brick.png
 share/enigma/gfx/st-brownie.png
 share/enigma/gfx/st-coin2slot.png
@@ -275,6 +291,14 @@ share/enigma/gfx/st-oneway-e.png
 share/enigma/gfx/st-oneway-n.png
 share/enigma/gfx/st-oneway-s.png
 share/enigma/gfx/st-oneway-w.png
+share/enigma/gfx/st-oneway_black-e.png
+share/enigma/gfx/st-oneway_black-n.png
+share/enigma/gfx/st-oneway_black-s.png
+share/enigma/gfx/st-oneway_black-w.png
+share/enigma/gfx/st-oneway_white-e.png
+share/enigma/gfx/st-oneway_white-n.png
+share/enigma/gfx/st-oneway_white-s.png
+share/enigma/gfx/st-oneway_white-w.png
 share/enigma/gfx/st-oxyd-questmark.png
 share/enigma/gfx/st-oxyda-open.png
 share/enigma/gfx/st-oxyda-opening.png
@@ -308,6 +332,11 @@ share/enigma/gfx/st-rock1.png
 share/enigma/gfx/st-rock2.png
 share/enigma/gfx/st-rock3.png
 share/enigma/gfx/st-rock4.png
+share/enigma/gfx/st-rock5.png
+share/enigma/gfx/st-rock6.png
+share/enigma/gfx/st-rubberband.png
+share/enigma/gfx/st-scissors-snip.png
+share/enigma/gfx/st-scissors.png
 share/enigma/gfx/st-shogun.png
 share/enigma/gfx/st-shogun1.png
 share/enigma/gfx/st-shogun2.png
@@ -325,6 +354,7 @@ share/enigma/gfx/st-white1.png
 share/enigma/gfx/st-white2.png
 share/enigma/gfx/st-white3.png
 share/enigma/gfx/st-white4.png
+share/enigma/gfx/st-wood-growing.png
 share/enigma/gfx/st-wood.png
 share/enigma/gfx/st-wood_001.png
 share/enigma/gfx/st-woven.png
@@ -333,16 +363,119 @@ share/enigma/gfx/st-yinyang1.png
 share/enigma/gfx/st-yinyang2.png
 
 share/enigma/levels/a.lua
+share/enigma/levels/ant.lua
 share/enigma/levels/ant01.lua
 share/enigma/levels/ant01.png
 share/enigma/levels/ant02.lua
 share/enigma/levels/ant02.png
 share/enigma/levels/ant03.lua
 share/enigma/levels/ant03.png
+share/enigma/levels/ant04.lua
+share/enigma/levels/ant04.png
+share/enigma/levels/ant05.lua
+share/enigma/levels/ant05.png
+share/enigma/levels/ant06.lua
+share/enigma/levels/ant06.png
+share/enigma/levels/ant07.lua
+share/enigma/levels/ant07.png
+share/enigma/levels/ant08.lua
+share/enigma/levels/ant08.png
+share/enigma/levels/ant09.lua
+share/enigma/levels/ant09.png
+share/enigma/levels/ant10.lua
+share/enigma/levels/ant10.png
+share/enigma/levels/ant11.lua
+share/enigma/levels/ant11.png
+share/enigma/levels/ant12.lua
+share/enigma/levels/ant12.png
+share/enigma/levels/ant13.lua
+share/enigma/levels/ant13.png
+share/enigma/levels/ant14.lua
+share/enigma/levels/ant14.png
+share/enigma/levels/ant15.lua
+share/enigma/levels/ant15.png
+share/enigma/levels/ant16.lua
+share/enigma/levels/ant16.png
+share/enigma/levels/ant17.lua
+share/enigma/levels/ant17.png
+share/enigma/levels/ant18.lua
+share/enigma/levels/ant18.png
+share/enigma/levels/ant19.lua
+share/enigma/levels/ant19.png
+share/enigma/levels/ant20.lua
+share/enigma/levels/ant20.png
+share/enigma/levels/ant21.lua
+share/enigma/levels/ant21.png
+share/enigma/levels/ant22.lua
+share/enigma/levels/ant22.png
+share/enigma/levels/ant23.lua
+share/enigma/levels/ant23.png
+share/enigma/levels/ant24.lua
+share/enigma/levels/ant24.png
+share/enigma/levels/ant25.lua
+share/enigma/levels/ant25.png
+share/enigma/levels/ant26.lua
+share/enigma/levels/ant26.png
+share/enigma/levels/ant27.lua
+share/enigma/levels/ant27.png
+share/enigma/levels/ant28.lua
+share/enigma/levels/ant28.png
+share/enigma/levels/ant29.lua
+share/enigma/levels/ant29.png
+share/enigma/levels/ant30.lua
+share/enigma/levels/ant30.png
+share/enigma/levels/ant32.lua
+share/enigma/levels/ant32.png
 share/enigma/levels/balance.lua
 share/enigma/levels/balance.png
+share/enigma/levels/christophanita_runningstone.lua
+share/enigma/levels/christophanita_runningstone.png
+share/enigma/levels/daniel1.lua
+share/enigma/levels/daniel1.png
+share/enigma/levels/daniel2.lua
+share/enigma/levels/daniel2.png
+share/enigma/levels/daniel3.lua
+share/enigma/levels/daniel3.png
+share/enigma/levels/daniel4.lua
+share/enigma/levels/daniel4.png
+share/enigma/levels/daniel5.lua
+share/enigma/levels/daniel5.png
 share/enigma/levels/deadend.lua
 share/enigma/levels/deadend.png
+share/enigma/levels/duffy1.lua
+share/enigma/levels/duffy1.png
+share/enigma/levels/duffy10.lua
+share/enigma/levels/duffy10.png
+share/enigma/levels/duffy11.lua
+share/enigma/levels/duffy11.png
+share/enigma/levels/duffy12.lua
+share/enigma/levels/duffy12.png
+share/enigma/levels/duffy13.lua
+share/enigma/levels/duffy13.png
+share/enigma/levels/duffy14.lua
+share/enigma/levels/duffy14.png
+share/enigma/levels/duffy15.lua
+share/enigma/levels/duffy15.png
+share/enigma/levels/duffy16.lua
+share/enigma/levels/duffy16.png
+share/enigma/levels/duffy17.lua
+share/enigma/levels/duffy17.png
+share/enigma/levels/duffy2.lua
+share/enigma/levels/duffy2.png
+share/enigma/levels/duffy3.lua
+share/enigma/levels/duffy3.png
+share/enigma/levels/duffy4.lua
+share/enigma/levels/duffy4.png
+share/enigma/levels/duffy5.lua
+share/enigma/levels/duffy5.png
+share/enigma/levels/duffy6.lua
+share/enigma/levels/duffy6.png
+share/enigma/levels/duffy7.lua
+share/enigma/levels/duffy7.png
+share/enigma/levels/duffy8.lua
+share/enigma/levels/duffy8.png
+share/enigma/levels/duffy9.lua
+share/enigma/levels/duffy9.png
 share/enigma/levels/index.lua
 share/enigma/levels/index_clones_of_oxyd.txt
 share/enigma/levels/index_enigma.txt
@@ -352,12 +485,27 @@ share/enigma/levels/index_oxyd.txt
 share/enigma/levels/index_oxyd_extra.txt
 share/enigma/levels/index_oxyd_magnum.txt
 share/enigma/levels/index_per_oxyd.txt
-share/enigma/levels/index_per_oxyd_linkgame.lua
 share/enigma/levels/index_per_oxyd_linkgame.txt
 share/enigma/levels/key.lua
 share/enigma/levels/key.png
 share/enigma/levels/lasers101.lua
 share/enigma/levels/lasers101.png
+share/enigma/levels/level10a.lua
+share/enigma/levels/level10a.png
+share/enigma/levels/level10b.lua
+share/enigma/levels/level10b.png
+share/enigma/levels/level10c.lua
+share/enigma/levels/level10c.png
+share/enigma/levels/level10d.lua
+share/enigma/levels/level10d.png
+share/enigma/levels/level10e.lua
+share/enigma/levels/level10e.png
+share/enigma/levels/level10f.lua
+share/enigma/levels/level10f.png
+share/enigma/levels/level11a.lua
+share/enigma/levels/level11a.png
+share/enigma/levels/level11b.lua
+share/enigma/levels/level11b.png
 share/enigma/levels/level1a.lua
 share/enigma/levels/level1a.png
 share/enigma/levels/level1b.lua
@@ -437,6 +585,34 @@ share/enigma/levels/level7c.lua
 share/enigma/levels/level7c.png
 share/enigma/levels/level7d.lua
 share/enigma/levels/level7d.png
+share/enigma/levels/level7e.lua
+share/enigma/levels/level7e.png
+share/enigma/levels/level7f.lua
+share/enigma/levels/level7f.png
+share/enigma/levels/level8a.lua
+share/enigma/levels/level8a.png
+share/enigma/levels/level8b.lua
+share/enigma/levels/level8b.png
+share/enigma/levels/level8c.lua
+share/enigma/levels/level8c.png
+share/enigma/levels/level8d.lua
+share/enigma/levels/level8d.png
+share/enigma/levels/level8e.lua
+share/enigma/levels/level8e.png
+share/enigma/levels/level8f.lua
+share/enigma/levels/level8f.png
+share/enigma/levels/level9a.lua
+share/enigma/levels/level9a.png
+share/enigma/levels/level9b.lua
+share/enigma/levels/level9b.png
+share/enigma/levels/level9c.lua
+share/enigma/levels/level9c.png
+share/enigma/levels/level9d.lua
+share/enigma/levels/level9d.png
+share/enigma/levels/level9e.lua
+share/enigma/levels/level9e.png
+share/enigma/levels/level9f.lua
+share/enigma/levels/level9f.png
 share/enigma/levels/martin01.lua
 share/enigma/levels/martin01.png
 share/enigma/levels/martin02.lua
@@ -549,6 +725,40 @@ share/enigma/levels/martin55.lua
 share/enigma/levels/martin55.png
 share/enigma/levels/martin56.lua
 share/enigma/levels/martin56.png
+share/enigma/levels/martin57.lua
+share/enigma/levels/martin57.png
+share/enigma/levels/martin58.lua
+share/enigma/levels/martin58.png
+share/enigma/levels/martin59.lua
+share/enigma/levels/martin59.png
+share/enigma/levels/martin60.lua
+share/enigma/levels/martin60.png
+share/enigma/levels/martin61.lua
+share/enigma/levels/martin61.png
+share/enigma/levels/martin62.lua
+share/enigma/levels/martin62.png
+share/enigma/levels/martin63.lua
+share/enigma/levels/martin63.png
+share/enigma/levels/martin64.lua
+share/enigma/levels/martin64.png
+share/enigma/levels/martin65.lua
+share/enigma/levels/martin65.png
+share/enigma/levels/martin66.lua
+share/enigma/levels/martin66.png
+share/enigma/levels/martin67.lua
+share/enigma/levels/martin67.png
+share/enigma/levels/martin68.lua
+share/enigma/levels/martin68.png
+share/enigma/levels/martin69.lua
+share/enigma/levels/martin69.png
+share/enigma/levels/martin70.lua
+share/enigma/levels/martin70.png
+share/enigma/levels/martin71.lua
+share/enigma/levels/martin71.png
+share/enigma/levels/martin72.lua
+share/enigma/levels/martin72.png
+share/enigma/levels/martin73.lua
+share/enigma/levels/martin73.png
 share/enigma/levels/meditation1.lua
 share/enigma/levels/meditation1.png
 share/enigma/levels/meditation10.lua
@@ -557,6 +767,16 @@ share/enigma/levels/meditation11.lua
 share/enigma/levels/meditation11.png
 share/enigma/levels/meditation12.lua
 share/enigma/levels/meditation12.png
+share/enigma/levels/meditation13.lua
+share/enigma/levels/meditation13.png
+share/enigma/levels/meditation14.lua
+share/enigma/levels/meditation14.png
+share/enigma/levels/meditation15.lua
+share/enigma/levels/meditation15.png
+share/enigma/levels/meditation16.lua
+share/enigma/levels/meditation16.png
+share/enigma/levels/meditation17.lua
+share/enigma/levels/meditation17.png
 share/enigma/levels/meditation2.lua
 share/enigma/levels/meditation2.png
 share/enigma/levels/meditation3.lua
@@ -624,10 +844,9 @@ share/enigma/levels/todo.png
 share/enigma/levels/welcome.lua
 share/enigma/levels/welcome.png
 
-
 share/enigma/enigma_conf.lua
-share/enigma/models-2d.lua
 share/enigma/init.lua
+share/enigma/models-2d.lua
 
 @dirrm share/enigma/levels
 @dirrm share/enigma/gfx