7 files changed, 108 insertions, 54 deletions

diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile
index cdb2bdeb94b1..f8a82555ef43 100644
--- a/games/nazghul/Makefile
+++ b/games/nazghul/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nazghul
-PORTVERSION=	0.5.6
-PORTREVISION=	2
+PORTVERSION=	0.6.1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -19,13 +18,8 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 USE_SDL=	sdl image
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-lpng
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	${REINPLACE_CMD} -i "" 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/scheme.c
 
-post-configure:
-	${REINPLACE_CMD} -i "" -e 's|^LDFLAGS =*|LDFLAGS =-lpng|g' ${WRKSRC}/src/Makefile
-
 .include <bsd.port.mk>
diff --git a/games/nazghul/distinfo b/games/nazghul/distinfo
index e37a400451cc..5c4a039d13f6 100644
--- a/games/nazghul/distinfo
+++ b/games/nazghul/distinfo
@@ -1,3 +1,3 @@
-MD5 (nazghul-0.5.6.tar.gz) = 5b2c6e869acba048c23c8b5cb83a8170
-SHA256 (nazghul-0.5.6.tar.gz) = ebd77c21cda1ec00e25ec0c74bbc20f4da73780dd84dbd6088b064eb0c4b2e2f
-SIZE (nazghul-0.5.6.tar.gz) = 2408236
+MD5 (nazghul-0.6.1.tar.gz) = 31124e50405e30d110652ddf0a6f40ef
+SHA256 (nazghul-0.6.1.tar.gz) = e0851fa08b646417c662dc76de9cf9f9ca41f32911f2137d9960ee9857d9b114
+SIZE (nazghul-0.6.1.tar.gz) = 2631398
diff --git a/games/nazghul/files/patch-src_skill.c b/games/nazghul/files/patch-src_skill.c
new file mode 100644
index 000000000000..cc8ea59514be
--- /dev/null
+++ b/games/nazghul/files/patch-src_skill.c
@@ -0,0 +1,16 @@
+--- src/skill.c	2009-04-27 10:55:05.000000000 -0500
++++ src/skill.c	2009-04-27 10:55:29.000000000 -0500
+@@ -25,9 +25,11 @@
+ 
+ #include <assert.h>
+ #include <config.h>
+-//#ifdef HAVE_MALLOC_H
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+-//#endif
++#else
++#include <stdlib.h>
++#endif
+ #include <string.h>
+ 
+ static void skill_del(struct skill *skill)
diff --git a/games/nazghul/files/patch-src_skill_set.c b/games/nazghul/files/patch-src_skill_set.c
new file mode 100644
index 000000000000..008af0851be5
--- /dev/null
+++ b/games/nazghul/files/patch-src_skill_set.c
@@ -0,0 +1,11 @@
+--- src/skill_set.c	2009-04-27 10:56:19.000000000 -0500
++++ src/skill_set.c	2009-04-27 10:56:37.000000000 -0500
+@@ -27,6 +27,8 @@
+ #include <config.h>
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#else
++#include <stdlib.h>
+ #endif
+ #include <string.h>
+ 
diff --git a/games/nazghul/files/patch-src_skill_set_entry.c b/games/nazghul/files/patch-src_skill_set_entry.c
new file mode 100644
index 000000000000..6a7ddd3388e7
--- /dev/null
+++ b/games/nazghul/files/patch-src_skill_set_entry.c
@@ -0,0 +1,11 @@
+--- src/skill_set_entry.c	2009-04-27 10:57:56.000000000 -0500
++++ src/skill_set_entry.c	2009-04-27 10:58:23.000000000 -0500
+@@ -27,6 +27,8 @@
+ #include <config.h>
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#else
++#include <stdlib.h>
+ #endif
+ #include <string.h>
+ 
diff --git a/games/nazghul/files/patch-src_templ.c b/games/nazghul/files/patch-src_templ.c
new file mode 100644
index 000000000000..6da96ba9c648
--- /dev/null
+++ b/games/nazghul/files/patch-src_templ.c
@@ -0,0 +1,11 @@
+--- src/templ.c	2009-04-27 10:59:28.000000000 -0500
++++ src/templ.c	2009-04-27 10:59:46.000000000 -0500
+@@ -27,6 +27,8 @@
+ #include <config.h>
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#else
++#include <stdlib.h>
+ #endif
+ #include <string.h>
+ 
diff --git a/games/nazghul/pkg-plist b/games/nazghul/pkg-plist
index e7e8bf0149a9..066abb790d1f 100644
--- a/games/nazghul/pkg-plist
+++ b/games/nazghul/pkg-plist
@@ -1,14 +1,11 @@
 bin/haxima.sh
 bin/nazghul
