3 files changed, 38 insertions, 193 deletions

diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 8b650d3ec1d8..b015b54d9aad 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -6,32 +6,44 @@
 #
 
 PORTNAME=	crossfire
-PORTVERSION=	1.9.0
+PORTVERSION=	1.9.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.real-time.com/pub/games/crossfire/
-MASTER_SITE_SUBDIR=	crossfire
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-server
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${DISTNAME}-1.maps${EXTRACT_SUFX}
+		${DISTNAME}.maps${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Server for multiplayer graphical arcade and adventure game
 
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_XPM=	yes
 USE_PERL5=	yes
+USE_PYTHON=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--without-check
 
 MAN6=		crossedit.6 crossfire.6 crossfire-config.6 crossloop.6 \
 		crossloop.web.6
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include \
+		-I${PYTHON_INCLUDEDIR} ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib \
+		-L${PYTHON_LIBDIR} ${PTHREAD_LIBS}
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-ldl||g'
+	@${REINPLACE_CMD} -e 's|^#.*/bin/sh|#! ${LOCALBASE}/bin/bash|g ; \
+		 s|python[{].*[}]|${PYTHON_VERSION}|g ; \
+		 s|-ldl||g' ${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${DATADIR}/maps
diff --git a/games/crossfire-server/distinfo b/games/crossfire-server/distinfo
index 105b5b555e64..91e19f12738b 100644
--- a/games/crossfire-server/distinfo
+++ b/games/crossfire-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (crossfire-1.9.0.tar.gz) = 43240af83a4414d2dcc19fff3af31a63
-SHA256 (crossfire-1.9.0.tar.gz) = c88887bbc3437032e79d4bc0304195418aa0837d24f22966ecd01857622299b7
-SIZE (crossfire-1.9.0.tar.gz) = 5317109
-MD5 (crossfire-1.9.0-1.maps.tar.gz) = 265c4dfdbdedaa2c565ea831f5f74a0c
-SHA256 (crossfire-1.9.0-1.maps.tar.gz) = 585f1c6e88d0fac2bca12bd0268d3b932cf008ceb684b443cd3d7b6c7d8b344c
-SIZE (crossfire-1.9.0-1.maps.tar.gz) = 22269549
+MD5 (crossfire-1.9.1.tar.gz) = 9444daefe1a457b4a18101c255be6cdc
+SHA256 (crossfire-1.9.1.tar.gz) = 95981b7d34798fec21e5d672debfb9a7dd003554a727c73942a6723b0a22f079
+SIZE (crossfire-1.9.1.tar.gz) = 5584686
+MD5 (crossfire-1.9.1.maps.tar.gz) = 9e3b54a64d74c60acd3b7a1c4532ccd1
+SHA256 (crossfire-1.9.1.maps.tar.gz) = e9eca13268b3e651b84f29dfe8aeb98f645e454ec53d726cb3a7428ab782b720
+SIZE (crossfire-1.9.1.maps.tar.gz) = 22073437
diff --git a/games/crossfire-server/pkg-plist b/games/crossfire-server/pkg-plist
index b55aecc3d55c..2b2f71a24ec9 100644
--- a/games/crossfire-server/pkg-plist
+++ b/games/crossfire-server/pkg-plist
@@ -1,4 +1,3 @@
-bin/crossedit
 bin/crossfire
 bin/crossfire-config
 bin/crossloop
@@ -19,6 +18,9 @@ lib/crossfire/mktable.script
 lib/crossfire/plugins/cfanim.a
 lib/crossfire/plugins/cfanim.la
 lib/crossfire/plugins/cfanim.so
+lib/crossfire/plugins/cfpython.a
+lib/crossfire/plugins/cfpython.la
+lib/crossfire/plugins/cfpython.so
 lib/crossfire/random_map
 %%DATADIR%%/adm/archsearch.pl
 %%DATADIR%%/adm/collect_images.pl
@@ -52,8 +54,10 @@ lib/crossfire/random_map
 %%DATADIR%%/help/mark
 %%DATADIR%%/help/melee
 %%DATADIR%%/help/mode
+%%DATADIR%%/help/motd
 %%DATADIR%%/help/mouse
 %%DATADIR%%/help/move
+%%DATADIR%%/help/news
 %%DATADIR%%/help/output
 %%DATADIR%%/help/output-count
 %%DATADIR%%/help/output-sync
@@ -65,6 +69,7 @@ lib/crossfire/random_map
 %%DATADIR%%/help/quit
 %%DATADIR%%/help/range
 %%DATADIR%%/help/rename
+%%DATADIR%%/help/rules
 %%DATADIR%%/help/save
 %%DATADIR%%/help/shout
 %%DATADIR%%/help/showpets
@@ -78,6 +83,7 @@ lib/crossfire/random_map
 %%DATADIR%%/help/whereabouts
 %%DATADIR%%/image_info
 %%DATADIR%%/maps/.emergency
+%%DATADIR%%/maps/COPYING
 %%DATADIR%%/maps/HallOfDMs
 %%DATADIR%%/maps/HallOfSelection
 %%DATADIR%%/maps/Info/README
@@ -380,8 +386,11 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/darcap/darcap/temple
 %%DATADIR%%/maps/darcap/forgotten_town/city
 %%DATADIR%%/maps/darcap/forgotten_town/enter
+%%DATADIR%%/maps/darcap/forgotten_town/ft_dragonslib
+%%DATADIR%%/maps/darcap/forgotten_town/ft_funhouse
 %%DATADIR%%/maps/darcap/forgotten_town/inn
 %%DATADIR%%/maps/darcap/forgotten_town/palace
+%%DATADIR%%/maps/darcap/forgotten_town/quests/ft_quest_1
 %%DATADIR%%/maps/darcap/forgotten_town/shops/armour
 %%DATADIR%%/maps/darcap/forgotten_town/shops/general
 %%DATADIR%%/maps/darcap/forgotten_town/shops/general2
@@ -1530,6 +1539,9 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/houses/chess_club
 %%DATADIR%%/maps/scorn/houses/cornerbrook
 %%DATADIR%%/maps/scorn/houses/cornerbrook_under
+%%DATADIR%%/maps/scorn/houses/easy_house.1.a
+%%DATADIR%%/maps/scorn/houses/easy_house.1.b
+%%DATADIR%%/maps/scorn/houses/easy_house.1.c
 %%DATADIR%%/maps/scorn/houses/farmhouse
 %%DATADIR%%/maps/scorn/houses/house.haunted
 %%DATADIR%%/maps/scorn/houses/house.haunted2
@@ -2068,137 +2080,8 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/templates/keep/keep3.tpl
 %%DATADIR%%/maps/templates/keep/keep_b.tpl
 %%DATADIR%%/maps/templates/keep/keep_roof.tpl
-%%DATADIR%%/maps/test/README
-%%DATADIR%%/maps/test/anthony/README
-%%DATADIR%%/maps/test/anthony/cascades
-%%DATADIR%%/maps/test/anthony/connected_objects
-%%DATADIR%%/maps/test/anthony/conveyor
-%%DATADIR%%/maps/test/anthony/raffles_cascade
-%%DATADIR%%/maps/test/anthony/roller_cades
-%%DATADIR%%/maps/test/anthony/special_objects
-%%DATADIR%%/maps/test/barrel
-%%DATADIR%%/maps/test/bigmonpit
-%%DATADIR%%/maps/test/connected_bug
-%%DATADIR%%/maps/test/cyclops
-%%DATADIR%%/maps/test/diagonal
-%%DATADIR%%/maps/test/faceofdeath
-%%DATADIR%%/maps/test/gen_test
-%%DATADIR%%/maps/test/insert_bug
-%%DATADIR%%/maps/test/lighting
-%%DATADIR%%/maps/test/multisquare
-%%DATADIR%%/maps/test/paralyze
-%%DATADIR%%/maps/test/pit
-%%DATADIR%%/maps/test/playermover
-%%DATADIR%%/maps/test/python
-%%DATADIR%%/maps/test/python.py
-%%DATADIR%%/maps/test/quest
-%%DATADIR%%/maps/test/randomtreasure
-%%DATADIR%%/maps/test/reaper
-%%DATADIR%%/maps/test/remote_altar
-%%DATADIR%%/maps/test/templatetest
-%%DATADIR%%/maps/test/throw
-%%DATADIR%%/maps/test/tile1
-%%DATADIR%%/maps/test/tile2
-%%DATADIR%%/maps/test/tile3
-%%DATADIR%%/maps/test/trapdoor
-%%DATADIR%%/maps/test/treasurelist
-%%DATADIR%%/maps/test/trigger
 %%DATADIR%%/maps/under_world/README
 %%DATADIR%%/maps/under_world/uworld_120_109
-%%DATADIR%%/maps/unlinked/Fogs
-%%DATADIR%%/maps/unlinked/Greyshield/Archery
-%%DATADIR%%/maps/unlinked/Greyshield/Arena
-%%DATADIR%%/maps/unlinked/Greyshield/Castle
-%%DATADIR%%/maps/unlinked/Greyshield/Cave
-%%DATADIR%%/maps/unlinked/Greyshield/Cavern
-%%DATADIR%%/maps/unlinked/Greyshield/Cavern2
-%%DATADIR%%/maps/unlinked/Greyshield/Chamber
-%%DATADIR%%/maps/unlinked/Greyshield/Doors
-%%DATADIR%%/maps/unlinked/Greyshield/Dungeon
-%%DATADIR%%/maps/unlinked/Greyshield/Elements
-%%DATADIR%%/maps/unlinked/Greyshield/Factory
-%%DATADIR%%/maps/unlinked/Greyshield/Finish
-%%DATADIR%%/maps/unlinked/Greyshield/Fortress
-%%DATADIR%%/maps/unlinked/Greyshield/GreyMaster
-%%DATADIR%%/maps/unlinked/Greyshield/Greysword
-%%DATADIR%%/maps/unlinked/Greyshield/Island
-%%DATADIR%%/maps/unlinked/Greyshield/Island1
-%%DATADIR%%/maps/unlinked/Greyshield/Ruins
-%%DATADIR%%/maps/unlinked/Greyshield/Sphinx
-%%DATADIR%%/maps/unlinked/academy.crap/Entrance
-%%DATADIR%%/maps/unlinked/academy.crap/Fighter.2
-%%DATADIR%%/maps/unlinked/academy.crap/Fighter.3
-%%DATADIR%%/maps/unlinked/academy.crap/Fighter.4
-%%DATADIR%%/maps/unlinked/academy.crap/Fighter.5
-%%DATADIR%%/maps/unlinked/academy.crap/Fighter.5_2
-%%DATADIR%%/maps/unlinked/academy.crap/MainFloor
-%%DATADIR%%/maps/unlinked/academy.crap/README
-%%DATADIR%%/maps/unlinked/casino/README
-%%DATADIR%%/maps/unlinked/casino/casino_infernal
-%%DATADIR%%/maps/unlinked/kandora/ambush1
-%%DATADIR%%/maps/unlinked/kandora/cave/a_mine
-%%DATADIR%%/maps/unlinked/kandora/cave/a_mine2
-%%DATADIR%%/maps/unlinked/kandora/cave/cave1
-%%DATADIR%%/maps/unlinked/kandora/cave/cave2
-%%DATADIR%%/maps/unlinked/kandora/cave/cave3
-%%DATADIR%%/maps/unlinked/kandora/cave/entrance
-%%DATADIR%%/maps/unlinked/kandora/cave/m_inn
-%%DATADIR%%/maps/unlinked/kandora/cave/m_inn2
-%%DATADIR%%/maps/unlinked/kandora/cave/m_temple
-%%DATADIR%%/maps/unlinked/kandora/cave/mithril
-%%DATADIR%%/maps/unlinked/kandora/circus/mp_castle
-%%DATADIR%%/maps/unlinked/kandora/circus/mp_cave
-%%DATADIR%%/maps/unlinked/kandora/circus/mp_church
-%%DATADIR%%/maps/unlinked/kandora/circus/mp_s
-%%DATADIR%%/maps/unlinked/kandora/circus/mp_start
-%%DATADIR%%/maps/unlinked/kandora/circus/mp_tavern
-%%DATADIR%%/maps/unlinked/kandora/circus/mp_world
-%%DATADIR%%/maps/unlinked/kandora/circus/petshop
-%%DATADIR%%/maps/unlinked/kandora/dd_alchemy
-%%DATADIR%%/maps/unlinked/kandora/dd_alchemy2
-%%DATADIR%%/maps/unlinked/kandora/dd_alchemy3
-%%DATADIR%%/maps/unlinked/kandora/dd_baron
-%%DATADIR%%/maps/unlinked/kandora/dd_baron2
-%%DATADIR%%/maps/unlinked/kandora/dd_chaos
-%%DATADIR%%/maps/unlinked/kandora/dd_church
-%%DATADIR%%/maps/unlinked/kandora/dd_court
-%%DATADIR%%/maps/unlinked/kandora/dd_inn
-%%DATADIR%%/maps/unlinked/kandora/dd_keep
-%%DATADIR%%/maps/unlinked/kandora/dd_market
-%%DATADIR%%/maps/unlinked/kandora/dd_shop
-%%DATADIR%%/maps/unlinked/kandora/dd_tavern
-%%DATADIR%%/maps/unlinked/kandora/denray
-%%DATADIR%%/maps/unlinked/kandora/dm_cellar
-%%DATADIR%%/maps/unlinked/kandora/dm_church
-%%DATADIR%%/maps/unlinked/kandora/dm_inn
-%%DATADIR%%/maps/unlinked/kandora/dm_keep
-%%DATADIR%%/maps/unlinked/kandora/dm_shop
-%%DATADIR%%/maps/unlinked/kandora/dm_tavern
-%%DATADIR%%/maps/unlinked/kandora/dm_wizard
-%%DATADIR%%/maps/unlinked/kandora/dun_marksel
-%%DATADIR%%/maps/unlinked/kandora/elcyon/elcyon_start
-%%DATADIR%%/maps/unlinked/kandora/elcyon/elf_grove
-%%DATADIR%%/maps/unlinked/kandora/elcyon/fall
-%%DATADIR%%/maps/unlinked/kandora/elcyon/g_store
-%%DATADIR%%/maps/unlinked/kandora/elcyon/gnome_hut
-%%DATADIR%%/maps/unlinked/kandora/elcyon/merchant
-%%DATADIR%%/maps/unlinked/kandora/elcyon/old_temple
-%%DATADIR%%/maps/unlinked/kandora/elcyon/palace
-%%DATADIR%%/maps/unlinked/kandora/elcyon/plaza
-%%DATADIR%%/maps/unlinked/kandora/elcyon/seacity
-%%DATADIR%%/maps/unlinked/kandora/elcyon/seacity_west
-%%DATADIR%%/maps/unlinked/kandora/elcyon/temple
-%%DATADIR%%/maps/unlinked/kandora/elcyon/witch_house
-%%DATADIR%%/maps/unlinked/kandora/kandora
-%%DATADIR%%/maps/unlinked/kandora/ship_city
-%%DATADIR%%/maps/unlinked/kandora/ship_dog
-%%DATADIR%%/maps/unlinked/kandora/ship_home
-%%DATADIR%%/maps/unlinked/kandora/ship_treasure
-%%DATADIR%%/maps/unlinked/kandora/signal
-%%DATADIR%%/maps/unlinked/kandora/signal2
-%%DATADIR%%/maps/unlinked/kandora/signal3
-%%DATADIR%%/maps/unlinked/lefttower2
-%%DATADIR%%/maps/unlinked/vol_vill_shops
 %%DATADIR%%/maps/whalingoutpost/houses/fishershouse1
 %%DATADIR%%/maps/whalingoutpost/houses/infestedhouse1
 %%DATADIR%%/maps/whalingoutpost/lighthouse1
@@ -3272,42 +3155,8 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/whalingoutpost/misc
 @dirrm %%DATADIR%%/maps/whalingoutpost/houses
 @dirrm %%DATADIR%%/maps/whalingoutpost
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/wallstyles
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/monsterstyles/MLABICE
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/monsterstyles/MLABHELL2
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/monsterstyles/MLABHELL1
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/monsterstyles/MLABGMINE
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/monsterstyles/MLABEMINE
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/monsterstyles
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/floorstyles
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles/decorstyles
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/styles
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/mlab/mlabspiraltower
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/mlab
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/editor/walls
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/editor/picks
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/editor
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/WORLDMASKS
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/MISC/world
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel/MISC
-@dirrm %%DATADIR%%/maps/unlinked/mlab-devel
-@dirrm %%DATADIR%%/maps/unlinked/kandora/elcyon
-@dirrm %%DATADIR%%/maps/unlinked/kandora/circus
-@dirrm %%DATADIR%%/maps/unlinked/kandora/cave
-@dirrm %%DATADIR%%/maps/unlinked/kandora
-@dirrm %%DATADIR%%/maps/unlinked/casino
-@dirrm %%DATADIR%%/maps/unlinked/academy.crap
-@dirrm %%DATADIR%%/maps/unlinked/ImperialPost/python
-@dirrm %%DATADIR%%/maps/unlinked/ImperialPost/local/ImperialPost
-@dirrm %%DATADIR%%/maps/unlinked/ImperialPost/local
-@dirrm %%DATADIR%%/maps/unlinked/ImperialPost
-@dirrm %%DATADIR%%/maps/unlinked/Greyshield
-@dirrm %%DATADIR%%/maps/unlinked
 @dirrm %%DATADIR%%/maps/under_world
-@dirrm %%DATADIR%%/maps/test/anthony
-@dirrm %%DATADIR%%/maps/test
 @dirrm %%DATADIR%%/maps/templates/keep
-@dirrm %%DATADIR%%/maps/templates/house
 @dirrm %%DATADIR%%/maps/templates/guild
 @dirrm %%DATADIR%%/maps/templates/bungalo
 @dirrm %%DATADIR%%/maps/templates
@@ -3315,7 +3164,6 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/styles/wallstyles
 @dirrm %%DATADIR%%/maps/styles/treasurestyles
 @dirrm %%DATADIR%%/maps/styles/trapstyles
-@dirrm %%DATADIR%%/maps/styles/specialstyles
 @dirrm %%DATADIR%%/maps/styles/specialmaps
 @dirrm %%DATADIR%%/maps/styles/monsterstyles/wyvern
 @dirrm %%DATADIR%%/maps/styles/monsterstyles/vegetable
@@ -3357,7 +3205,6 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/scorn/shops
 @dirrm %%DATADIR%%/maps/scorn/peterm
 @dirrm %%DATADIR%%/maps/scorn/oldcity
-@dirrm %%DATADIR%%/maps/scorn/mlab
 @dirrm %%DATADIR%%/maps/scorn/misc/battle_arena
 @dirrm %%DATADIR%%/maps/scorn/misc
 @dirrm %%DATADIR%%/maps/scorn/mansion
@@ -3412,20 +3259,11 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/python/misc
 @dirrm %%DATADIR%%/maps/python/items
 @dirrm %%DATADIR%%/maps/python/guilds
-@dirrm %%DATADIR%%/maps/python/events/tell
-@dirrm %%DATADIR%%/maps/python/events/shout
 @dirrm %%DATADIR%%/maps/python/events/remove
 @dirrm %%DATADIR%%/maps/python/events/muzzle
-@dirrm %%DATADIR%%/maps/python/events/mapreset
-@dirrm %%DATADIR%%/maps/python/events/mapleave
-@dirrm %%DATADIR%%/maps/python/events/mapenter
-@dirrm %%DATADIR%%/maps/python/events/logout
 @dirrm %%DATADIR%%/maps/python/events/login
 @dirrm %%DATADIR%%/maps/python/events/kick
 @dirrm %%DATADIR%%/maps/python/events/init
-@dirrm %%DATADIR%%/maps/python/events/gkill
-@dirrm %%DATADIR%%/maps/python/events/death
-@dirrm %%DATADIR%%/maps/python/events/clock
 @dirrm %%DATADIR%%/maps/python/events/born
 @dirrm %%DATADIR%%/maps/python/events
 @dirrm %%DATADIR%%/maps/python/casino
@@ -3495,7 +3333,6 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/navar_city/casino_infernal
 @dirrm %%DATADIR%%/maps/navar_city/apartments
 @dirrm %%DATADIR%%/maps/navar_city
-@dirrm %%DATADIR%%/maps/mlab/citydeclouds/citydecloudsvilla
 @dirrm %%DATADIR%%/maps/mlab/citydeclouds/cdcspire
 @dirrm %%DATADIR%%/maps/mlab/citydeclouds/cdccastlekeep
 @dirrm %%DATADIR%%/maps/mlab/citydeclouds/cdcbigstore
@@ -3506,14 +3343,12 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/lake_country/snake_pit
 @dirrm %%DATADIR%%/maps/lake_country/small_buildings
 @dirrm %%DATADIR%%/maps/lake_country/shops
-@dirrm %%DATADIR%%/maps/lake_country/quest
 @dirrm %%DATADIR%%/maps/lake_country/marsh
 @dirrm %%DATADIR%%/maps/lake_country/ebony
 @dirrm %%DATADIR%%/maps/lake_country/dragon_hangar
 @dirrm %%DATADIR%%/maps/lake_country/Sunset_Lake
 @dirrm %%DATADIR%%/maps/lake_country/RETower
 @dirrm %%DATADIR%%/maps/lake_country/Mwizard
-@dirrm %%DATADIR%%/maps/lake_country/Butakis/houses/CVS.bak
 @dirrm %%DATADIR%%/maps/lake_country/Butakis/houses
 @dirrm %%DATADIR%%/maps/lake_country/Butakis
 @dirrm %%DATADIR%%/maps/lake_country
@@ -3528,12 +3363,12 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/dungeons/grukks
 @dirrm %%DATADIR%%/maps/dungeons
 @dirrm %%DATADIR%%/maps/dragonisland
-@dirrm %%DATADIR%%/maps/debian
 @dirrm %%DATADIR%%/maps/darcap/undead
 @dirrm %%DATADIR%%/maps/darcap/town2
 @dirrm %%DATADIR%%/maps/darcap/quest
 @dirrm %%DATADIR%%/maps/darcap/lynn
 @dirrm %%DATADIR%%/maps/darcap/forgotten_town/shops
+@dirrm %%DATADIR%%/maps/darcap/forgotten_town/quests
 @dirrm %%DATADIR%%/maps/darcap/forgotten_town
 @dirrm %%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron
 @dirrm %%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger
@@ -3543,8 +3378,6 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/darcap/cave
 @dirrm %%DATADIR%%/maps/darcap/castle
 @dirrm %%DATADIR%%/maps/darcap
-@dirrm %%DATADIR%%/maps/crow/train
-@dirrm %%DATADIR%%/maps/crow
 @dirrm %%DATADIR%%/maps/brest/zorn
 @dirrm %%DATADIR%%/maps/brest/shops
 @dirrm %%DATADIR%%/maps/brest/pshops/pshop9