Changes for 1.11.0:

* Bug fixes
* Improvements
PkgSrc:
* crossfire-maps is integrated into crossfire-server, since the server requires
  maps to run

17 files changed, 899 insertions, 679 deletions

diff --git a/games/Makefile b/games/Makefile
index 403bd056e06..f221de69832 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.308 2008/10/26 09:53:16 bjs Exp $
+# $NetBSD: Makefile,v 1.309 2008/11/04 08:36:34 adam Exp $
 #
 
 COMMENT=	Games
@@ -54,7 +54,6 @@ SUBDIR+=	criticalmass
 SUBDIR+=	crossfire-client
 SUBDIR+=	crossfire-client-gtk
 SUBDIR+=	crossfire-client-gtk2
-SUBDIR+=	crossfire-maps
 SUBDIR+=	crossfire-server
 SUBDIR+=	d2x
 SUBDIR+=	dd2
diff --git a/games/crossfire-client-gtk/Makefile b/games/crossfire-client-gtk/Makefile
index 90c6f533dbf..423f20eb1e9 100644
--- a/games/crossfire-client-gtk/Makefile
+++ b/games/crossfire-client-gtk/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:30 joerg Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.3 2008/11/04 08:36:34 adam Exp $
 
 .include "../../games/crossfire-client/Makefile.common"
 
diff --git a/games/crossfire-client-gtk2/Makefile b/games/crossfire-client-gtk2/Makefile
index 45c11cd1237..0f65e7003a7 100644
--- a/games/crossfire-client-gtk2/Makefile
+++ b/games/crossfire-client-gtk2/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:30 joerg Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.3 2008/11/04 08:36:34 adam Exp $
 
 .include "../../games/crossfire-client/Makefile.common"
 
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 7defee4ba29..768e455561b 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:30 joerg Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.4 2008/11/04 08:36:34 adam Exp $
 
 .include "../../games/crossfire-client/Makefile.common"
 
diff --git a/games/crossfire-client/Makefile.common b/games/crossfire-client/Makefile.common
index a196ce037f5..6ff64b8f42f 100644
--- a/games/crossfire-client/Makefile.common
+++ b/games/crossfire-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2007/02/02 18:29:17 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/11/04 08:36:34 adam Exp $
 
 DISTNAME=	crossfire-client-${CROSSFIRE_VERSION}
 CATEGORIES=	games x11
@@ -7,11 +7,13 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=crossfire/}
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://crossfire.real-time.com/
 
-CROSSFIRE_VERSION=	1.9.0
+CROSSFIRE_VERSION=	1.11.0
 
 DISTINFO_FILE=		${.CURDIR}/../../games/crossfire-client/distinfo
 PATCHDIR=		${.CURDIR}/../../games/crossfire-client/patches
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake perl:run
 GNU_CONFIGURE=		yes
 
@@ -23,5 +25,9 @@ SUBST_MESSAGE.dsp=	Adjusting path to sound device.
 SUBST_FILES.dsp=	sound-src/cfsndserv.c
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
+.include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/games/crossfire-client/distinfo b/games/crossfire-client/distinfo
index f85c55616cf..64840462581 100644
--- a/games/crossfire-client/distinfo
+++ b/games/crossfire-client/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/11 05:57:14 adam Exp $
+$NetBSD: distinfo,v 1.2 2008/11/04 08:36:34 adam Exp $
 