-%%DATADIR%%/haxima/640x480_splash.png
 %%DATADIR%%/haxima/abandoned-cellar.scm
 %%DATADIR%%/haxima/abandoned-farm.scm
 %%DATADIR%%/haxima/abe.scm
 %%DATADIR%%/haxima/abigail.scm
 %%DATADIR%%/haxima/ability.scm
 %%DATADIR%%/haxima/absalot.scm
-%%DATADIR%%/haxima/addons.png
-%%DATADIR%%/haxima/adornments.png
 %%DATADIR%%/haxima/ai.scm
 %%DATADIR%%/haxima/alchemist.scm
 %%DATADIR%%/haxima/alex.scm
@@ -21,34 +18,26 @@ bin/nazghul
 %%DATADIR%%/haxima/angriss.scm
 %%DATADIR%%/haxima/ankh-shrine.scm
 %%DATADIR%%/haxima/anne.scm
-%%DATADIR%%/haxima/arms.png
 %%DATADIR%%/haxima/arms.scm
+%%DATADIR%%/haxima/bakup.scm
 %%DATADIR%%/haxima/bandit-hideout.scm
 %%DATADIR%%/haxima/bart.scm
 %%DATADIR%%/haxima/beds.scm
-%%DATADIR%%/haxima/bigobjects.png
 %%DATADIR%%/haxima/bill.scm
 %%DATADIR%%/haxima/bim.scm
 %%DATADIR%%/haxima/blendterrains.scm
-%%DATADIR%%/haxima/bodies.png
 %%DATADIR%%/haxima/bole.scm
-%%DATADIR%%/haxima/books.png
 %%DATADIR%%/haxima/books.scm
 %%DATADIR%%/haxima/bridge.scm
 %%DATADIR%%/haxima/brundegardt.scm
 %%DATADIR%%/haxima/camping-map.scm
-%%DATADIR%%/haxima/cannon.wav
 %%DATADIR%%/haxima/cast-ui.scm
-%%DATADIR%%/haxima/clothes.png
 %%DATADIR%%/haxima/combat-maps.scm
 %%DATADIR%%/haxima/containers.scm
 %%DATADIR%%/haxima/conv.scm
 %%DATADIR%%/haxima/crypt.scm
-%%DATADIR%%/haxima/cursor.png
 %%DATADIR%%/haxima/chanticleer.scm
-%%DATADIR%%/haxima/charset.png
 %%DATADIR%%/haxima/chester.scm
-%%DATADIR%%/haxima/damage.wav
 %%DATADIR%%/haxima/dank-cave.scm
 %%DATADIR%%/haxima/demon-gate.scm
 %%DATADIR%%/haxima/dennis.scm
@@ -56,12 +45,11 @@ bin/nazghul
 %%DATADIR%%/haxima/door.scm
 %%DATADIR%%/haxima/doris.scm
 %%DATADIR%%/haxima/douglas.scm
-%%DATADIR%%/haxima/drawbridge.scm
 %%DATADIR%%/haxima/earl.scm
+%%DATADIR%%/haxima/drawbridge.scm
 %%DATADIR%%/haxima/eastpass.scm
 %%DATADIR%%/haxima/edge-spawn.scm
 %%DATADIR%%/haxima/edward.scm
-%%DATADIR%%/haxima/effects.png
 %%DATADIR%%/haxima/effects.scm
 %%DATADIR%%/haxima/enchanter.scm
 %%DATADIR%%/haxima/enchanters-tower-mech.scm
@@ -71,15 +59,12 @@ bin/nazghul
 %%DATADIR%%/haxima/endless-deeps.scm
 %%DATADIR%%/haxima/engineer.scm
 %%DATADIR%%/haxima/engineers-hut.scm
-%%DATADIR%%/haxima/enter_moongate.wav
 %%DATADIR%%/haxima/eye-of-brune.scm
 %%DATADIR%%/haxima/fields.scm
 %%DATADIR%%/haxima/fing.scm
 %%DATADIR%%/haxima/fire_sea.scm
-%%DATADIR%%/haxima/food.png
 %%DATADIR%%/haxima/food.scm
 %%DATADIR%%/haxima/forsaken-prison.scm
-%%DATADIR%%/haxima/frame.png
 %%DATADIR%%/haxima/game.scm
 %%DATADIR%%/haxima/gamestart-mech.scm
 %%DATADIR%%/haxima/gamestart.scm
@@ -98,9 +83,6 @@ bin/nazghul
 %%DATADIR%%/haxima/hackle.scm
 %%DATADIR%%/haxima/henry.scm
 %%DATADIR%%/haxima/hidden.scm
-%%DATADIR%%/haxima/hirespeople.png
-%%DATADIR%%/haxima/horse.wav
-%%DATADIR%%/haxima/humanoids.png
 %%DATADIR%%/haxima/ifc.scm
 %%DATADIR%%/haxima/ilya.scm
 %%DATADIR%%/haxima/ini.scm
@@ -109,7 +91,6 @@ bin/nazghul
 %%DATADIR%%/haxima/jake.scm
 %%DATADIR%%/haxima/jeffreys.scm
 %%DATADIR%%/haxima/jess.scm
-%%DATADIR%%/haxima/jewelry.png
 %%DATADIR%%/haxima/jewelry.scm
 %%DATADIR%%/haxima/jim.scm
 %%DATADIR%%/haxima/joel.scm
@@ -130,11 +111,11 @@ bin/nazghul
 %%DATADIR%%/haxima/lia.scm
 %%DATADIR%%/haxima/lich-tomb.scm
 %%DATADIR%%/haxima/loc.scm
+%%DATADIR%%/haxima/lost-halls-mech.scm
 %%DATADIR%%/haxima/lost-halls.scm
 %%DATADIR%%/haxima/luximene.scm
 %%DATADIR%%/haxima/main-menu.scm
 %%DATADIR%%/haxima/mans-hideout.scm
-%%DATADIR%%/haxima/map.png
 %%DATADIR%%/haxima/may.scm
 %%DATADIR%%/haxima/meaney.scm
 %%DATADIR%%/haxima/melvin.scm
@@ -142,23 +123,17 @@ bin/nazghul
 %%DATADIR%%/haxima/mesmeme.scm
 %%DATADIR%%/haxima/miggs.scm
 %%DATADIR%%/haxima/mimic.scm
-%%DATADIR%%/haxima/money.png
 %%DATADIR%%/haxima/money.scm
 %%DATADIR%%/haxima/monster-generator.scm
-%%DATADIR%%/haxima/monsters.png
 %%DATADIR%%/haxima/moon.scm
 %%DATADIR%%/haxima/moongate-clearing.scm
 %%DATADIR%%/haxima/moongate.scm
-%%DATADIR%%/haxima/moons.png
 %%DATADIR%%/haxima/mouse.scm
 %%DATADIR%%/haxima/mushroom-cave.scm
 %%DATADIR%%/haxima/nate.scm
 %%DATADIR%%/haxima/naz.scm
 %%DATADIR%%/haxima/necromancer.scm
 %%DATADIR%%/haxima/necromancers-lair.scm
-%%DATADIR%%/haxima/newfolks.png
-%%DATADIR%%/haxima/newmonst.png
-%%DATADIR%%/haxima/newterrain.png
 %%DATADIR%%/haxima/nossifer.scm
 %%DATADIR%%/haxima/npc-types.scm
 %%DATADIR%%/haxima/objs.scm
@@ -166,50 +141,42 @@ bin/nazghul
 %%DATADIR%%/haxima/old-absalot.scm
 %%DATADIR%%/haxima/old-mine.scm
 %%DATADIR%%/haxima/oparine.scm
+%%DATADIR%%/haxima/options.scm
 %%DATADIR%%/haxima/oscar.scm
 %%DATADIR%%/haxima/palette.scm
 %%DATADIR%%/haxima/parties.scm
 %%DATADIR%%/haxima/patch.scm
-%%DATADIR%%/haxima/pitfalls.png
 %%DATADIR%%/haxima/pitfalls.scm
 %%DATADIR%%/haxima/poor-house.scm
 %%DATADIR%%/haxima/portals.scm
 %%DATADIR%%/haxima/portcullis.scm
-%%DATADIR%%/haxima/potions.png
 %%DATADIR%%/haxima/potions.scm
 %%DATADIR%%/haxima/powers.scm
 %%DATADIR%%/haxima/pre-entry-hooks.scm
 %%DATADIR%%/haxima/prices.scm
 %%DATADIR%%/haxima/prison.scm
+%%DATADIR%%/haxima/pseudorandom-map.scm
 %%DATADIR%%/haxima/r2a_mech.scm
-%%DATADIR%%/haxima/raise-merciful-death.scm
-%%DATADIR%%/haxima/reagents.png
 %%DATADIR%%/haxima/reagents.scm
+%%DATADIR%%/haxima/raise-merciful-death.scm
 %%DATADIR%%/haxima/road_to_absalot.scm
 %%DATADIR%%/haxima/roland.scm
-%%DATADIR%%/haxima/rowing.wav
-%%DATADIR%%/haxima/rune.png
 %%DATADIR%%/haxima/runes.scm
-%%DATADIR%%/haxima/runestones.png
-%%DATADIR%%/haxima/scrolls.png
+%%DATADIR%%/haxima/saved-games.scm
 %%DATADIR%%/haxima/scrolls.scm
 %%DATADIR%%/haxima/selene.scm
-%%DATADIR%%/haxima/shapes.png
 %%DATADIR%%/haxima/shard.scm
 %%DATADIR%%/haxima/shroom.scm