-SHA1 (crossfire-client-1.9.0.tar.gz) = e9fc879eed5f5c031ae77f74161a57c22a3adbcc
-RMD160 (crossfire-client-1.9.0.tar.gz) = 6b31ade814d3db36a9dd5566bcab83f51c67c235
-Size (crossfire-client-1.9.0.tar.gz) = 735957 bytes
+SHA1 (crossfire-client-1.11.0.tar.gz) = 934618207de854841c3e4673f896e9784ee70073
+RMD160 (crossfire-client-1.11.0.tar.gz) = 9fffcd301c0f32a583b5f6e5a9db77c7900d1cd7
+Size (crossfire-client-1.11.0.tar.gz) = 759887 bytes
+SHA1 (crossfire-client-images-1.11.0.tar.gz) = 78f25f3dadcdfb85121a9d9fd0dab534980b02a7
+RMD160 (crossfire-client-images-1.11.0.tar.gz) = d7aa59d49c76bc1d16a3a33c36fd0d038cea9824
+Size (crossfire-client-images-1.11.0.tar.gz) = 2731254 bytes
+SHA1 (crossfire-client-sounds-1.11.0.tar.gz) = a6e2d6b7b00ef610ffc8b3462cf51655415791b6
+RMD160 (crossfire-client-sounds-1.11.0.tar.gz) = 85250759a46927ea45976e86acb26c6b61c7686c
+Size (crossfire-client-sounds-1.11.0.tar.gz) = 322847 bytes
diff --git a/games/crossfire-maps/DESCR b/games/crossfire-maps/DESCR
deleted file mode 100644
index 5688fcdd17c..00000000000
--- a/games/crossfire-maps/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Crossfire is a multi-player graphical arcade and adventure game made for the
-X Windows systems environment. It has certain flavours from other games,
-especially gauntlet and the rogue-like games (Nethack, Moria, Angband, and
-Ragnarok.) Any number of players can move around in their own window, finding
-and using items and battling monsters. They can choose to cooperate or compete
-in the same world.
-
-In the years of development that have followed, Crossfire has grown to
-encompass over 150 monsters, ~3000 maps to explore, an elaborate magic system,
-over 15 character types, a system of skills, and many, many artifacts and
-treasures.
diff --git a/games/crossfire-maps/Makefile b/games/crossfire-maps/Makefile
deleted file mode 100644
index 41faa858c89..00000000000
--- a/games/crossfire-maps/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2008/04/07 16:53:38 joerg Exp $
-
-DISTNAME=	crossfire-1.9.0-1.maps
-PKGNAME=	crossfire-maps-1.9.0.1
-PKGREVISION=	1
-CATEGORIES=	games x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=crossfire/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://crossfire.real-time.com/
-COMMENT=	X11 multi/single player game similar to gauntlet and nethack
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-DEPENDS+=	crossfire-server>=1.9.0:../../games/crossfire-server
-
-USE_TOOLS+=	bash:run perl:run
-
-WRKSRC=			${WRKDIR}/maps
-NO_BUILD=		yes
-
-PLIST_SRC=	${WRKDIR}/PLIST PLIST
-
-REPLACE_BASH+=	brest/pshops/pshop_copier
-REPLACE_PERL+=	Info/combine.pl Info/map_sed.pl Info/rewrite_exits.pl
-REPLACE_PERL+=	Info/rewrite_styles.pl Info/update_apart.pl Info/update_exits.pl
-
-INSTALLATION_DIRS=	share/crossfire/maps
-
-do-install:
-	cd ${WRKDIR} && ${CP} -R maps ${DESTDIR}${PREFIX}/share/crossfire
-	cd ${DESTDIR}${PREFIX} && \
-		${FIND} share/crossfire/maps -type f -print >> ${WRKDIR}/PLIST
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/games/crossfire-maps/PLIST b/games/crossfire-maps/PLIST
deleted file mode 100644
index faaba0a7e77..00000000000
--- a/games/crossfire-maps/PLIST
+++ /dev/null
@@ -1,355 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/11 06:07:40 adam Exp $
-@dirrm share/crossfire/maps/world
-@dirrm share/crossfire/maps/wolfsburg/volcano
-@dirrm share/crossfire/maps/wolfsburg/tt
-@dirrm share/crossfire/maps/wolfsburg/temple
-@dirrm share/crossfire/maps/wolfsburg/magara/tower2
-@dirrm share/crossfire/maps/wolfsburg/magara/tower1
-@dirrm share/crossfire/maps/wolfsburg/magara/cellar1
-@dirrm share/crossfire/maps/wolfsburg/magara/castle
-@dirrm share/crossfire/maps/wolfsburg/magara
-@dirrm share/crossfire/maps/wolfsburg/guilds/damned_heretics
-@dirrm share/crossfire/maps/wolfsburg/guilds
-@dirrm share/crossfire/maps/wolfsburg/eeur
-@dirrm share/crossfire/maps/wolfsburg/dungeons
-@dirrm share/crossfire/maps/wolfsburg
-@dirrm share/crossfire/maps/whalingoutpost/underwaterdungeon
-@dirrm share/crossfire/maps/whalingoutpost/taverns
-@dirrm share/crossfire/maps/whalingoutpost/misc
-@dirrm share/crossfire/maps/whalingoutpost/houses
-@dirrm share/crossfire/maps/whalingoutpost
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/wallstyles
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/monsterstyles/MLABICE
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/monsterstyles/MLABHELL2
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/monsterstyles/MLABHELL1
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/monsterstyles/MLABGMINE
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/monsterstyles/MLABEMINE
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/monsterstyles
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/floorstyles
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles/decorstyles
-@dirrm share/crossfire/maps/unlinked/mlab-devel/styles
-@dirrm share/crossfire/maps/unlinked/mlab-devel/mlab/mlabspiraltower
-@dirrm share/crossfire/maps/unlinked/mlab-devel/mlab
-@dirrm share/crossfire/maps/unlinked/mlab-devel/editor/walls
-@dirrm share/crossfire/maps/unlinked/mlab-devel/editor/picks
-@dirrm share/crossfire/maps/unlinked/mlab-devel/editor
-@dirrm share/crossfire/maps/unlinked/mlab-devel/WORLDMASKS
-@dirrm share/crossfire/maps/unlinked/mlab-devel/MISC/world
-@dirrm share/crossfire/maps/unlinked/mlab-devel/MISC
-@dirrm share/crossfire/maps/unlinked/mlab-devel
-@dirrm share/crossfire/maps/unlinked/kandora/elcyon
-@dirrm share/crossfire/maps/unlinked/kandora/circus
-@dirrm share/crossfire/maps/unlinked/kandora/cave
-@dirrm share/crossfire/maps/unlinked/kandora
-@dirrm share/crossfire/maps/unlinked/casino
-@dirrm share/crossfire/maps/unlinked/academy.crap
-@dirrm share/crossfire/maps/unlinked/ImperialPost/python
-@dirrm share/crossfire/maps/unlinked/ImperialPost/local/ImperialPost
-@dirrm share/crossfire/maps/unlinked/ImperialPost/local
-@dirrm share/crossfire/maps/unlinked/ImperialPost
-@dirrm share/crossfire/maps/unlinked/Greyshield
-@dirrm share/crossfire/maps/unlinked
-@dirrm share/crossfire/maps/under_world
-@dirrm share/crossfire/maps/test/anthony
-@dirrm share/crossfire/maps/test
-@dirrm share/crossfire/maps/templates/keep
-@dirrm share/crossfire/maps/templates/house
-@dirrm share/crossfire/maps/templates/guild
-@dirrm share/crossfire/maps/templates/bungalo
-@dirrm share/crossfire/maps/templates
-@dirrm share/crossfire/maps/teamarena
-@dirrm share/crossfire/maps/styles/wallstyles
-@dirrm share/crossfire/maps/styles/treasurestyles
-@dirrm share/crossfire/maps/styles/trapstyles
-@dirrm share/crossfire/maps/styles/specialstyles
-@dirrm share/crossfire/maps/styles/specialmaps
-@dirrm share/crossfire/maps/styles/monsterstyles/wyvern
-@dirrm share/crossfire/maps/styles/monsterstyles/vegetable
-@dirrm share/crossfire/maps/styles/monsterstyles/undead_quest
-@dirrm share/crossfire/maps/styles/monsterstyles/undead
-@dirrm share/crossfire/maps/styles/monsterstyles/sylvan
-@dirrm share/crossfire/maps/styles/monsterstyles/subterranean
-@dirrm share/crossfire/maps/styles/monsterstyles/orc
-@dirrm share/crossfire/maps/styles/monsterstyles/nethack
-@dirrm share/crossfire/maps/styles/monsterstyles/insect
-@dirrm share/crossfire/maps/styles/monsterstyles/imp
-@dirrm share/crossfire/maps/styles/monsterstyles/humanoid
-@dirrm share/crossfire/maps/styles/monsterstyles/dragon
-@dirrm share/crossfire/maps/styles/monsterstyles/demon
-@dirrm share/crossfire/maps/styles/monsterstyles/city
-@dirrm share/crossfire/maps/styles/monsterstyles/chaos
-@dirrm share/crossfire/maps/styles/monsterstyles/animal
-@dirrm share/crossfire/maps/styles/monsterstyles/angel
-@dirrm share/crossfire/maps/styles/monsterstyles
-@dirrm share/crossfire/maps/styles/misc
-@dirrm share/crossfire/maps/styles/floorstyles
-@dirrm share/crossfire/maps/styles/exitstyles/up
-@dirrm share/crossfire/maps/styles/exitstyles/generic
-@dirrm share/crossfire/maps/styles/exitstyles/down
-@dirrm share/crossfire/maps/styles/exitstyles
-@dirrm share/crossfire/maps/styles/doorstyles/vdoors
-@dirrm share/crossfire/maps/styles/doorstyles/special
-@dirrm share/crossfire/maps/styles/doorstyles/secret_vdoors
-@dirrm share/crossfire/maps/styles/doorstyles/secret_hdoors
-@dirrm share/crossfire/maps/styles/doorstyles/hdoors
-@dirrm share/crossfire/maps/styles/doorstyles
-@dirrm share/crossfire/maps/styles/decorstyles
-@dirrm share/crossfire/maps/styles
-@dirrm share/crossfire/maps/start
-@dirrm share/crossfire/maps/sisters
-@dirrm share/crossfire/maps/scorn/towers
-@dirrm share/crossfire/maps/scorn/temples
-@dirrm share/crossfire/maps/scorn/taverns
-@dirrm share/crossfire/maps/scorn/shops
-@dirrm share/crossfire/maps/scorn/peterm
-@dirrm share/crossfire/maps/scorn/oldcity
-@dirrm share/crossfire/maps/scorn/mlab
-@dirrm share/crossfire/maps/scorn/misc/battle_arena
-@dirrm share/crossfire/maps/scorn/misc
-@dirrm share/crossfire/maps/scorn/mansion
-@dirrm share/crossfire/maps/scorn/magara
-@dirrm share/crossfire/maps/scorn/kar
-@dirrm share/crossfire/maps/scorn/houses
-@dirrm share/crossfire/maps/scorn/guilds/mailed_fist
-@dirrm share/crossfire/maps/scorn/guilds
-@dirrm share/crossfire/maps/scorn/dtabb
-@dirrm share/crossfire/maps/scorn/crow/train
-@dirrm share/crossfire/maps/scorn/crow
-@dirrm share/crossfire/maps/scorn/cannery
-@dirrm share/crossfire/maps/scorn/apartment
-@dirrm share/crossfire/maps/scorn/anthony
-@dirrm share/crossfire/maps/scorn
-@dirrm share/crossfire/maps/santo_dominion/shops
-@dirrm share/crossfire/maps/santo_dominion/mudman
-@dirrm share/crossfire/maps/santo_dominion/magara/well
-@dirrm share/crossfire/maps/santo_dominion/magara/south_lighthouse
-@dirrm share/crossfire/maps/santo_dominion/magara/north_lighthouse
-@dirrm share/crossfire/maps/santo_dominion/magara/hut
-@dirrm share/crossfire/maps/santo_dominion/magara
-@dirrm share/crossfire/maps/santo_dominion/lord_byron
-@dirrm share/crossfire/maps/santo_dominion/houses
-@dirrm share/crossfire/maps/santo_dominion/guilds/drunken_barbarian
-@dirrm share/crossfire/maps/santo_dominion/guilds
-@dirrm share/crossfire/maps/santo_dominion/espen
-@dirrm share/crossfire/maps/santo_dominion/eeur
-@dirrm share/crossfire/maps/santo_dominion
-@dirrm share/crossfire/maps/quests/todd/aljwaf
-@dirrm share/crossfire/maps/quests/todd
-@dirrm share/crossfire/maps/quests/skud
-@dirrm share/crossfire/maps/quests/peterm/temple
-@dirrm share/crossfire/maps/quests/peterm/quests
-@dirrm share/crossfire/maps/quests/peterm/FireTemple
-@dirrm share/crossfire/maps/quests/peterm/DragonQuest
-@dirrm share/crossfire/maps/quests/peterm/Demonology
-@dirrm share/crossfire/maps/quests/peterm/CTower
-@dirrm share/crossfire/maps/quests/peterm
-@dirrm share/crossfire/maps/quests/mcz
-@dirrm share/crossfire/maps/quests/mak/unnatural
-@dirrm share/crossfire/maps/quests/mak/undead
-@dirrm share/crossfire/maps/quests/mak/troll_cave
-@dirrm share/crossfire/maps/quests/mak/mansion
-@dirrm share/crossfire/maps/quests/mak/giant
-@dirrm share/crossfire/maps/quests/mak/dragons
-@dirrm share/crossfire/maps/quests/mak/chaos
-@dirrm share/crossfire/maps/quests/mak
-@dirrm share/crossfire/maps/quests/hendel
-@dirrm share/crossfire/maps/quests/cd
-@dirrm share/crossfire/maps/quests
-@dirrm share/crossfire/maps/python/misc
-@dirrm share/crossfire/maps/python/items
-@dirrm share/crossfire/maps/python/guilds
-@dirrm share/crossfire/maps/python/events/tell
-@dirrm share/crossfire/maps/python/events/shout
-@dirrm share/crossfire/maps/python/events/remove
-@dirrm share/crossfire/maps/python/events/muzzle
-@dirrm share/crossfire/maps/python/events/mapreset
-@dirrm share/crossfire/maps/python/events/mapleave
-@dirrm share/crossfire/maps/python/events/mapenter
-@dirrm share/crossfire/maps/python/events/logout
-@dirrm share/crossfire/maps/python/events/login
-@dirrm share/crossfire/maps/python/events/kick
-@dirrm share/crossfire/maps/python/events/init
-@dirrm share/crossfire/maps/python/events/gkill
-@dirrm share/crossfire/maps/python/events/death
-@dirrm share/crossfire/maps/python/events/clock
-@dirrm share/crossfire/maps/python/events/born
-@dirrm share/crossfire/maps/python/events
-@dirrm share/crossfire/maps/python/casino
-@dirrm share/crossfire/maps/python/IPO
-@dirrm share/crossfire/maps/python
-@dirrm share/crossfire/maps/pup_land/s_f
-@dirrm share/crossfire/maps/pup_land/ruin_barbarian
-@dirrm share/crossfire/maps/pup_land/rainbow/red_town
-@dirrm share/crossfire/maps/pup_land/rainbow/Lv7
-@dirrm share/crossfire/maps/pup_land/rainbow/Lv6
-@dirrm share/crossfire/maps/pup_land/rainbow/Lv5
-@dirrm share/crossfire/maps/pup_land/rainbow/Lv4
-@dirrm share/crossfire/maps/pup_land/rainbow/Lv3
-@dirrm share/crossfire/maps/pup_land/rainbow/Lv2
-@dirrm share/crossfire/maps/pup_land/rainbow/Lv1
-@dirrm share/crossfire/maps/pup_land/rainbow
-@dirrm share/crossfire/maps/pup_land/raffle
-@dirrm share/crossfire/maps/pup_land/pplant
-@dirrm share/crossfire/maps/pup_land/ordeal
-@dirrm share/crossfire/maps/pup_land/nurnberg/reception
-@dirrm share/crossfire/maps/pup_land/nurnberg/dragonhangar
-@dirrm share/crossfire/maps/pup_land/nurnberg/dick
-@dirrm share/crossfire/maps/pup_land/nurnberg/castle_bauer
-@dirrm share/crossfire/maps/pup_land/nurnberg/apartment
-@dirrm share/crossfire/maps/pup_land/nurnberg
-@dirrm share/crossfire/maps/pup_land/lone_town/shops
-@dirrm share/crossfire/maps/pup_land/lone_town/dragonhangar
-@dirrm share/crossfire/maps/pup_land/lone_town/cave
-@dirrm share/crossfire/maps/pup_land/lone_town/apartment
-@dirrm share/crossfire/maps/pup_land/lone_town
-@dirrm share/crossfire/maps/pup_land/kurte
-@dirrm share/crossfire/maps/pup_land/jk
-@dirrm share/crossfire/maps/pup_land/guilds/purple_butterfly
-@dirrm share/crossfire/maps/pup_land/guilds/laughing_skull
-@dirrm share/crossfire/maps/pup_land/guilds
-@dirrm share/crossfire/maps/pup_land/cave_weapon
-@dirrm share/crossfire/maps/pup_land/castle_eureca
-@dirrm share/crossfire/maps/pup_land/begin
-@dirrm share/crossfire/maps/pup_land/ancient/volcano
-@dirrm share/crossfire/maps/pup_land/ancient/village/siegfried
-@dirrm share/crossfire/maps/pup_land/ancient/village/hole
-@dirrm share/crossfire/maps/pup_land/ancient/village
-@dirrm share/crossfire/maps/pup_land/ancient/ruin
-@dirrm share/crossfire/maps/pup_land/ancient/mountain
-@dirrm share/crossfire/maps/pup_land/ancient/kurte
-@dirrm share/crossfire/maps/pup_land/ancient/castle
-@dirrm share/crossfire/maps/pup_land/ancient
-@dirrm share/crossfire/maps/pup_land
-@dirrm share/crossfire/maps/port_joseph/town
-@dirrm share/crossfire/maps/port_joseph/pirates
-@dirrm share/crossfire/maps/port_joseph/goblin
-@dirrm share/crossfire/maps/port_joseph
-@dirrm share/crossfire/maps/planes
-@dirrm share/crossfire/maps/navar_city/tower
-@dirrm share/crossfire/maps/navar_city/temples
-@dirrm share/crossfire/maps/navar_city/smugglers_cove
-@dirrm share/crossfire/maps/navar_city/slums
-@dirrm share/crossfire/maps/navar_city/mlab
-@dirrm share/crossfire/maps/navar_city/misc
-@dirrm share/crossfire/maps/navar_city/magara/houses
-@dirrm share/crossfire/maps/navar_city/magara
-@dirrm share/crossfire/maps/navar_city/light
-@dirrm share/crossfire/maps/navar_city/jail
-@dirrm share/crossfire/maps/navar_city/illusion
-@dirrm share/crossfire/maps/navar_city/dreaming_sage
-@dirrm share/crossfire/maps/navar_city/dragon_hangar
-@dirrm share/crossfire/maps/navar_city/casino_infernal
-@dirrm share/crossfire/maps/navar_city/apartments
-@dirrm share/crossfire/maps/navar_city
-@dirrm share/crossfire/maps/mlab/citydeclouds/citydecloudsvilla
-@dirrm share/crossfire/maps/mlab/citydeclouds/cdcspire
-@dirrm share/crossfire/maps/mlab/citydeclouds/cdccastlekeep
-@dirrm share/crossfire/maps/mlab/citydeclouds/cdcbigstore
-@dirrm share/crossfire/maps/mlab/citydeclouds/bank
-@dirrm share/crossfire/maps/mlab/citydeclouds
-@dirrm share/crossfire/maps/mlab
-@dirrm share/crossfire/maps/marksel
-@dirrm share/crossfire/maps/lake_country/snake_pit
-@dirrm share/crossfire/maps/lake_country/small_buildings
-@dirrm share/crossfire/maps/lake_country/shops
-@dirrm share/crossfire/maps/lake_country/quest
-@dirrm share/crossfire/maps/lake_country/marsh
-@dirrm share/crossfire/maps/lake_country/ebony
-@dirrm share/crossfire/maps/lake_country/dragon_hangar
-@dirrm share/crossfire/maps/lake_country/Sunset_Lake
-@dirrm share/crossfire/maps/lake_country/RETower
-@dirrm share/crossfire/maps/lake_country/Mwizard
-@dirrm share/crossfire/maps/lake_country/Butakis/houses/CVS.bak
-@dirrm share/crossfire/maps/lake_country/Butakis/houses
-@dirrm share/crossfire/maps/lake_country/Butakis
-@dirrm share/crossfire/maps/lake_country
-@dirrm share/crossfire/maps/inn_and_outpost
-@dirrm share/crossfire/maps/euthville
-@dirrm share/crossfire/maps/editor/walls
-@dirrm share/crossfire/maps/editor/picks
-@dirrm share/crossfire/maps/editor
-@dirrm share/crossfire/maps/dungeons/train
-@dirrm share/crossfire/maps/dungeons/monkey_temple
-@dirrm share/crossfire/maps/dungeons/hut
-@dirrm share/crossfire/maps/dungeons/grukks
-@dirrm share/crossfire/maps/dungeons
-@dirrm share/crossfire/maps/dragonisland
-@dirrm share/crossfire/maps/debian
-@dirrm share/crossfire/maps/darcap/undead
-@dirrm share/crossfire/maps/darcap/town2
-@dirrm share/crossfire/maps/darcap/quest
-@dirrm share/crossfire/maps/darcap/lynn
-@dirrm share/crossfire/maps/darcap/forgotten_town/shops
-@dirrm share/crossfire/maps/darcap/forgotten_town
-@dirrm share/crossfire/maps/darcap/darcap/guilds/smoking_cauldron
-@dirrm share/crossfire/maps/darcap/darcap/guilds/poisoned_dagger
-@dirrm share/crossfire/maps/darcap/darcap/guilds
-@dirrm share/crossfire/maps/darcap/darcap/circus
-@dirrm share/crossfire/maps/darcap/darcap
-@dirrm share/crossfire/maps/darcap/cave
-@dirrm share/crossfire/maps/darcap/castle
-@dirrm share/crossfire/maps/darcap
-@dirrm share/crossfire/maps/crow/train
-@dirrm share/crossfire/maps/crow
-@dirrm share/crossfire/maps/brest/zorn
-@dirrm share/crossfire/maps/brest/shops
-@dirrm share/crossfire/maps/brest/pshops/pshop9
-@dirrm share/crossfire/maps/brest/pshops/pshop8
-@dirrm share/crossfire/maps/brest/pshops/pshop7
-@dirrm share/crossfire/maps/brest/pshops/pshop6
-@dirrm share/crossfire/maps/brest/pshops/pshop5
-@dirrm share/crossfire/maps/brest/pshops/pshop4
-@dirrm share/crossfire/maps/brest/pshops/pshop3
-@dirrm share/crossfire/maps/brest/pshops/pshop27
-@dirrm share/crossfire/maps/brest/pshops/pshop26
-@dirrm share/crossfire/maps/brest/pshops/pshop25
-@dirrm share/crossfire/maps/brest/pshops/pshop24
-@dirrm share/crossfire/maps/brest/pshops/pshop23
-@dirrm share/crossfire/maps/brest/pshops/pshop22
-@dirrm share/crossfire/maps/brest/pshops/pshop21
-@dirrm share/crossfire/maps/brest/pshops/pshop20
-@dirrm share/crossfire/maps/brest/pshops/pshop2
-@dirrm share/crossfire/maps/brest/pshops/pshop19
-@dirrm share/crossfire/maps/brest/pshops/pshop18
-@dirrm share/crossfire/maps/brest/pshops/pshop17
-@dirrm share/crossfire/maps/brest/pshops/pshop16
-@dirrm share/crossfire/maps/brest/pshops/pshop15
-@dirrm share/crossfire/maps/brest/pshops/pshop14
-@dirrm share/crossfire/maps/brest/pshops/pshop13
-@dirrm share/crossfire/maps/brest/pshops/pshop12
-@dirrm share/crossfire/maps/brest/pshops/pshop11
-@dirrm share/crossfire/maps/brest/pshops/pshop10
-@dirrm share/crossfire/maps/brest/pshops/pshop1
-@dirrm share/crossfire/maps/brest/pshops
-@dirrm share/crossfire/maps/brest/brittany
-@dirrm share/crossfire/maps/brest/black_shield
-@dirrm share/crossfire/maps/brest/asyvan
-@dirrm share/crossfire/maps/brest/apartments
-@dirrm share/crossfire/maps/brest/Castle
-@dirrm share/crossfire/maps/brest
-@dirrm share/crossfire/maps/azumauindo/zaseki_dzuki_ryoku
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/towers
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/tou
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/temples
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/shops
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/nenshou_youso
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/gates
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/buildings
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/apartments
-@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi
-@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/towers
-@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/temples
-@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/shops
-@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/gates
-@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/apartments
-@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi
-@dirrm share/crossfire/maps/azumauindo/misc
-@dirrm share/crossfire/maps/azumauindo/minatomachi/temples
-@dirrm share/crossfire/maps/azumauindo/minatomachi/stores
-@dirrm share/crossfire/maps/azumauindo/minatomachi/ketsueki_itsuryuu
-@dirrm share/crossfire/maps/azumauindo/minatomachi/gates
-@dirrm share/crossfire/maps/azumauindo/minatomachi/buildings
-@dirrm share/crossfire/maps/azumauindo/minatomachi
-@dirrm share/crossfire/maps/azumauindo
-@dirrm share/crossfire/maps/Info
-@dirrm share/crossfire/maps
diff --git a/games/crossfire-maps/distinfo b/games/crossfire-maps/distinfo
deleted file mode 100644
index 4261359eda2..00000000000
--- a/games/crossfire-maps/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/11 06:07:40 adam Exp $
-
-SHA1 (crossfire-1.9.0-1.maps.tar.bz2) = 32c178e69a35fb23d9ee0f1737e53e28f5e14c14
-RMD160 (crossfire-1.9.0-1.maps.tar.bz2) = 8200639d0436e5c8075f0926cfb13dd1cec9ae30
-Size (crossfire-1.9.0-1.maps.tar.bz2) = 16158194 bytes
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 95db182dbdf..60d4c3b2adc 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -1,48 +1,90 @@
-# $NetBSD: Makefile,v 1.6 2008/06/12 02:14:30 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/11/04 08:36:34 adam Exp $
 
-DISTNAME=	crossfire-1.9.0
-PKGNAME=	crossfire-server-1.9.0
-PKGREVISION=	4
+DISTNAME=	crossfire-1.11.0
+PKGNAME=	crossfire-server-1.11.0
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=crossfire/}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=	${DISTNAME}.arch.tar.gz ${DISTNAME}.maps.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://crossfire.real-time.com/
 COMMENT=	X11 multi/single player game similar to gauntlet and nethack
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+PKG_SYSCONFSUBDIR=	crossfire
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl:run bash:run
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}/games
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/games
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		ac_cv_path_GZIP=${GZIP_CMD:Q}
+PLIST_SRC=		${WRKDIR}/PLIST PLIST
 
-REPLACE_BASH+=	utils/crossloop.web.in
+INSTALLATION_DIRS=	share/crossfire/arch
+INSTALLATION_DIRS+=	share/crossfire/maps
 
-REPLACE_PERL+=	doc/include_html.pl doc/playbook/make_index.pl
-REPLACE_PERL+=	doc/scripts/items-extract.pl doc/scripts/makeps.pl
-REPLACE_PERL+=	doc/scripts/monster-extract.pl lib/adm/archsearch.pl
-REPLACE_PERL+=	lib/adm/collect_images.pl lib/adm/map_expand.pl
-REPLACE_PERL+=	lib/adm/mapslitter.pl lib/checkarch.pl
-REPLACE_PERL+=	lib/collect.pl lib/util.pl utils/metaserver.pl
-REPLACE_PERL+=	utils/player_dl.pl.in utils/metaserver.pl.in
-REPLACE_PERL+=	utils/mktable.script lib/adm/map_info
+# crossfire
+REPLACE_BASH+=	utils/crossloop.web.in
+REPLACE_PERL+=	doc/include_html.pl
+REPLACE_PERL+=	doc/playbook/make_index.pl
+REPLACE_PERL+=	doc/scripts/items-extract.pl
+REPLACE_PERL+=	doc/scripts/makeps.pl
+REPLACE_PERL+=	doc/scripts/monster-extract.pl
+REPLACE_PERL+=	lib/adm/archsearch.pl
+REPLACE_PERL+=	lib/adm/collect_images.pl
+REPLACE_PERL+=	lib/adm/map_expand.pl
+REPLACE_PERL+=	lib/adm/mapslitter.pl
+REPLACE_PERL+=	lib/checkarch.pl
+REPLACE_PERL+=	lib/collect.pl
+REPLACE_PERL+=	lib/util.pl
+REPLACE_PERL+=	utils/metaserver.pl
+REPLACE_PERL+=	utils/player_dl.pl.in
+REPLACE_PERL+=	utils/metaserver.pl.in
+REPLACE_PERL+=	utils/mktable.script
+REPLACE_PERL+=	lib/adm/map_info
+# arch
+REPLACE_PERL+=	../arch/dev/scripts/update_armor.pl
+REPLACE_PERL+=	../arch/dev/scripts/update_body.pl
+REPLACE_PERL+=	../arch/dev/scripts/update_monster.pl
+REPLACE_PERL+=	../arch/dev/scripts/update_object.pl
+REPLACE_PERL+=	../arch/dev/scripts/update_shield.pl
+REPLACE_PERL+=	../arch/dev/split-png-linux.pl
+REPLACE_PERL+=	../arch/dev/splitter-png.pl
+REPLACE_PERL+=	../arch/dev/splitter.pl
+# maps
+REPLACE_BASH+=	../maps/brest/pshops/pshop_copier
+REPLACE_PERL+=	../maps/Info/combine.pl
+REPLACE_PERL+=	../maps/Info/map_sed.pl
+REPLACE_PERL+=	../maps/Info/rewrite_exits.pl
+REPLACE_PERL+=	../maps/Info/rewrite_styles.pl
+REPLACE_PERL+=	../maps/Info/update_apart.pl
+REPLACE_PERL+=	../maps/Info/update_exits.pl
 
 EGDIR=		${PREFIX}/share/examples/crossfire
-CONF_FILES+=	${EGDIR:Q}/ban_file ${PKG_SYSCONFDIR:Q}/crossfire/ban_file
-CONF_FILES+=	${EGDIR:Q}/dm_file ${PKG_SYSCONFDIR:Q}/crossfire/dm_file
-CONF_FILES+=	${EGDIR:Q}/exp_table ${PKG_SYSCONFDIR:Q}/crossfire/exp_table
-CONF_FILES+=	${EGDIR:Q}/forbid ${PKG_SYSCONFDIR:Q}/crossfire/forbid
-CONF_FILES+=	${EGDIR:Q}/motd ${PKG_SYSCONFDIR:Q}/crossfire/motd
-CONF_FILES+=	${EGDIR:Q}/news ${PKG_SYSCONFDIR:Q}/crossfire/news
-CONF_FILES+=	${EGDIR:Q}/rules ${PKG_SYSCONFDIR:Q}/crossfire/rules
-CONF_FILES+=	${EGDIR:Q}/settings ${PKG_SYSCONFDIR:Q}/crossfire/settings
+CONF_FILES+=	${EGDIR}/ban_file ${PKG_SYSCONFDIR}/ban_file
+CONF_FILES+=	${EGDIR}/dm_file ${PKG_SYSCONFDIR}/dm_file
+CONF_FILES+=	${EGDIR}/exp_table ${PKG_SYSCONFDIR}/exp_table
+CONF_FILES+=	${EGDIR}/forbid ${PKG_SYSCONFDIR}/forbid
+CONF_FILES+=	${EGDIR}/metaserver2 ${PKG_SYSCONFDIR}/metaserver2
+CONF_FILES+=	${EGDIR}/motd ${PKG_SYSCONFDIR}/motd
+CONF_FILES+=	${EGDIR}/news ${PKG_SYSCONFDIR}/news
+CONF_FILES+=	${EGDIR}/rules ${PKG_SYSCONFDIR}/rules
+CONF_FILES+=	${EGDIR}/settings ${PKG_SYSCONFDIR}/settings
+
+post-install:
+	cd ${WRKDIR} && cp -R arch maps ${DESTDIR}${PREFIX}/share/crossfire
+	cd ${DESTDIR}${PREFIX} && \
+		${FIND} share/crossfire/arch -type f -print >> ${WRKDIR}/PLIST
+	cd ${DESTDIR}${PREFIX} && \
+		${FIND} share/crossfire/maps -type f -print >> ${WRKDIR}/PLIST
+
+.include "options.mk"
 
 .include "../../graphics/png/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+
 .include "../../lang/python/application.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/crossfire-server/PLIST b/games/crossfire-server/PLIST
index 2e2bdd5941d..2691625f470 100644
--- a/games/crossfire-server/PLIST
+++ b/games/crossfire-server/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/11 05:59:36 adam Exp $
-bin/crossedit
+@comment $NetBSD: PLIST,v 1.2 2008/11/04 08:36:34 adam Exp $
+${PLIST.x11}bin/crossedit
 bin/crossfire
 bin/crossfire-config
 bin/crossloop
@@ -40,20 +40,28 @@ share/crossfire/help/brace
 share/crossfire/help/cast
 share/crossfire/help/drop
 share/crossfire/help/dropall
+share/crossfire/help/empty
+share/crossfire/help/explore
+share/crossfire/help/fire
+share/crossfire/help/fire_stop
 share/crossfire/help/golem
 share/crossfire/help/invoke
 share/crossfire/help/keys
 share/crossfire/help/killpets
 share/crossfire/help/listen