-%%DATADIR%%/haxima/signs.png
 %%DATADIR%%/haxima/silas.scm
+%%DATADIR%%/haxima/skills.scm
 %%DATADIR%%/haxima/slimy-cavern-zones.scm
 %%DATADIR%%/haxima/slimy-cavern.scm
 %%DATADIR%%/haxima/slywan.scm
 %%DATADIR%%/haxima/sounds.scm
-%%DATADIR%%/haxima/special.png
 %%DATADIR%%/haxima/special.scm
 %%DATADIR%%/haxima/species.scm
-%%DATADIR%%/haxima/spells.png
 %%DATADIR%%/haxima/spells.scm
 %%DATADIR%%/haxima/spider.scm
-%%DATADIR%%/haxima/splash.png
 %%DATADIR%%/haxima/sprite-sets.scm
 %%DATADIR%%/haxima/sprites.scm
 %%DATADIR%%/haxima/start-new-game.scm
@@ -226,10 +193,8 @@ bin/nazghul
 %%DATADIR%%/haxima/thud.scm
 %%DATADIR%%/haxima/tim.scm
 %%DATADIR%%/haxima/timer.scm
-%%DATADIR%%/haxima/tools.png
 %%DATADIR%%/haxima/tools.scm
 %%DATADIR%%/haxima/tooth.scm
-%%DATADIR%%/haxima/tower.png
 %%DATADIR%%/haxima/town-entry.scm
 %%DATADIR%%/haxima/traps.scm
 %%DATADIR%%/haxima/traps_1.scm
@@ -247,7 +212,8 @@ bin/nazghul
 %%DATADIR%%/haxima/urt.scm
 %%DATADIR%%/haxima/vehicles.scm
 %%DATADIR%%/haxima/void-temple.scm
-%%DATADIR%%/haxima/walk.wav
+%%DATADIR%%/haxima/voidgap-mech.scm
+%%DATADIR%%/haxima/voidgap-passage.scm
 %%DATADIR%%/haxima/warritrix.scm
 %%DATADIR%%/haxima/weather-vane.scm
 %%DATADIR%%/haxima/westpass.scm
@@ -255,5 +221,50 @@ bin/nazghul
 %%DATADIR%%/haxima/yellow-slime.scm
 %%DATADIR%%/haxima/zane.scm
 %%DATADIR%%/haxima/zones.scm
+%%DATADIR%%/haxima/640x480_splash.png
+%%DATADIR%%/haxima/addons.png
+%%DATADIR%%/haxima/arms.png
+%%DATADIR%%/haxima/adornments.png
+%%DATADIR%%/haxima/bigobjects.png
+%%DATADIR%%/haxima/bodies.png
+%%DATADIR%%/haxima/books.png
+%%DATADIR%%/haxima/clothes.png
+%%DATADIR%%/haxima/cursor.png
+%%DATADIR%%/haxima/charset.png
+%%DATADIR%%/haxima/effects.png
+%%DATADIR%%/haxima/food.png
+%%DATADIR%%/haxima/frame.png
+%%DATADIR%%/haxima/hirespeople.png
+%%DATADIR%%/haxima/humanoids.png
+%%DATADIR%%/haxima/jewelry.png
+%%DATADIR%%/haxima/map.png
+%%DATADIR%%/haxima/money.png
+%%DATADIR%%/haxima/monsters.png
+%%DATADIR%%/haxima/moons.png
+%%DATADIR%%/haxima/newfolks.png
+%%DATADIR%%/haxima/newmonst.png
+%%DATADIR%%/haxima/newterrain.png
+%%DATADIR%%/haxima/pitfalls.png
+%%DATADIR%%/haxima/potions.png
+%%DATADIR%%/haxima/reagents.png
+%%DATADIR%%/haxima/sfx.png
+%%DATADIR%%/haxima/rune.png
+%%DATADIR%%/haxima/runestones.png
+%%DATADIR%%/haxima/scrolls.png
+%%DATADIR%%/haxima/shapes.png
+%%DATADIR%%/haxima/ship.png
+%%DATADIR%%/haxima/signs.png
+%%DATADIR%%/haxima/special.png
+%%DATADIR%%/haxima/spells.png
+%%DATADIR%%/haxima/splash.png
+%%DATADIR%%/haxima/test.sav.png
+%%DATADIR%%/haxima/tools.png
+%%DATADIR%%/haxima/tower.png
+%%DATADIR%%/haxima/cannon.wav
+%%DATADIR%%/haxima/damage.wav
+%%DATADIR%%/haxima/enter_moongate.wav
+%%DATADIR%%/haxima/horse.wav
+%%DATADIR%%/haxima/rowing.wav
+%%DATADIR%%/haxima/walk.wav
 @dirrm %%DATADIR%%/haxima
 @dirrm %%DATADIR%%