+share/crossfire/help/maps
 share/crossfire/help/mark
 share/crossfire/help/melee
 share/crossfire/help/mode
+share/crossfire/help/motd
 share/crossfire/help/mouse
 share/crossfire/help/move
+share/crossfire/help/news
 share/crossfire/help/output
 share/crossfire/help/output-count
 share/crossfire/help/output-sync
 share/crossfire/help/party
+share/crossfire/help/party_rejoin
 share/crossfire/help/peaceful
 share/crossfire/help/petmode
 share/crossfire/help/pickup
@@ -61,9 +69,11 @@ share/crossfire/help/quests
 share/crossfire/help/quit
 share/crossfire/help/range
 share/crossfire/help/rename
+share/crossfire/help/rules
 share/crossfire/help/save
 share/crossfire/help/shout
 share/crossfire/help/showpets
+share/crossfire/help/skills
 share/crossfire/help/sort_inventory
 share/crossfire/help/spells
 share/crossfire/help/statistics
@@ -76,7 +86,6 @@ share/crossfire/image_info
 share/crossfire/materials
 share/crossfire/messages
 share/crossfire/races
-share/crossfire/regions
 share/crossfire/smooth
 share/crossfire/treasures
 share/crossfire/wizhelp/abil
@@ -130,13 +139,715 @@ share/examples/crossfire/ban_file
 share/examples/crossfire/dm_file
 share/examples/crossfire/exp_table
 share/examples/crossfire/forbid
+share/examples/crossfire/metaserver2
 share/examples/crossfire/motd
 share/examples/crossfire/news
 share/examples/crossfire/rules
 share/examples/crossfire/settings
 @dirrm share/examples/crossfire
 @dirrm share/crossfire/wizhelp
+@dirrm share/crossfire/maps/world
+@dirrm share/crossfire/maps/wolfsburg/volcano
+@dirrm share/crossfire/maps/wolfsburg/tt
+@dirrm share/crossfire/maps/wolfsburg/temple
+@dirrm share/crossfire/maps/wolfsburg/shops
+@dirrm share/crossfire/maps/wolfsburg/magara/tower2
+@dirrm share/crossfire/maps/wolfsburg/magara/tower1
+@dirrm share/crossfire/maps/wolfsburg/magara/cellar1
+@dirrm share/crossfire/maps/wolfsburg/magara/castle
+@dirrm share/crossfire/maps/wolfsburg/magara
+@dirrm share/crossfire/maps/wolfsburg/guilds/damned_heretics
+@dirrm share/crossfire/maps/wolfsburg/guilds
+@dirrm share/crossfire/maps/wolfsburg/eeur
+@dirrm share/crossfire/maps/wolfsburg/dungeons
+@dirrm share/crossfire/maps/wolfsburg/apartments
+@dirrm share/crossfire/maps/wolfsburg
+@dirrm share/crossfire/maps/whalingoutpost/underwaterdungeon
+@dirrm share/crossfire/maps/whalingoutpost/taverns
+@dirrm share/crossfire/maps/whalingoutpost/misc
+@dirrm share/crossfire/maps/whalingoutpost/houses
+@dirrm share/crossfire/maps/whalingoutpost
+@dirrm share/crossfire/maps/unlinked/zornstuff
+@dirrm share/crossfire/maps/unlinked/kandora/elcyon
+@dirrm share/crossfire/maps/unlinked/kandora/circus
+@dirrm share/crossfire/maps/unlinked/kandora/cave
+@dirrm share/crossfire/maps/unlinked/kandora
+@dirrm share/crossfire/maps/unlinked/casino
+@dirrm share/crossfire/maps/unlinked/academy.crap
+@dirrm share/crossfire/maps/unlinked/Greyshield
+@dirrm share/crossfire/maps/unlinked
+@dirrm share/crossfire/maps/under_world
+@dirrm share/crossfire/maps/test/anthony
+@dirrm share/crossfire/maps/test
+@dirrm share/crossfire/maps/templates/keep
+@dirrm share/crossfire/maps/templates/guild
+@dirrm share/crossfire/maps/templates/bungalo
+@dirrm share/crossfire/maps/templates
+@dirrm share/crossfire/maps/teamarena
+@dirrm share/crossfire/maps/styles/wallstyles
+@dirrm share/crossfire/maps/styles/treasurestyles
+@dirrm share/crossfire/maps/styles/trapstyles
+@dirrm share/crossfire/maps/styles/specialmaps
+@dirrm share/crossfire/maps/styles/monsterstyles/wyvern
+@dirrm share/crossfire/maps/styles/monsterstyles/vegetable
+@dirrm share/crossfire/maps/styles/monsterstyles/undead_quest
+@dirrm share/crossfire/maps/styles/monsterstyles/undead
+@dirrm share/crossfire/maps/styles/monsterstyles/sylvan
+@dirrm share/crossfire/maps/styles/monsterstyles/subterranean
+@dirrm share/crossfire/maps/styles/monsterstyles/orc
+@dirrm share/crossfire/maps/styles/monsterstyles/nethack
+@dirrm share/crossfire/maps/styles/monsterstyles/insect
+@dirrm share/crossfire/maps/styles/monsterstyles/imp
+@dirrm share/crossfire/maps/styles/monsterstyles/humanoid
+@dirrm share/crossfire/maps/styles/monsterstyles/dwarf
+@dirrm share/crossfire/maps/styles/monsterstyles/dragon
+@dirrm share/crossfire/maps/styles/monsterstyles/demon
+@dirrm share/crossfire/maps/styles/monsterstyles/city
+@dirrm share/crossfire/maps/styles/monsterstyles/chaos
+@dirrm share/crossfire/maps/styles/monsterstyles/animal
+@dirrm share/crossfire/maps/styles/monsterstyles/angel
+@dirrm share/crossfire/maps/styles/monsterstyles
+@dirrm share/crossfire/maps/styles/misc
+@dirrm share/crossfire/maps/styles/floorstyles
+@dirrm share/crossfire/maps/styles/exitstyles/up
+@dirrm share/crossfire/maps/styles/exitstyles/generic
+@dirrm share/crossfire/maps/styles/exitstyles/down
+@dirrm share/crossfire/maps/styles/exitstyles
+@dirrm share/crossfire/maps/styles/doorstyles/vdoors
+@dirrm share/crossfire/maps/styles/doorstyles/special
+@dirrm share/crossfire/maps/styles/doorstyles/secret_vdoors
+@dirrm share/crossfire/maps/styles/doorstyles/secret_hdoors
+@dirrm share/crossfire/maps/styles/doorstyles/hdoors
+@dirrm share/crossfire/maps/styles/doorstyles
+@dirrm share/crossfire/maps/styles/decorstyles
+@dirrm share/crossfire/maps/styles
+@dirrm share/crossfire/maps/start/HallsOfSelection
+@dirrm share/crossfire/maps/start
+@dirrm share/crossfire/maps/sisters
+@dirrm share/crossfire/maps/scorn/towers
+@dirrm share/crossfire/maps/scorn/temples
+@dirrm share/crossfire/maps/scorn/taverns
+@dirrm share/crossfire/maps/scorn/shops
+@dirrm share/crossfire/maps/scorn/peterm
+@dirrm share/crossfire/maps/scorn/oldcity
+@dirrm share/crossfire/maps/scorn/misc/battle_arena
+@dirrm share/crossfire/maps/scorn/misc
+@dirrm share/crossfire/maps/scorn/mansion
+@dirrm share/crossfire/maps/scorn/magara
+@dirrm share/crossfire/maps/scorn/kar
+@dirrm share/crossfire/maps/scorn/houses
+@dirrm share/crossfire/maps/scorn/guilds/mailed_fist
+@dirrm share/crossfire/maps/scorn/guilds
+@dirrm share/crossfire/maps/scorn/dtabb
+@dirrm share/crossfire/maps/scorn/crow/train
+@dirrm share/crossfire/maps/scorn/crow
+@dirrm share/crossfire/maps/scorn/cannery
+@dirrm share/crossfire/maps/scorn/apartment
+@dirrm share/crossfire/maps/scorn/anthony
+@dirrm share/crossfire/maps/scorn
+@dirrm share/crossfire/maps/santo_dominion/temple_naive
+@dirrm share/crossfire/maps/santo_dominion/shops
+@dirrm share/crossfire/maps/santo_dominion/shaft
+@dirrm share/crossfire/maps/santo_dominion/mudman
+@dirrm share/crossfire/maps/santo_dominion/magara/well
+@dirrm share/crossfire/maps/santo_dominion/magara/south_lighthouse
+@dirrm share/crossfire/maps/santo_dominion/magara/north_lighthouse
+@dirrm share/crossfire/maps/santo_dominion/magara/hut
+@dirrm share/crossfire/maps/santo_dominion/magara
+@dirrm share/crossfire/maps/santo_dominion/lord_byron
+@dirrm share/crossfire/maps/santo_dominion/houses
+@dirrm share/crossfire/maps/santo_dominion/guilds/drunken_barbarian
+@dirrm share/crossfire/maps/santo_dominion/guilds
+@dirrm share/crossfire/maps/santo_dominion/espen
+@dirrm share/crossfire/maps/santo_dominion/eeur
+@dirrm share/crossfire/maps/santo_dominion
+@dirrm share/crossfire/maps/quests/todd/aljwaf
+@dirrm share/crossfire/maps/quests/todd
+@dirrm share/crossfire/maps/quests/skud
+@dirrm share/crossfire/maps/quests/peterm/temple
+@dirrm share/crossfire/maps/quests/peterm/quests
+@dirrm share/crossfire/maps/quests/peterm/FireTemple
+@dirrm share/crossfire/maps/quests/peterm/DragonQuest
+@dirrm share/crossfire/maps/quests/peterm/Demonology
+@dirrm share/crossfire/maps/quests/peterm/CTower
+@dirrm share/crossfire/maps/quests/peterm
+@dirrm share/crossfire/maps/quests/mcz
+@dirrm share/crossfire/maps/quests/mak/unnatural
+@dirrm share/crossfire/maps/quests/mak/undead
+@dirrm share/crossfire/maps/quests/mak/troll_cave
+@dirrm share/crossfire/maps/quests/mak/mansion
+@dirrm share/crossfire/maps/quests/mak/giant
+@dirrm share/crossfire/maps/quests/mak/dragons
+@dirrm share/crossfire/maps/quests/mak/chaos
+@dirrm share/crossfire/maps/quests/mak
+@dirrm share/crossfire/maps/quests/hendel
+@dirrm share/crossfire/maps/quests/greyshield
+@dirrm share/crossfire/maps/quests/cd
+@dirrm share/crossfire/maps/quests
+@dirrm share/crossfire/maps/python/misc
+@dirrm share/crossfire/maps/python/maps
+@dirrm share/crossfire/maps/python/items
+@dirrm share/crossfire/maps/python/guilds
+@dirrm share/crossfire/maps/python/gods
+@dirrm share/crossfire/maps/python/events/remove
+@dirrm share/crossfire/maps/python/events/muzzle
+@dirrm share/crossfire/maps/python/events/login
+@dirrm share/crossfire/maps/python/events/kick
+@dirrm share/crossfire/maps/python/events/init
+@dirrm share/crossfire/maps/python/events/born
+@dirrm share/crossfire/maps/python/events
+@dirrm share/crossfire/maps/python/casino
+@dirrm share/crossfire/maps/python/IPO
+@dirrm share/crossfire/maps/python
+@dirrm share/crossfire/maps/pup_land/s_f
+@dirrm share/crossfire/maps/pup_land/ruin_barbarian
+@dirrm share/crossfire/maps/pup_land/rainbow/red_town
+@dirrm share/crossfire/maps/pup_land/rainbow/Lv7
+@dirrm share/crossfire/maps/pup_land/rainbow/Lv6
+@dirrm share/crossfire/maps/pup_land/rainbow/Lv5
+@dirrm share/crossfire/maps/pup_land/rainbow/Lv4
+@dirrm share/crossfire/maps/pup_land/rainbow/Lv3
+@dirrm share/crossfire/maps/pup_land/rainbow/Lv2
+@dirrm share/crossfire/maps/pup_land/rainbow/Lv1
+@dirrm share/crossfire/maps/pup_land/rainbow
+@dirrm share/crossfire/maps/pup_land/raffle
+@dirrm share/crossfire/maps/pup_land/pplant
+@dirrm share/crossfire/maps/pup_land/ordeal
+@dirrm share/crossfire/maps/pup_land/nurnberg/reception
+@dirrm share/crossfire/maps/pup_land/nurnberg/dragonhangar
+@dirrm share/crossfire/maps/pup_land/nurnberg/dick
+@dirrm share/crossfire/maps/pup_land/nurnberg/castle_bauer
+@dirrm share/crossfire/maps/pup_land/nurnberg/apartment
+@dirrm share/crossfire/maps/pup_land/nurnberg
+@dirrm share/crossfire/maps/pup_land/lone_town/shops
+@dirrm share/crossfire/maps/pup_land/lone_town/dragonhangar
+@dirrm share/crossfire/maps/pup_land/lone_town/cave
+@dirrm share/crossfire/maps/pup_land/lone_town/apartment
+@dirrm share/crossfire/maps/pup_land/lone_town
+@dirrm share/crossfire/maps/pup_land/kurte
+@dirrm share/crossfire/maps/pup_land/jk
+@dirrm share/crossfire/maps/pup_land/guilds/purple_butterfly
+@dirrm share/crossfire/maps/pup_land/guilds/laughing_skull
+@dirrm share/crossfire/maps/pup_land/guilds
+@dirrm share/crossfire/maps/pup_land/cave_weapon
+@dirrm share/crossfire/maps/pup_land/castle_eureca
+@dirrm share/crossfire/maps/pup_land/begin
+@dirrm share/crossfire/maps/pup_land/ancient/volcano
+@dirrm share/crossfire/maps/pup_land/ancient/village/siegfried
+@dirrm share/crossfire/maps/pup_land/ancient/village/hole
+@dirrm share/crossfire/maps/pup_land/ancient/village
+@dirrm share/crossfire/maps/pup_land/ancient/ruin
+@dirrm share/crossfire/maps/pup_land/ancient/mountain
+@dirrm share/crossfire/maps/pup_land/ancient/kurte
+@dirrm share/crossfire/maps/pup_land/ancient/castle
+@dirrm share/crossfire/maps/pup_land/ancient
+@dirrm share/crossfire/maps/pup_land
+@dirrm share/crossfire/maps/port_joseph/town
+@dirrm share/crossfire/maps/port_joseph/pirates
+@dirrm share/crossfire/maps/port_joseph/goblin
+@dirrm share/crossfire/maps/port_joseph
+@dirrm share/crossfire/maps/planes
+@dirrm share/crossfire/maps/navar_city/troll_canyon
+@dirrm share/crossfire/maps/navar_city/tower
+@dirrm share/crossfire/maps/navar_city/temples
+@dirrm share/crossfire/maps/navar_city/smugglers_cove
+@dirrm share/crossfire/maps/navar_city/slums
+@dirrm share/crossfire/maps/navar_city/mlab
+@dirrm share/crossfire/maps/navar_city/misc
+@dirrm share/crossfire/maps/navar_city/magara/houses
+@dirrm share/crossfire/maps/navar_city/magara
+@dirrm share/crossfire/maps/navar_city/light
+@dirrm share/crossfire/maps/navar_city/jail
+@dirrm share/crossfire/maps/navar_city/illusion
+@dirrm share/crossfire/maps/navar_city/dreaming_sage
+@dirrm share/crossfire/maps/navar_city/dragon_hangar
+@dirrm share/crossfire/maps/navar_city/casino_infernal
+@dirrm share/crossfire/maps/navar_city/apartments
+@dirrm share/crossfire/maps/navar_city
+@dirrm share/crossfire/maps/mlab/citydeclouds/cdcspire
+@dirrm share/crossfire/maps/mlab/citydeclouds/cdccastlekeep
+@dirrm share/crossfire/maps/mlab/citydeclouds/cdcbigstore
+@dirrm share/crossfire/maps/mlab/citydeclouds/bank
+@dirrm share/crossfire/maps/mlab/citydeclouds
+@dirrm share/crossfire/maps/mlab
+@dirrm share/crossfire/maps/marksel
+@dirrm share/crossfire/maps/lake_country/snake_pit
+@dirrm share/crossfire/maps/lake_country/small_buildings
+@dirrm share/crossfire/maps/lake_country/shops
+@dirrm share/crossfire/maps/lake_country/marsh
+@dirrm share/crossfire/maps/lake_country/elven_moon
+@dirrm share/crossfire/maps/lake_country/ebony
+@dirrm share/crossfire/maps/lake_country/dragon_hangar
+@dirrm share/crossfire/maps/lake_country/Sunset_Lake
+@dirrm share/crossfire/maps/lake_country/RETower
+@dirrm share/crossfire/maps/lake_country/Mwizard
+@dirrm share/crossfire/maps/lake_country/Butakis/houses
+@dirrm share/crossfire/maps/lake_country/Butakis
+@dirrm share/crossfire/maps/lake_country
+@dirrm share/crossfire/maps/inn_and_outpost
+@dirrm share/crossfire/maps/euthville
+@dirrm share/crossfire/maps/editor/walls
+@dirrm share/crossfire/maps/editor/scripts
+@dirrm share/crossfire/maps/editor/picks
+@dirrm share/crossfire/maps/editor/pickmaps
+@dirrm share/crossfire/maps/editor
+@dirrm share/crossfire/maps/dungeons/valriel
+@dirrm share/crossfire/maps/dungeons/train
+@dirrm share/crossfire/maps/dungeons/monkey_temple
+@dirrm share/crossfire/maps/dungeons/hut
+@dirrm share/crossfire/maps/dungeons/grukks
+@dirrm share/crossfire/maps/dungeons/gorokh
+@dirrm share/crossfire/maps/dungeons
+@dirrm share/crossfire/maps/dragonisland
+@dirrm share/crossfire/maps/darcap/undead
+@dirrm share/crossfire/maps/darcap/town2
+@dirrm share/crossfire/maps/darcap/temple_justice
+@dirrm share/crossfire/maps/darcap/quest
+@dirrm share/crossfire/maps/darcap/lynn
+@dirrm share/crossfire/maps/darcap/forgotten_town/shops
+@dirrm share/crossfire/maps/darcap/forgotten_town/quests
+@dirrm share/crossfire/maps/darcap/forgotten_town
+@dirrm share/crossfire/maps/darcap/darcap/guilds/smoking_cauldron
+@dirrm share/crossfire/maps/darcap/darcap/guilds/poisoned_dagger
+@dirrm share/crossfire/maps/darcap/darcap/guilds
+@dirrm share/crossfire/maps/darcap/darcap/circus
+@dirrm share/crossfire/maps/darcap/darcap
+@dirrm share/crossfire/maps/darcap/cave
+@dirrm share/crossfire/maps/darcap/castle
+@dirrm share/crossfire/maps/darcap
+@dirrm share/crossfire/maps/brest/zorn
+@dirrm share/crossfire/maps/brest/taverns
+@dirrm share/crossfire/maps/brest/sow
+@dirrm share/crossfire/maps/brest/shops
+@dirrm share/crossfire/maps/brest/pshops/pshop9
+@dirrm share/crossfire/maps/brest/pshops/pshop8
+@dirrm share/crossfire/maps/brest/pshops/pshop7
+@dirrm share/crossfire/maps/brest/pshops/pshop6
+@dirrm share/crossfire/maps/brest/pshops/pshop5
+@dirrm share/crossfire/maps/brest/pshops/pshop4
+@dirrm share/crossfire/maps/brest/pshops/pshop3
+@dirrm share/crossfire/maps/brest/pshops/pshop27
+@dirrm share/crossfire/maps/brest/pshops/pshop26
+@dirrm share/crossfire/maps/brest/pshops/pshop25
+@dirrm share/crossfire/maps/brest/pshops/pshop24
+@dirrm share/crossfire/maps/brest/pshops/pshop23
+@dirrm share/crossfire/maps/brest/pshops/pshop22
+@dirrm share/crossfire/maps/brest/pshops/pshop21
+@dirrm share/crossfire/maps/brest/pshops/pshop20
+@dirrm share/crossfire/maps/brest/pshops/pshop2
+@dirrm share/crossfire/maps/brest/pshops/pshop19
+@dirrm share/crossfire/maps/brest/pshops/pshop18
+@dirrm share/crossfire/maps/brest/pshops/pshop17
+@dirrm share/crossfire/maps/brest/pshops/pshop16
+@dirrm share/crossfire/maps/brest/pshops/pshop15
+@dirrm share/crossfire/maps/brest/pshops/pshop14
+@dirrm share/crossfire/maps/brest/pshops/pshop13
+@dirrm share/crossfire/maps/brest/pshops/pshop12
+@dirrm share/crossfire/maps/brest/pshops/pshop11
+@dirrm share/crossfire/maps/brest/pshops/pshop10
+@dirrm share/crossfire/maps/brest/pshops/pshop1
+@dirrm share/crossfire/maps/brest/pshops
+@dirrm share/crossfire/maps/brest/brittany
+@dirrm share/crossfire/maps/brest/black_shield
+@dirrm share/crossfire/maps/brest/asyvan
+@dirrm share/crossfire/maps/brest/apartments
+@dirrm share/crossfire/maps/brest/Castle
+@dirrm share/crossfire/maps/brest
+@dirrm share/crossfire/maps/azumauindo/zaseki_dzuki_ryoku
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/towers
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/tou
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/temples
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/shops
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/nenshou_youso
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/gates
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/buildings
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi/apartments
+@dirrm share/crossfire/maps/azumauindo/suno-yamatoshi
+@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/towers
+@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/temples
+@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/shops
+@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/gates
+@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi/apartments
+@dirrm share/crossfire/maps/azumauindo/ranbounagisatoshi
+@dirrm share/crossfire/maps/azumauindo/misc
+@dirrm share/crossfire/maps/azumauindo/minatomachi/temples
+@dirrm share/crossfire/maps/azumauindo/minatomachi/stores
+@dirrm share/crossfire/maps/azumauindo/minatomachi/ketsueki_itsuryuu
+@dirrm share/crossfire/maps/azumauindo/minatomachi/gates
+@dirrm share/crossfire/maps/azumauindo/minatomachi/buildings
+@dirrm share/crossfire/maps/azumauindo/minatomachi
+@dirrm share/crossfire/maps/azumauindo
+@dirrm share/crossfire/maps/Info
+@dirrm share/crossfire/maps
 @dirrm share/crossfire/help
+@dirrm share/crossfire/arch/weapon/sword
+@dirrm share/crossfire/arch/weapon/other
+@dirrm share/crossfire/arch/weapon/misc
+@dirrm share/crossfire/arch/weapon/mace
+@dirrm share/crossfire/arch/weapon/hammer
+@dirrm share/crossfire/arch/weapon/club
+@dirrm share/crossfire/arch/weapon/chained
+@dirrm share/crossfire/arch/weapon/bow
+@dirrm share/crossfire/arch/weapon/axe
+@dirrm share/crossfire/arch/weapon/artifact/Usword
+@dirrm share/crossfire/arch/weapon/artifact/UW_Sword
+@dirrm share/crossfire/arch/weapon/artifact/Sting
+@dirrm share/crossfire/arch/weapon/artifact/Masamune
+@dirrm share/crossfire/arch/weapon/artifact/Lslasher
+@dirrm share/crossfire/arch/weapon/artifact/Kdagger
+@dirrm share/crossfire/arch/weapon/artifact/HolyAvenger
+@dirrm share/crossfire/arch/weapon/artifact/Gram
+@dirrm share/crossfire/arch/weapon/artifact/Firestar
+@dirrm share/crossfire/arch/weapon/artifact/Fhammer
+@dirrm share/crossfire/arch/weapon/artifact/Fdagger
+@dirrm share/crossfire/arch/weapon/artifact/Demonbane
+@dirrm share/crossfire/arch/weapon/artifact/Darkblade
+@dirrm share/crossfire/arch/weapon/artifact/ChaosSword
+@dirrm share/crossfire/arch/weapon/artifact
+@dirrm share/crossfire/arch/weapon
+@dirrm share/crossfire/arch/wall/yellow
+@dirrm share/crossfire/arch/wall/wwall
+@dirrm share/crossfire/arch/wall/woodwall
+@dirrm share/crossfire/arch/wall/wall
+@dirrm share/crossfire/arch/wall/timberwall
+@dirrm share/crossfire/arch/wall/swall
+@dirrm share/crossfire/arch/wall/stwall
+@dirrm share/crossfire/arch/wall/speedbwall
+@dirrm share/crossfire/arch/wall/slevel
+@dirrm share/crossfire/arch/wall/rough
+@dirrm share/crossfire/arch/wall/pier
+@dirrm share/crossfire/arch/wall/paved
+@dirrm share/crossfire/arch/wall/moat
+@dirrm share/crossfire/arch/wall/mine
+@dirrm share/crossfire/arch/wall/longtable
+@dirrm share/crossfire/arch/wall/lightningwall
+@dirrm share/crossfire/arch/wall/lbulletwall
+@dirrm share/crossfire/arch/wall/jcity
+@dirrm share/crossfire/arch/wall/hedge
+@dirrm share/crossfire/arch/wall/gwall
+@dirrm share/crossfire/arch/wall/footpath
+@dirrm share/crossfire/arch/wall/flagstone
+@dirrm share/crossfire/arch/wall/firewall
+@dirrm share/crossfire/arch/wall/ewall
+@dirrm share/crossfire/arch/wall/dwall
+@dirrm share/crossfire/arch/wall/dun
+@dirrm share/crossfire/arch/wall/dirtroad
+@dirrm share/crossfire/arch/wall/cwall-west
+@dirrm share/crossfire/arch/wall/cwall-red
+@dirrm share/crossfire/arch/wall/cwall
+@dirrm share/crossfire/arch/wall/cave
+@dirrm share/crossfire/arch/wall/bwall
+@dirrm share/crossfire/arch/wall/bulletwall
+@dirrm share/crossfire/arch/wall/bench
+@dirrm share/crossfire/arch/wall/awall
+@dirrm share/crossfire/arch/wall
+@dirrm share/crossfire/arch/traps
+@dirrm share/crossfire/arch/transport
+@dirrm share/crossfire/arch/talisman
+@dirrm share/crossfire/arch/system/mood_floors
+@dirrm share/crossfire/arch/system/ability
+@dirrm share/crossfire/arch/system
+@dirrm share/crossfire/arch/spell/Wand
+@dirrm share/crossfire/arch/spell/TownPortal
+@dirrm share/crossfire/arch/spell/Swarm
+@dirrm share/crossfire/arch/spell/SummonMonster
+@dirrm share/crossfire/arch/spell/SpellBook
+@dirrm share/crossfire/arch/spell/Smite
+@dirrm share/crossfire/arch/spell/Scroll
+@dirrm share/crossfire/arch/spell/Rune
+@dirrm share/crossfire/arch/spell/RaiseDead
+@dirrm share/crossfire/arch/spell/Potion
+@dirrm share/crossfire/arch/spell/MovingBall
+@dirrm share/crossfire/arch/spell/MoodChange
+@dirrm share/crossfire/arch/spell/Misc
+@dirrm share/crossfire/arch/spell/MagicWall/smover
+@dirrm share/crossfire/arch/spell/MagicWall
+@dirrm share/crossfire/arch/spell/MagicMissile
+@dirrm share/crossfire/arch/spell/Healing
+@dirrm share/crossfire/arch/spell/Golem
+@dirrm share/crossfire/arch/spell/Disease
+@dirrm share/crossfire/arch/spell/Detect
+@dirrm share/crossfire/arch/spell/Cone
+@dirrm share/crossfire/arch/spell/Change_Ability
+@dirrm share/crossfire/arch/spell/Burnout
+@dirrm share/crossfire/arch/spell/Bullet/Shell
+@dirrm share/crossfire/arch/spell/Bullet/Fire
+@dirrm share/crossfire/arch/spell/Bullet
+@dirrm share/crossfire/arch/spell/Bomb
+@dirrm share/crossfire/arch/spell/Bolt
+@dirrm share/crossfire/arch/spell/BlessCurse
+@dirrm share/crossfire/arch/spell/Aura
+@dirrm share/crossfire/arch/spell/AnimateWeapon
+@dirrm share/crossfire/arch/spell/Ability
+@dirrm share/crossfire/arch/spell
+@dirrm share/crossfire/arch/skills/Skill_Tools
+@dirrm share/crossfire/arch/skills/Skill_Scrolls
+@dirrm share/crossfire/arch/skills/Old
+@dirrm share/crossfire/arch/skills
+@dirrm share/crossfire/arch/shop/Floors
+@dirrm share/crossfire/arch/shop
+@dirrm share/crossfire/arch/river
+@dirrm share/crossfire/arch/readable/guide
+@dirrm share/crossfire/arch/readable
+@dirrm share/crossfire/arch/random
+@dirrm share/crossfire/arch/potion
+@dirrm share/crossfire/arch/player/stoned
+@dirrm share/crossfire/arch/player/race
+@dirrm share/crossfire/arch/player/old
+@dirrm share/crossfire/arch/player/dragon_ability
+@dirrm share/crossfire/arch/player/class/Wizardry
+@dirrm share/crossfire/arch/player/class/Warrior
+@dirrm share/crossfire/arch/player/class/Thief
+@dirrm share/crossfire/arch/player/class/Religious
+@dirrm share/crossfire/arch/player/class
+@dirrm share/crossfire/arch/player
+@dirrm share/crossfire/arch/planes/fire/lava
+@dirrm share/crossfire/arch/planes/fire/burningwall
+@dirrm share/crossfire/arch/planes/fire
+@dirrm share/crossfire/arch/planes
+@dirrm share/crossfire/arch/optical
+@dirrm share/crossfire/arch/monster/undead/skree
+@dirrm share/crossfire/arch/monster/undead/Skeletal_mage
+@dirrm share/crossfire/arch/monster/undead
+@dirrm share/crossfire/arch/monster/troll/Troll
+@dirrm share/crossfire/arch/monster/troll/Gaelotroll
+@dirrm share/crossfire/arch/monster/troll
+@dirrm share/crossfire/arch/monster/misc/tentacle
+@dirrm share/crossfire/arch/monster/misc/serpmen
+@dirrm share/crossfire/arch/monster/misc/lokanth
+@dirrm share/crossfire/arch/monster/misc/lamia
+@dirrm share/crossfire/arch/monster/misc/crawl
+@dirrm share/crossfire/arch/monster/misc/Unicorn
+@dirrm share/crossfire/arch/monster/misc/Ngolem
+@dirrm share/crossfire/arch/monster/misc/Ent
+@dirrm share/crossfire/arch/monster/misc/Chess
+@dirrm share/crossfire/arch/monster/misc/Baslic
+@dirrm share/crossfire/arch/monster/misc
+@dirrm share/crossfire/arch/monster/insect/ant
+@dirrm share/crossfire/arch/monster/insect
+@dirrm share/crossfire/arch/monster/humanoid/Human/postman
+@dirrm share/crossfire/arch/monster/humanoid/Human
+@dirrm share/crossfire/arch/monster/humanoid/Halfling
+@dirrm share/crossfire/arch/monster/humanoid/Guard
+@dirrm share/crossfire/arch/monster/humanoid/Gnome
+@dirrm share/crossfire/arch/monster/humanoid/Elf
+@dirrm share/crossfire/arch/monster/humanoid/Dwarf
+@dirrm share/crossfire/arch/monster/humanoid/Dragon
+@dirrm share/crossfire/arch/monster/humanoid/Class/Warrior
+@dirrm share/crossfire/arch/monster/humanoid/Class
+@dirrm share/crossfire/arch/monster/humanoid/Arabic
+@dirrm share/crossfire/arch/monster/humanoid
+@dirrm share/crossfire/arch/monster/goblin/Kobold
+@dirrm share/crossfire/arch/monster/goblin
+@dirrm share/crossfire/arch/monster/giant/slug
+@dirrm share/crossfire/arch/monster/giant/serpent
+@dirrm share/crossfire/arch/monster/giant/djinn
+@dirrm share/crossfire/arch/monster/giant/cyclops
+@dirrm share/crossfire/arch/monster/giant/byakie
+@dirrm share/crossfire/arch/monster/giant/Titan
+@dirrm share/crossfire/arch/monster/giant/JessyB
+@dirrm share/crossfire/arch/monster/giant/DreadKnight
+@dirrm share/crossfire/arch/monster/giant/Big_Wiz
+@dirrm share/crossfire/arch/monster/giant/Belzebub
+@dirrm share/crossfire/arch/monster/giant
+@dirrm share/crossfire/arch/monster/elemental/Shadow
+@dirrm share/crossfire/arch/monster/elemental/Para
+@dirrm share/crossfire/arch/monster/elemental
+@dirrm share/crossfire/arch/monster/dragon/drake
+@dirrm share/crossfire/arch/monster/dragon/bone_drake
+@dirrm share/crossfire/arch/monster/dragon/WDragon
+@dirrm share/crossfire/arch/monster/dragon/Hatchlings
+@dirrm share/crossfire/arch/monster/dragon/Electric
+@dirrm share/crossfire/arch/monster/dragon/Dragonman
+@dirrm share/crossfire/arch/monster/dragon/Dragon
+@dirrm share/crossfire/arch/monster/dragon/Chinese_Dra
+@dirrm share/crossfire/arch/monster/dragon/Chaos_Dra
+@dirrm share/crossfire/arch/monster/dragon
+@dirrm share/crossfire/arch/monster/demon/medium_demon
+@dirrm share/crossfire/arch/monster/demon/GreatDemon
+@dirrm share/crossfire/arch/monster/demon/Demon_Lord
+@dirrm share/crossfire/arch/monster/demon/Big_Demon
+@dirrm share/crossfire/arch/monster/demon
+@dirrm share/crossfire/arch/monster/chaos
+@dirrm share/crossfire/arch/monster/beholder
+@dirrm share/crossfire/arch/monster/animal/shadowtiger
+@dirrm share/crossfire/arch/monster/animal/leech
+@dirrm share/crossfire/arch/monster/animal/gryphon
+@dirrm share/crossfire/arch/monster/animal/giant_worm
+@dirrm share/crossfire/arch/monster/animal/farmyard
+@dirrm share/crossfire/arch/monster/animal/Wolf
+@dirrm share/crossfire/arch/monster/animal/Neko
+@dirrm share/crossfire/arch/monster/animal/Giant_rat
+@dirrm share/crossfire/arch/monster/animal/Dog
+@dirrm share/crossfire/arch/monster/animal/Behemoth
+@dirrm share/crossfire/arch/monster/animal/Bear
+@dirrm share/crossfire/arch/monster/animal
+@dirrm share/crossfire/arch/monster/angel
+@dirrm share/crossfire/arch/monster/acid/slimecrawler
+@dirrm share/crossfire/arch/monster/acid
+@dirrm share/crossfire/arch/monster
+@dirrm share/crossfire/arch/misc/thewheel
+@dirrm share/crossfire/arch/misc/social
+@dirrm share/crossfire/arch/misc/item
+@dirrm share/crossfire/arch/misc/Container
+@dirrm share/crossfire/arch/misc/Camp
+@dirrm share/crossfire/arch/misc/Bagpipe
+@dirrm share/crossfire/arch/misc
+@dirrm share/crossfire/arch/mapbuilding
+@dirrm share/crossfire/arch/light
+@dirrm share/crossfire/arch/jewel
+@dirrm share/crossfire/arch/inorganic
+@dirrm share/crossfire/arch/indoor/wall
+@dirrm share/crossfire/arch/indoor
+@dirrm share/crossfire/arch/ground/smooth
+@dirrm share/crossfire/arch/ground/new
+@dirrm share/crossfire/arch/ground/Wood
+@dirrm share/crossfire/arch/ground/Winter
+@dirrm share/crossfire/arch/ground/Weather
+@dirrm share/crossfire/arch/ground/Stone
+@dirrm share/crossfire/arch/ground/Pstone
+@dirrm share/crossfire/arch/ground/Mountain
+@dirrm share/crossfire/arch/ground/Lake
+@dirrm share/crossfire/arch/ground
+@dirrm share/crossfire/arch/gods/supernatural
+@dirrm share/crossfire/arch/gods/randomitems
+@dirrm share/crossfire/arch/gods/items/glovesofsun
+@dirrm share/crossfire/arch/gods/items/earth_shield
+@dirrm share/crossfire/arch/gods/items/burning_tail
+@dirrm share/crossfire/arch/gods/items
+@dirrm share/crossfire/arch/gods/elemental
+@dirrm share/crossfire/arch/gods/demihumans
+@dirrm share/crossfire/arch/gods/altars
+@dirrm share/crossfire/arch/gods
+@dirrm share/crossfire/arch/food
+@dirrm share/crossfire/arch/floor/smooth
+@dirrm share/crossfire/arch/floor/inlayed
+@dirrm share/crossfire/arch/floor/Afloor
+@dirrm share/crossfire/arch/floor
+@dirrm share/crossfire/arch/flesh/misc
+@dirrm share/crossfire/arch/flesh/human
+@dirrm share/crossfire/arch/flesh/goblin
+@dirrm share/crossfire/arch/flesh/generic
+@dirrm share/crossfire/arch/flesh/dragon
+@dirrm share/crossfire/arch/flesh/demon
+@dirrm share/crossfire/arch/flesh
+@dirrm share/crossfire/arch/exit/magic_portal
+@dirrm share/crossfire/arch/exit/Up_down
+@dirrm share/crossfire/arch/exit/Town
+@dirrm share/crossfire/arch/exit/Pentagram
+@dirrm share/crossfire/arch/exit/Ladder
+@dirrm share/crossfire/arch/exit
+@dirrm share/crossfire/arch/door/Locked
+@dirrm share/crossfire/arch/door/Door
+@dirrm share/crossfire/arch/door
+@dirrm share/crossfire/arch/disease
+@dirrm share/crossfire/arch/dev/xpm_pref/construct/house
+@dirrm share/crossfire/arch/dev/xpm_pref/construct/barrack
+@dirrm share/crossfire/arch/dev/xpm_pref/construct
+@dirrm share/crossfire/arch/dev/xpm_pref/Wood
+@dirrm share/crossfire/arch/dev/xpm_pref/Weapon/Artifact/Demonbane
+@dirrm share/crossfire/arch/dev/xpm_pref/Weapon/Artifact
+@dirrm share/crossfire/arch/dev/xpm_pref/Weapon
+@dirrm share/crossfire/arch/dev/xpm_pref/Up_down
+@dirrm share/crossfire/arch/dev/xpm_pref/Talisman
+@dirrm share/crossfire/arch/dev/xpm_pref/Swall2
+@dirrm share/crossfire/arch/dev/xpm_pref/Swall1
+@dirrm share/crossfire/arch/dev/xpm_pref/Shop
+@dirrm share/crossfire/arch/dev/xpm_pref/Pstone
+@dirrm share/crossfire/arch/dev/xpm_pref/Players
+@dirrm share/crossfire/arch/dev/xpm_pref/Mountain
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/undead
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/misc
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/insect
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/human/Town
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/human/Dwarf
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/human
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/goblin
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/giant
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/dragon
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/demon
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/beholder
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/animal
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster/acid
+@dirrm share/crossfire/arch/dev/xpm_pref/Monster
+@dirrm share/crossfire/arch/dev/xpm_pref/Misc
+@dirrm share/crossfire/arch/dev/xpm_pref/Mail
+@dirrm share/crossfire/arch/dev/xpm_pref/Magic
+@dirrm share/crossfire/arch/dev/xpm_pref/House
+@dirrm share/crossfire/arch/dev/xpm_pref/Hole
+@dirrm share/crossfire/arch/dev/xpm_pref/Helmet
+@dirrm share/crossfire/arch/dev/xpm_pref/Ground2/Wood
+@dirrm share/crossfire/arch/dev/xpm_pref/Ground2
+@dirrm share/crossfire/arch/dev/xpm_pref/Ground
+@dirrm share/crossfire/arch/dev/xpm_pref/Gates
+@dirrm share/crossfire/arch/dev/xpm_pref/Food
+@dirrm share/crossfire/arch/dev/xpm_pref/Floor
+@dirrm share/crossfire/arch/dev/xpm_pref/Container
+@dirrm share/crossfire/arch/dev/xpm_pref/Connect
+@dirrm share/crossfire/arch/dev/xpm_pref/Cave
+@dirrm share/crossfire/arch/dev/xpm_pref/Boots
+@dirrm share/crossfire/arch/dev/xpm_pref
+@dirrm share/crossfire/arch/dev/unused/0.91.7/newtown/temple
+@dirrm share/crossfire/arch/dev/unused/0.91.7/newtown
+@dirrm share/crossfire/arch/dev/unused/0.91.7/newfood
+@dirrm share/crossfire/arch/dev/unused/0.91.7/mood_floors
+@dirrm share/crossfire/arch/dev/unused/0.91.7/chaos
+@dirrm share/crossfire/arch/dev/unused/0.91.7/Town
+@dirrm share/crossfire/arch/dev/unused/0.91.7
+@dirrm share/crossfire/arch/dev/unused/0.91.6
+@dirrm share/crossfire/arch/dev/unused/0.91.1/Undead
+@dirrm share/crossfire/arch/dev/unused/0.91.1/Store
+@dirrm share/crossfire/arch/dev/unused/0.91.1/Monolith
+@dirrm share/crossfire/arch/dev/unused/0.91.1/Lg_bungalow
+@dirrm share/crossfire/arch/dev/unused/0.91.1/Flyingnote
+@dirrm share/crossfire/arch/dev/unused/0.91.1
+@dirrm share/crossfire/arch/dev/unused.93.2
+@dirrm share/crossfire/arch/dev/unused
+@dirrm share/crossfire/arch/dev/scripts
+@dirrm share/crossfire/arch/dev/obsolete/monster
+@dirrm share/crossfire/arch/dev/obsolete/misc
+@dirrm share/crossfire/arch/dev/obsolete/magic
+@dirrm share/crossfire/arch/dev/obsolete
+@dirrm share/crossfire/arch/dev/merged
+@dirrm share/crossfire/arch/dev/Kanji
+@dirrm share/crossfire/arch/dev/Gloran
+@dirrm share/crossfire/arch/dev/Britan
+@dirrm share/crossfire/arch/dev
+@dirrm share/crossfire/arch/construct/town
+@dirrm share/crossfire/arch/construct/tower
+@dirrm share/crossfire/arch/construct/temple
+@dirrm share/crossfire/arch/construct/keep
+@dirrm share/crossfire/arch/construct/house
+@dirrm share/crossfire/arch/construct/hold
+@dirrm share/crossfire/arch/construct/fountain
+@dirrm share/crossfire/arch/construct/fort
+@dirrm share/crossfire/arch/construct/castle
+@dirrm share/crossfire/arch/construct/bridge/stonebridge
+@dirrm share/crossfire/arch/construct/bridge/footbridge
+@dirrm share/crossfire/arch/construct/bridge
+@dirrm share/crossfire/arch/construct/barrack
+@dirrm share/crossfire/arch/construct/Treehouse
+@dirrm share/crossfire/arch/construct/Snow
+@dirrm share/crossfire/arch/construct/Palace
+@dirrm share/crossfire/arch/construct
+@dirrm share/crossfire/arch/connect/Spinner
+@dirrm share/crossfire/arch/connect/Hole
+@dirrm share/crossfire/arch/connect/Gates
+@dirrm share/crossfire/arch/connect/Garden_gate
+@dirrm share/crossfire/arch/connect/Doors
+@dirrm share/crossfire/arch/connect/Director
+@dirrm share/crossfire/arch/connect/Casino
+@dirrm share/crossfire/arch/connect
+@dirrm share/crossfire/arch/armour/shield
+@dirrm share/crossfire/arch/armour/mail
+@dirrm share/crossfire/arch/armour/helmet
+@dirrm share/crossfire/arch/armour/girdle
+@dirrm share/crossfire/arch/armour/gauntlets
+@dirrm share/crossfire/arch/armour/cloak
+@dirrm share/crossfire/arch/armour/bracers
+@dirrm share/crossfire/arch/armour/boots
+@dirrm share/crossfire/arch/armour
+@dirrm share/crossfire/arch
 @dirrm share/crossfire/adm
 @dirrm share/crossfire
 @dirrm lib/crossfire/plugins
diff --git a/games/crossfire-server/distinfo b/games/crossfire-server/distinfo
index af2f16ba2a3..31c8c20e595 100644
--- a/games/crossfire-server/distinfo
+++ b/games/crossfire-server/distinfo
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.2 2006/06/11 11:36:47 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2008/11/04 08:36:34 adam Exp $
 
-SHA1 (crossfire-1.9.0.tar.gz) = 7f8ef84f4d465736fc854b4be4e32f39ed415eaf
-RMD160 (crossfire-1.9.0.tar.gz) = 6069e1d566a738c73756096240694d8f62ab8ce4
-Size (crossfire-1.9.0.tar.gz) = 5317109 bytes
-SHA1 (patch-aa) = 7102244e70498f89dc2f0a600415f06dcb93853f
-SHA1 (patch-ab) = b50c940ab25f3b2361afa6ae49be6edab498f43e
-SHA1 (patch-ae) = 4f9aee487d8cff1bb6295f3661d0194d045b328c
+SHA1 (crossfire-1.11.0.arch.tar.gz) = 29a3ea7cfd5df4dc5a375f5b4302aebb4d609964
+RMD160 (crossfire-1.11.0.arch.tar.gz) = 8fa48ef33a83f1ed158a957db664a9deed96e1fc
+Size (crossfire-1.11.0.arch.tar.gz) = 3306459 bytes
+SHA1 (crossfire-1.11.0.maps.tar.bz2) = 21c376d4d570b341f4554b35ea0904157aca8c30
+RMD160 (crossfire-1.11.0.maps.tar.bz2) = fc582ccca34f2d0b5ee868b145ae59694ddf2847
+Size (crossfire-1.11.0.maps.tar.bz2) = 16707137 bytes
+SHA1 (crossfire-1.11.0.tar.gz) = 5ba3f6e8ac39f7d02cf2d133ed6069c789502c25
+RMD160 (crossfire-1.11.0.tar.gz) = c71c429896ccfecc98b5f52559377bb01b33c1c0
+Size (crossfire-1.11.0.tar.gz) = 6302656 bytes
+SHA1 (patch-aa) = b4a855a8aee117b42d6edbb7c6fd2819b6b33180
+SHA1 (patch-ab) = 2cf11e9901f72cf018f162e4bf4d2980257a0bbf
+SHA1 (patch-ae) = 1c9d973c932d5c6ee6ee642611d64850e05e3985
diff --git a/games/crossfire-server/options.mk b/games/crossfire-server/options.mk
new file mode 100644
index 00000000000..59e3b9465ad
--- /dev/null
+++ b/games/crossfire-server/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2008/11/04 08:36:34 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.crossfire-server
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	x11
+
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=	yes
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-x
+.endif
diff --git a/games/crossfire-server/patches/patch-aa b/games/crossfire-server/patches/patch-aa
index 31bda4235fd..20b98a9a456 100644
--- a/games/crossfire-server/patches/patch-aa
+++ b/games/crossfire-server/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/11 05:59:36 adam Exp $
+$NetBSD: patch-aa,v 1.2 2008/11/04 08:36:34 adam Exp $
 
---- lib/Makefile.in.orig	2006-04-03 19:50:56.000000000 +0200
+--- lib/Makefile.in.orig	2008-11-03 18:54:41.000000000 +0100
 +++ lib/Makefile.in
-@@ -215,7 +215,7 @@ mandir = @mandir@
- mkdir_p = @mkdir_p@
+@@ -219,7 +219,7 @@ mkdir_p = @mkdir_p@
  no_x = @no_x@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
 -pkgconfdir = @pkgconfdir@
 +pkgconfdir = ${prefix}/share/examples/crossfire
  pkgstatedir = @pkgstatedir@
diff --git a/games/crossfire-server/patches/patch-ab b/games/crossfire-server/patches/patch-ab
index 98e94086bd5..7c293b996e4 100644
--- a/games/crossfire-server/patches/patch-ab
+++ b/games/crossfire-server/patches/patch-ab
@@ -1,217 +1,61 @@
-$NetBSD: patch-ab,v 1.1 2006/06/11 11:36:47 adrianp Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/04 08:36:34 adam Exp $
 
---- socket/request.c.orig	2006-02-25 08:02:11.000000000 +0000
-+++ socket/request.c
-@@ -109,7 +109,7 @@ short atnr_cs_stat[NROFATTACKS] = {CS_ST
- /** This is the Setup cmd - easy first implementation */
- void SetUp(char *buf, int len, NewSocket *ns)
- {
--    int s;
-+    int s, slen;
-     char *cmd, *param, cmdback[HUGE_BUF];
+--- configure.orig	2008-02-01 07:09:40.000000000 +0100
++++ configure
+@@ -27010,7 +27010,7 @@ fi
  
-     /* run through the cmds of setup
-@@ -139,40 +139,40 @@ void SetUp(char *buf, int len, NewSocket
- 	buf[s++]=0;
- 	while (buf[s] == ' ') s++;
- 		
--	strcat(cmdback, " ");
--	strcat(cmdback, cmd);
--	strcat(cmdback, " ");
--
-+	slen = strlen(cmdback);
-+	safe_strcat(cmdback, " ", &slen, HUGE_BUF);
-+	safe_strcat(cmdback, cmd, &slen, HUGE_BUF);
-+	safe_strcat(cmdback, " ", &slen, HUGE_BUF);
- 	
- 	if (!strcmp(cmd,"sound")) {
- 	    ns->sound = atoi(param);
--	    strcat(cmdback, param);
-+	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
- 	}
- 	else if (!strcmp(cmd,"exp64")) {
- 	    ns->exp64 = atoi(param);
--	    strcat(cmdback, param);
-+	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
- 	} else if (!strcmp(cmd, "spellmon")) {
- 	    ns->monitor_spells = atoi(param);
--	    strcat(cmdback, param);
-+	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
- 	}  else if (!strcmp(cmd,"darkness")) {
- 	    ns->darkness = atoi(param);
--	    strcat(cmdback, param);
-+	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
- 	} else if (!strcmp(cmd,"map1cmd")) {
- 	    if (atoi(param)) ns->mapmode = Map1Cmd;
- 	    /* if beyond this size, need to use map1cmd no matter what */
- 	    if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1Cmd;
--	    strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0");
-+	    safe_strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0", &slen, HUGE_BUF);
- 	} else if (!strcmp(cmd,"map1acmd")) {
- 	    if (atoi(param)) ns->mapmode = Map1aCmd;
- 	    /* if beyond this size, need to use map1acmd no matter what */
- 	    if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1aCmd;
--	    strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0");
-+	    safe_strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0", &slen, HUGE_BUF);
-         } else if (!strcmp(cmd,"newmapcmd")) {
-             ns->newmapcmd= atoi(param);
--            strcat(cmdback, param);
-+	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
- 	} else if (!strcmp(cmd,"facecache")) {
- 	    ns->facecache = atoi(param);
--            strcat(cmdback, param);
-+	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
- 	} else if (!strcmp(cmd,"faceset")) {
- 	    char tmpbuf[20];
- 	    int q = atoi(param);
-@@ -180,7 +180,7 @@ void SetUp(char *buf, int len, NewSocket
- 	    if (is_valid_faceset(q))
- 		ns->faceset=q;
- 	    sprintf(tmpbuf,"%d", ns->faceset);
--	    strcat(cmdback, tmpbuf);
-+	    safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
- 	    /* if the client is using faceset, it knows about image2 command */
- 	    ns->image2=1;
- 	} else if (!strcmp(cmd,"itemcmd")) {
-@@ -196,7 +196,7 @@ void SetUp(char *buf, int len, NewSocket
- 		ns->itemcmd = q;
- 		sprintf(tmpbuf,"%d", ns->itemcmd);
- 	    }
--	    strcat(cmdback, tmpbuf);
-+	    safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
-         } else if (!strcmp(cmd,"mapsize")) {
- 	    int x, y=0;
- 	    char tmpbuf[MAX_BUF], *cp;
-@@ -209,7 +209,7 @@ void SetUp(char *buf, int len, NewSocket
- 		}
- 	    if (x < 9 || y < 9 || x>MAP_CLIENT_X || y > MAP_CLIENT_Y) {
- 		sprintf(tmpbuf," %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
--		strcat(cmdback, tmpbuf);
-+		safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
- 	    } else {
- 		ns->mapx = x;
- 		ns->mapy = y;
-@@ -217,34 +217,35 @@ void SetUp(char *buf, int len, NewSocket
- 		 * param as given to us in case it gets parsed differently.
- 		 */
- 		sprintf(tmpbuf,"%dx%d", x,y);
--		strcat(cmdback, tmpbuf);
-+		safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
- 		/* If beyond this size and still using orig map command, need to
- 		 * go to map1cmd.
- 		 */
- 		if ((x>11 || y>11) && ns->mapmode == Map0Cmd) ns->mapmode = Map1Cmd;
- 	    }
- 	} else if (!strcmp(cmd,"extendedMapInfos")) {
--        /* Added by tchize
--         * prepare to use the mapextended command
--         */
-+	    /* Added by tchize
-+	     * prepare to use the mapextended command
-+	     */
- 	    char tmpbuf[20];
--        ns->ext_mapinfos = (atoi(param));
-+	    ns->ext_mapinfos = (atoi(param));
- 	    sprintf(tmpbuf,"%d", ns->ext_mapinfos);
--	    strcat(cmdback, tmpbuf);
-+	    safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
- 	} else if (!strcmp(cmd,"extendedTextInfos")) {
--        /* Added by tchize
--         * prepare to use the extended text commands
--         * Client toggle this to non zero to get exttext
--         */
-+	    /* Added by tchize
-+	     * prepare to use the extended text commands
-+	     * Client toggle this to non zero to get exttext
-+	     */
- 	    char tmpbuf[20];
--        ns->has_readable_type = (atoi(param));
-+
-+	    ns->has_readable_type = (atoi(param));
- 	    sprintf(tmpbuf,"%d", ns->has_readable_type);
--	    strcat(cmdback, tmpbuf);
-+	    safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
- 	} else {
- 	    /* Didn't get a setup command we understood -
- 	     * report a failure to the client.
- 	     */
--	    strcat(cmdback, "FALSE");
-+	    safe_strcat(cmdback, "FALSE", &slen, HUGE_BUF);
- 	}
-     } /* for processing all the setup commands */
-     LOG(llevInfo,"SendBack SetupCmd:: %s\n", cmdback);
-@@ -619,7 +620,7 @@ void VersionCmd(char *buf, int len,NewSo
-     }
-     cp = strchr(cp+1, ' ');
-     if (cp) {
--	LOG(llevDebug,"CS: connection from client of type <%s>\n", cp);
-+	LOG(llevDebug,"CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
+ pkgstatedir=$localstatedir/$PACKAGE
  
- 	/* This is first implementation - i skip all beta DX clients with it 
- 	 * Add later stuff here for other clients 
-@@ -1925,12 +1926,12 @@ void send_skill_info(NewSocket *ns, char
-     int i;
+-pkgconfdir=$sysconfdir/$PACKAGE
++pkgconfdir=$sysconfdir
  
-     sl.buf = malloc(MAXSOCKBUF);
--    strcpy(sl.buf,"replyinfo skill_info\n");
-+    strcpy((char*)sl.buf,"replyinfo skill_info\n");
-     for (i=1; i< NUM_SKILLS; i++) {
--	sprintf(sl.buf + strlen(sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO,
-+	sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO,
- 		skill_names[i]);
-     }
--    sl.len = strlen(sl.buf);
-+    sl.len = strlen((char*)sl.buf);
-     if (sl.len > MAXSOCKBUF) {
- 	LOG(llevError,"Buffer overflow in send_skill_info!\n");
- 	fatal(0);
-@@ -1948,10 +1949,10 @@ void send_spell_paths (NewSocket *ns, ch
-     int i;
  
-     sl.buf = malloc(MAXSOCKBUF);
--    strcpy(sl.buf,"replyinfo spell_paths\n");
-+    strcpy((char*)sl.buf,"replyinfo spell_paths\n");
-     for(i=0; i<NRSPELLPATHS; i++)
--	sprintf(sl.buf + strlen(sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]);
--    sl.len = strlen(sl.buf);
-+	sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]);
-+    sl.len = strlen((char*)sl.buf);
-     if (sl.len > MAXSOCKBUF) {
- 	LOG(llevError,"Buffer overflow in send_spell_paths!\n");
- 	fatal(0);
-@@ -1986,7 +1987,7 @@ void esrv_update_spells(player *pl) {
- 	    }
- 	    if (flags !=0) {
- 		sl.buf = malloc(MAXSOCKBUF);
--		strcpy(sl.buf,"updspell ");
-+		strcpy((char*)sl.buf,"updspell ");
- 		sl.len=strlen((char*)sl.buf);
- 		SockList_AddChar(&sl, flags);
- 		SockList_AddInt(&sl, spell->count);
-@@ -2010,7 +2011,7 @@ void esrv_remove_spell(player *pl, objec
- 	return;
-     }
-     sl.buf = malloc(MAXSOCKBUF);
--    strcpy(sl.buf,"delspell ");
-+    strcpy((char*)sl.buf,"delspell ");
-     sl.len=strlen((char*)sl.buf);
-     SockList_AddInt(&sl, spell->count);
-     Send_With_Handling(&pl->socket, &sl);
-@@ -2078,7 +2079,7 @@ void esrv_add_spells(player *pl, object 
-     }
-     if (!pl->socket.monitor_spells) return;
-     sl.buf = malloc(MAXSOCKBUF);
--    strcpy(sl.buf,"addspell ");
-+    strcpy((char*)sl.buf,"addspell ");
-     sl.len=strlen((char*)sl.buf);
-     if (!spell) {
- 	for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) {
-@@ -2099,7 +2100,7 @@ void esrv_add_spells(player *pl, object 
- 	    if (sl.len > (MAXSOCKBUF - (26 + strlen(spell->name) + 
- 				(spell->msg?strlen(spell->msg):0)))) {
- 		Send_With_Handling(&pl->socket, &sl);
--		strcpy(sl.buf,"addspell ");
-+		strcpy((char*)sl.buf,"addspell ");
- 		sl.len=strlen((char*)sl.buf);
- 	    }
- 	    append_spell(pl, &sl, spell);
+ 
+@@ -28519,9 +28519,6 @@ EOF
+     { echo "$as_me:$LINENO: checking xslt compliance of $xslt_prog" >&5
+ echo $ECHO_N "checking xslt compliance of $xslt_prog... $ECHO_C" >&6; }
+     to_run=$xslt_prog
+-    to_run=${to_run/\%1/configtest.xml}
+-    to_run=${to_run/\%2/configtest.xsl}
+-    to_run=${to_run/\%3/configtest.out}
+     if { ac_try='$to_run'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+@@ -28540,7 +28537,7 @@ echo "${ECHO_T}no" >&6; };
+     fi
+     xslt_prog="notfound"
+     if test "$check_xslt_xsltprocfound" != notfound -a "$xslt_prog" = notfound; then
+-        xslt_prog="$check_xslt_xsltprocfound -o %3 %2 %1"
++        xslt_prog="$check_xslt_xsltprocfound -o configtest.out configtest.xsl configtest.xml"
+ 
+     cat << \EOF > configtest.xml
+ <?xml version="1.0" encoding="ISO-8859-1"?>
+@@ -28599,9 +28596,6 @@ EOF
+     { echo "$as_me:$LINENO: checking xslt compliance of $xslt_prog" >&5
+ echo $ECHO_N "checking xslt compliance of $xslt_prog... $ECHO_C" >&6; }
+     to_run=$xslt_prog
+-    to_run=${to_run/\%1/configtest.xml}
+-    to_run=${to_run/\%2/configtest.xsl}
+-    to_run=${to_run/\%3/configtest.out}
+     if { ac_try='$to_run'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+@@ -28619,7 +28613,7 @@ echo "${ECHO_T}no" >&6; };
+ 
+     fi
+     if test "$check_xslt_sablotronfound" != notfound -a "$xslt_prog" = notfound; then
+-        xslt_prog="$check_xslt_sablotronfound %2 %1 %3"
++        xslt_prog="$check_xslt_sablotronfound configtest.xsl configtest.xml configtest.out"
+ 
+     cat << \EOF > configtest.xml
+ <?xml version="1.0" encoding="ISO-8859-1"?>
+@@ -28678,9 +28672,6 @@ EOF
+     { echo "$as_me:$LINENO: checking xslt compliance of $xslt_prog" >&5
+ echo $ECHO_N "checking xslt compliance of $xslt_prog... $ECHO_C" >&6; }
+     to_run=$xslt_prog
+-    to_run=${to_run/\%1/configtest.xml}
+-    to_run=${to_run/\%2/configtest.xsl}
+-    to_run=${to_run/\%3/configtest.out}
+     if { ac_try='$to_run'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
diff --git a/games/crossfire-server/patches/patch-ae b/games/crossfire-server/patches/patch-ae
index db3742de95f..fc7320b69f3 100644
--- a/games/crossfire-server/patches/patch-ae
+++ b/games/crossfire-server/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/05/11 05:59:36 adam Exp $
+$NetBSD: patch-ae,v 1.2 2008/11/04 08:36:34 adam Exp $
 
---- socket/lowlevel.c.orig	2005-12-12 03:36:26.000000000 +0100
+--- socket/lowlevel.c.orig	2008-02-01 06:56:29.000000000 +0100
 +++ socket/lowlevel.c
-@@ -117,7 +117,6 @@ short GetShort_String(unsigned char *dat
+@@ -124,7 +124,6 @@ short GetShort_String(const unsigned cha
  int SockList_ReadPacket(int fd, SockList *sl, int len)
  {
      int stat,toread;