- Fix dependancy

- Support CFLAGS/PREFIX properly
- tar -> TAR

PR: 23223
Submitted by: Ports Fury

12 files changed, 471 insertions, 459 deletions

diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 7849df09287d..c06ab46fcefc 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	crossfire
-PORTVERSION=	${MAJ}.${MIN}.${PL}
+PORTVERSION=	0.94.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/crossfire/old/ \
 		ftp://ftp.sunet.se/pub/unix/games/crossfire/old/
 DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 		${CF_ARCH} ${CF_CLSERV}
+EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
+LIB_DEPENDS=	rplay.1:${PORTSDIR}/audio/rplay
+BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
 
-EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
-USE_IMAKE=	yes
 USE_XPM=	yes
-PREFIX=		${LOCALBASE}
-MAN6=		crossfire.6 crossedit.6
+MAN6=		crossedit.6 crossfire.6
 
 .include <bsd.port.pre.mk>
 
@@ -37,36 +37,43 @@ RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 # You need TeX to do this ! Please read the README's !
 WANT_CF_ARCH=	NO
 
-MAJ=		0
-MIN=		94
-PL=		3
-CF_SOURCES=	crossfire-${MAJ}.${MIN}.${PL}.tar.gz
-CF_MAPS=	crossfire-${MAJ}.${MIN}.${PL}.maps.tar.gz
+CF_SOURCES=	${PORTNAME}-${PORTVERSION}.tar.gz
+CF_MAPS=	${PORTNAME}-${PORTVERSION}.maps.tar.gz
 # crossfire doc ready for use
-CF_DOC=		crossfire-${MAJ}.${MIN}.${PL}.doc.tar.gz
+CF_DOC=		${PORTNAME}-${PORTVERSION}.doc.tar.gz
 # no newer sounds available
-CF_SOUNDS=	crossfire-${MAJ}.92.7.sounds.tar.gz
+CF_SOUNDS=	${PORTNAME}-0.92.7.sounds.tar.gz
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 # only for rebuild of doc
-CF_ARCH=	crossfire-${MAJ}.${MIN}.${PL}.arch.tar.gz
+CF_ARCH=	${PORTNAME}-${PORTVERSION}.arch.tar.gz
 .endif
 #CF_CLSERV=	eutl.tar.gz		# only for client/server
 CFDIR=		${PREFIX}/lib/crossfire	# crossfire base directory
 
+post-patch:
+	@${PERL} -pi -e \
+		's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		 s|%%X11BASE%%|${X11BASE}|g ; \
+		 s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config/crosssite.def
+
+do-configure:
+	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
+
 # If you want to re-make playbook and spoiler you need the ARCH
 # files and a TeX version with a ,great' amount of max_mem
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 post-configure:
-	(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_ARCH})
+	${TAR} -C ${CFDIR} -xzf ${_DISTDIR}/${CF_ARCH}
 .endif
 
 post-install:
-	@(cd ${CFDIR}/lib; tar -xzf ${DISTDIR}/${CF_MAPS})
-	@(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_SOUNDS})
-	@${MKDIR} ${PREFIX}/share/doc/crossfire
-	@${CP} -r ${WRKDIR}/crossfire-${MAJ}.${MIN}.${PL}-doc/* \
-		${PREFIX}/share/doc/crossfire
+	${INSTALL_MAN} ${WRKSRC}/doc/crossedit.man \
+		 ${MANPREFIX}/man/man6/crossedit.6
+	${INSTALL_MAN} ${WRKSRC}/doc/crossfire.man \
+		${MANPREFIX}/man/man6/crossfire.6
+	@${TAR} -C ${CFDIR}/lib -xzf ${_DISTDIR}/${CF_MAPS}
+	@${TAR} -C ${CFDIR} -xzf ${_DISTDIR}/${CF_SOUNDS}
 	@${TOUCH} ${CFDIR}/lib/bookarch
 	@${CHMOD} 664 ${CFDIR}/lib/bookarch
 	@${TOUCH} ${CFDIR}/lib/forbid
@@ -77,9 +84,11 @@ post-install:
 	@${CHMOD} 0664 ${CFDIR}/lib/highscore
 	@${CHOWN} root.games ${PREFIX}/bin/crossfire
 	@${CHMOD} 2555 ${PREFIX}/bin/crossfire
-	${ECHO} "Note: to start crossfire in clientmode"
-	${ECHO} "	crossfire -xpm"
-	${ECHO} "Note: don't forget to update ${PREFIX}/etc/rplay.conf"
-	${ECHO} "	with new sounds in ${CFDIR}/sounds"
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/crossfire
+	@${TAR} -C ${WRKDIR}/${PORTNAME}-${PORTVERSION}-doc -cf - . | \
+		${TAR} -C ${PREFIX}/share/doc/crossfire --unlink -xf -
+.endif
+	@${SED} -e "s:/usr/local:${LOCALBASE}:g" ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/games/crossfire-client/files/patch-aa b/games/crossfire-client/files/patch-aa
index dab90bcd9ff2..e59ed4bb0042 100644
--- a/games/crossfire-client/files/patch-aa
+++ b/games/crossfire-client/files/patch-aa
@@ -1,5 +1,5 @@
---- config/crosssite.def.orig	Thu Apr 16 04:07:49 1998
-+++ config/crosssite.def	Fri May  8 14:51:14 1998
+--- config/crosssite.def.orig	Sat Aug  1 19:23:58 1998
++++ config/crosssite.def	Sat Dec  2 05:14:43 2000
 @@ -36,10 +36,8 @@
   * (mwedel@pyramid.com)
   */
@@ -8,7 +8,7 @@
  #define XPM_PIX
 -#define Xpm_LibDir /usr/local/lib/
 -*/
-+#define Xpm_LibDir !!X11BASE!!/lib/
++#define Xpm_LibDir %%X11BASE%%/lib/
  /* If your include files are someplace odd */
  /*#define Xpm_Include	/usr/local/include*/
  
@@ -17,14 +17,14 @@
   * overall. 
   */
 -#define CTop /home/hugin/a/crossfire/crossfire
-+#define CTop !!LOCALBASE!!/lib/crossfire
++#define CTop %%PREFIX%%/lib/crossfire
  /* #define CTop /net/contrib/crossfire */
  /*#define CTop /usr/local/games/crossfire*/
  
  /* Binaries location If this is undefined, it default to the
     standard location for X binaries on your machine. */
 -#define CBinDir Concat(CTop,/bin)
-+#define CBinDir !!LOCALBASE!!/bin
++#define CBinDir %%PREFIX%%/bin
  
  /* Libraries location If this is undefined it defaults to the
    standard location for X lib files/crossfire on your machine */
@@ -33,23 +33,14 @@
     standard location for manual pages on your machine.*/
  /* #define CManPath Concat(CTop,/man) */
 -#define CManSuffix 6
-+#define CManPath !!LOCALBASE!!/man
++#define CManPath %%PREFIX%%/man
 +/* #define CManSuffix 6 */
  
  
  /* Force CC to use the specified options instead of the default
-@@ -85,7 +84,7 @@
-  * any of the default compiler options for your machine.
-  */
- /*define ForceCCOPTIONS -O -g -Wall */
--#undef ForceCCOPTIONS
-+#define ForceCCOPTIONS -pipe -O
- 
- /* Extra_Flags are added onto the compilers default options.  Can be
-  * quite useful if you just want to add another flag or two, and not
-@@ -102,9 +101,8 @@
- /* Add any extra/special libraries that you may need.  Make sure you 
+@@ -103,9 +102,8 @@
   * use the -l form or put in the complete path name.
+  * Linux users may need to add -lcrypt
   */
 -/*
 -#define Extra_Libraries -lcrypt
@@ -59,7 +50,7 @@
  
  /* Force CC to be a specific compilator? Define this to be the
   * actual compiler (see example).  If defined, the default
-@@ -160,11 +158,9 @@
+@@ -161,11 +159,9 @@
   * too distant future, it probably isn't worth fixing here.
   */
  
@@ -68,12 +59,12 @@
 -#define RPlayLibDir /usr/local/lib
 -#define RPlayIncDir /usr/local/include
 -*/
-+#define RPlayLibDir !!LOCALBASE!!/lib
-+#define RPlayIncDir !!LOCALBASE!!/include
++#define RPlayLibDir %%LOCALBASE%%/lib
++#define RPlayIncDir %%LOCALBASE%%/include
  
  /* define this if using OpenWindows as your enviroment. This only
   * needs to be set if the openwindows server you use is
-@@ -202,7 +198,7 @@
+@@ -203,7 +199,7 @@
   * awk on most other systems will be OK.
   */
  
diff --git a/games/crossfire-client/pkg-message b/games/crossfire-client/pkg-message
new file mode 100644
index 000000000000..2a71b72dcafd
--- /dev/null
+++ b/games/crossfire-client/pkg-message
@@ -0,0 +1,4 @@
+Note: to start crossfire in clientmode
+  crossfire -xpm
+Note: don't forget to update /usr/local/etc/rplay.conf
+  with new sounds in /usr/local/lib/crossfire/sounds
diff --git a/games/crossfire-client/pkg-plist b/games/crossfire-client/pkg-plist
index 3570f04cf23b..37b59ed09d05 100644
--- a/games/crossfire-client/pkg-plist
+++ b/games/crossfire-client/pkg-plist
@@ -2024,138 +2024,138 @@ share/doc/crossfire/spoiler-html/zombie.111.gif
 share/doc/crossfire/spoiler.ps
 share/doc/crossfire/teleporter.doc
 share/doc/crossfire/xbmtobdf.man
-@dirrm lib/crossfire/lib/adm
-@dirrm lib/crossfire/lib/players
-@dirrm lib/crossfire/lib/help
+@dirrm share/doc/crossfire/spoiler-html
+@dirrm share/doc/crossfire/spell-docs
+@dirrm share/doc/crossfire/playbook-html/fig
+@dirrm share/doc/crossfire/playbook-html
+@dirrm share/doc/crossfire
+@dirrm lib/crossfire/sounds
 @dirrm lib/crossfire/lib/unique-items
-@dirrm lib/crossfire/lib/maps/editor/picks
-@dirrm lib/crossfire/lib/maps/editor/walls
-@dirrm lib/crossfire/lib/maps/editor
-@dirrm lib/crossfire/lib/maps/skud
+@dirrm lib/crossfire/lib/players
 @dirrm lib/crossfire/lib/maps/world
-@dirrm lib/crossfire/lib/maps/dtabb/town
-@dirrm lib/crossfire/lib/maps/dtabb/quest
-@dirrm lib/crossfire/lib/maps/dtabb
-@dirrm lib/crossfire/lib/maps/ender/pisland
-@dirrm lib/crossfire/lib/maps/ender/temple
-@dirrm lib/crossfire/lib/maps/ender/island
-@dirrm lib/crossfire/lib/maps/ender
-@dirrm lib/crossfire/lib/maps/kar
-@dirrm lib/crossfire/lib/maps/city/oldcity
-@dirrm lib/crossfire/lib/maps/city/taverns
-@dirrm lib/crossfire/lib/maps/city/houses
-@dirrm lib/crossfire/lib/maps/city/misc
-@dirrm lib/crossfire/lib/maps/city/towers
-@dirrm lib/crossfire/lib/maps/city/cannery
-@dirrm lib/crossfire/lib/maps/city/shops
-@dirrm lib/crossfire/lib/maps/city/kar
-@dirrm lib/crossfire/lib/maps/city/magara
-@dirrm lib/crossfire/lib/maps/city/mansion
-@dirrm lib/crossfire/lib/maps/city
-@dirrm lib/crossfire/lib/maps/cd
-@dirrm lib/crossfire/lib/maps/eeur
-@dirrm lib/crossfire/lib/maps/mcz
-@dirrm lib/crossfire/lib/maps/esben
-@dirrm lib/crossfire/lib/maps/santo_dominion/houses
+@dirrm lib/crossfire/lib/maps/wolfsburg/tt
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower2
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower1
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/cellar1
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/castle
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara
+@dirrm lib/crossfire/lib/maps/wolfsburg
+@dirrm lib/crossfire/lib/maps/thomas/sisters
+@dirrm lib/crossfire/lib/maps/thomas
+@dirrm lib/crossfire/lib/maps/test
+@dirrm lib/crossfire/lib/maps/terrain
+@dirrm lib/crossfire/lib/maps/skud
+@dirrm lib/crossfire/lib/maps/santo_dominion/shops
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/well
-@dirrm lib/crossfire/lib/maps/santo_dominion/magara/north_lighthouse
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/south_lighthouse
+@dirrm lib/crossfire/lib/maps/santo_dominion/magara/north_lighthouse
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/hut
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara
 @dirrm lib/crossfire/lib/maps/santo_dominion/lord_byron
-@dirrm lib/crossfire/lib/maps/santo_dominion/shops
+@dirrm lib/crossfire/lib/maps/santo_dominion/houses
 @dirrm lib/crossfire/lib/maps/santo_dominion
-@dirrm lib/crossfire/lib/maps/hendel
-@dirrm lib/crossfire/lib/maps/terrain
-@dirrm lib/crossfire/lib/maps/peterm/CTower
+@dirrm lib/crossfire/lib/maps/pup_land/s_f
+@dirrm lib/crossfire/lib/maps/pup_land/ruin_barbarian
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/red_town
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv7
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv6
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv5
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv4
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv3
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv2
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv1
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow
+@dirrm lib/crossfire/lib/maps/pup_land/raffle
+@dirrm lib/crossfire/lib/maps/pup_land/pplant
+@dirrm lib/crossfire/lib/maps/pup_land/ordeal
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/reception
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/dick
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/castle_bauer
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg
+@dirrm lib/crossfire/lib/maps/pup_land/lone_town/cave
+@dirrm lib/crossfire/lib/maps/pup_land/lone_town
+@dirrm lib/crossfire/lib/maps/pup_land/kurte
+@dirrm lib/crossfire/lib/maps/pup_land/jk
+@dirrm lib/crossfire/lib/maps/pup_land/cave_weapon
+@dirrm lib/crossfire/lib/maps/pup_land/castle_eureca
+@dirrm lib/crossfire/lib/maps/pup_land/begin
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/siegfried
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/hole
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/ruin
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/mountain
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/kurte
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/castle
+@dirrm lib/crossfire/lib/maps/pup_land/ancient
+@dirrm lib/crossfire/lib/maps/pup_land
 @dirrm lib/crossfire/lib/maps/peterm/temple
-@dirrm lib/crossfire/lib/maps/peterm/Demonology
-@dirrm lib/crossfire/lib/maps/peterm/DragonQuest
 @dirrm lib/crossfire/lib/maps/peterm/FireTemple
+@dirrm lib/crossfire/lib/maps/peterm/DragonQuest
+@dirrm lib/crossfire/lib/maps/peterm/Demonology
+@dirrm lib/crossfire/lib/maps/peterm/CTower
 @dirrm lib/crossfire/lib/maps/peterm
-@dirrm lib/crossfire/lib/maps/langley/pirates
+@dirrm lib/crossfire/lib/maps/navar_city/tower
+@dirrm lib/crossfire/lib/maps/navar_city/magara/houses
+@dirrm lib/crossfire/lib/maps/navar_city/magara
+@dirrm lib/crossfire/lib/maps/navar_city/light
+@dirrm lib/crossfire/lib/maps/navar_city/illusion
+@dirrm lib/crossfire/lib/maps/navar_city
+@dirrm lib/crossfire/lib/maps/mcz
 @dirrm lib/crossfire/lib/maps/langley/town
+@dirrm lib/crossfire/lib/maps/langley/pirates
 @dirrm lib/crossfire/lib/maps/langley/goblin
 @dirrm lib/crossfire/lib/maps/langley
-@dirrm lib/crossfire/lib/maps/asyvan
+@dirrm lib/crossfire/lib/maps/kar
+@dirrm lib/crossfire/lib/maps/hendel
+@dirrm lib/crossfire/lib/maps/good
 @dirrm lib/crossfire/lib/maps/generic/volcano
 @dirrm lib/crossfire/lib/maps/generic
+@dirrm lib/crossfire/lib/maps/espen
+@dirrm lib/crossfire/lib/maps/esben
+@dirrm lib/crossfire/lib/maps/ender/temple
+@dirrm lib/crossfire/lib/maps/ender/pisland
+@dirrm lib/crossfire/lib/maps/ender/island
+@dirrm lib/crossfire/lib/maps/ender
+@dirrm lib/crossfire/lib/maps/eeur
+@dirrm lib/crossfire/lib/maps/editor/walls
+@dirrm lib/crossfire/lib/maps/editor/picks
+@dirrm lib/crossfire/lib/maps/editor
+@dirrm lib/crossfire/lib/maps/dtabb/town
+@dirrm lib/crossfire/lib/maps/dtabb/quest
+@dirrm lib/crossfire/lib/maps/dtabb
+@dirrm lib/crossfire/lib/maps/dragonisland
+@dirrm lib/crossfire/lib/maps/city/towers
+@dirrm lib/crossfire/lib/maps/city/taverns
+@dirrm lib/crossfire/lib/maps/city/shops
+@dirrm lib/crossfire/lib/maps/city/oldcity
+@dirrm lib/crossfire/lib/maps/city/misc
+@dirrm lib/crossfire/lib/maps/city/mansion
+@dirrm lib/crossfire/lib/maps/city/magara
+@dirrm lib/crossfire/lib/maps/city/kar
+@dirrm lib/crossfire/lib/maps/city/houses
+@dirrm lib/crossfire/lib/maps/city/cannery
+@dirrm lib/crossfire/lib/maps/city
+@dirrm lib/crossfire/lib/maps/cd
 @dirrm lib/crossfire/lib/maps/brittany/Brest/Castle
 @dirrm lib/crossfire/lib/maps/brittany/Brest
 @dirrm lib/crossfire/lib/maps/brittany
-@dirrm lib/crossfire/lib/maps/navar_city/illusion
-@dirrm lib/crossfire/lib/maps/navar_city/tower
-@dirrm lib/crossfire/lib/maps/navar_city/light
-@dirrm lib/crossfire/lib/maps/navar_city/magara/houses
-@dirrm lib/crossfire/lib/maps/navar_city/magara
-@dirrm lib/crossfire/lib/maps/navar_city
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower1
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/cellar1
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower2
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/castle
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara
-@dirrm lib/crossfire/lib/maps/wolfsburg/tt
-@dirrm lib/crossfire/lib/maps/wolfsburg
-@dirrm lib/crossfire/lib/maps/espen
-@dirrm lib/crossfire/lib/maps/thomas/sisters
-@dirrm lib/crossfire/lib/maps/thomas
-@dirrm lib/crossfire/lib/maps/Lake_Country/Mwizard
-@dirrm lib/crossfire/lib/maps/Lake_Country/marsh
-@dirrm lib/crossfire/lib/maps/Lake_Country/small_buildings
-@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis/houses
-@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis
-@dirrm lib/crossfire/lib/maps/Lake_Country/RETower
-@dirrm lib/crossfire/lib/maps/Lake_Country/ebony
+@dirrm lib/crossfire/lib/maps/asyvan
 @dirrm lib/crossfire/lib/maps/Lake_Country/snake_pit
-@dirrm lib/crossfire/lib/maps/Lake_Country/Sunset_Lake
-@dirrm lib/crossfire/lib/maps/Lake_Country/flight
+@dirrm lib/crossfire/lib/maps/Lake_Country/small_buildings
 @dirrm lib/crossfire/lib/maps/Lake_Country/shops
 @dirrm lib/crossfire/lib/maps/Lake_Country/quest
+@dirrm lib/crossfire/lib/maps/Lake_Country/marsh
+@dirrm lib/crossfire/lib/maps/Lake_Country/flight
+@dirrm lib/crossfire/lib/maps/Lake_Country/ebony
+@dirrm lib/crossfire/lib/maps/Lake_Country/Sunset_Lake
+@dirrm lib/crossfire/lib/maps/Lake_Country/RETower
+@dirrm lib/crossfire/lib/maps/Lake_Country/Mwizard
+@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis/houses
+@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis
 @dirrm lib/crossfire/lib/maps/Lake_Country
-@dirrm lib/crossfire/lib/maps/test
-@dirrm lib/crossfire/lib/maps/good
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/ruin
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/siegfried
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/hole
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/kurte
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/mountain
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/castle
-@dirrm lib/crossfire/lib/maps/pup_land/ancient
-@dirrm lib/crossfire/lib/maps/pup_land/begin
-@dirrm lib/crossfire/lib/maps/pup_land/castle_eureca
-@dirrm lib/crossfire/lib/maps/pup_land/cave_weapon
-@dirrm lib/crossfire/lib/maps/pup_land/jk
-@dirrm lib/crossfire/lib/maps/pup_land/kurte
-@dirrm lib/crossfire/lib/maps/pup_land/lone_town/cave
-@dirrm lib/crossfire/lib/maps/pup_land/lone_town
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/dick
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/reception
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/castle_bauer
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg
-@dirrm lib/crossfire/lib/maps/pup_land/ordeal
-@dirrm lib/crossfire/lib/maps/pup_land/pplant
-@dirrm lib/crossfire/lib/maps/pup_land/raffle
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv1
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv2
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv3
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv4
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv5
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv6
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv7
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/red_town
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow
-@dirrm lib/crossfire/lib/maps/pup_land/ruin_barbarian
-@dirrm lib/crossfire/lib/maps/pup_land/s_f
-@dirrm lib/crossfire/lib/maps/pup_land
-@dirrm lib/crossfire/lib/maps/dragonisland
 @dirrm lib/crossfire/lib/maps
+@dirrm lib/crossfire/lib/help
+@dirrm lib/crossfire/lib/adm
 @dirrm lib/crossfire/lib
 @dirrm lib/crossfire/fonts
-@dirrm lib/crossfire/sounds
 @dirrm lib/crossfire
-@dirrm share/doc/crossfire/spell-docs
-@dirrm share/doc/crossfire/spoiler-html
-@dirrm share/doc/crossfire/playbook-html/fig
-@dirrm share/doc/crossfire/playbook-html
-@dirrm share/doc/crossfire
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 7849df09287d..c06ab46fcefc 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	crossfire
-PORTVERSION=	${MAJ}.${MIN}.${PL}
+PORTVERSION=	0.94.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/crossfire/old/ \
 		ftp://ftp.sunet.se/pub/unix/games/crossfire/old/
 DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 		${CF_ARCH} ${CF_CLSERV}
+EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
+LIB_DEPENDS=	rplay.1:${PORTSDIR}/audio/rplay
+BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
 
-EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
-USE_IMAKE=	yes
 USE_XPM=	yes
-PREFIX=		${LOCALBASE}
-MAN6=		crossfire.6 crossedit.6
+MAN6=		crossedit.6 crossfire.6
 
 .include <bsd.port.pre.mk>
 
@@ -37,36 +37,43 @@ RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 # You need TeX to do this ! Please read the README's !
 WANT_CF_ARCH=	NO
 
-MAJ=		0
-MIN=		94
-PL=		3
-CF_SOURCES=	crossfire-${MAJ}.${MIN}.${PL}.tar.gz
-CF_MAPS=	crossfire-${MAJ}.${MIN}.${PL}.maps.tar.gz
+CF_SOURCES=	${PORTNAME}-${PORTVERSION}.tar.gz
+CF_MAPS=	${PORTNAME}-${PORTVERSION}.maps.tar.gz
 # crossfire doc ready for use
-CF_DOC=		crossfire-${MAJ}.${MIN}.${PL}.doc.tar.gz
+CF_DOC=		${PORTNAME}-${PORTVERSION}.doc.tar.gz
 # no newer sounds available
-CF_SOUNDS=	crossfire-${MAJ}.92.7.sounds.tar.gz
+CF_SOUNDS=	${PORTNAME}-0.92.7.sounds.tar.gz
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 # only for rebuild of doc
-CF_ARCH=	crossfire-${MAJ}.${MIN}.${PL}.arch.tar.gz
+CF_ARCH=	${PORTNAME}-${PORTVERSION}.arch.tar.gz
 .endif
 #CF_CLSERV=	eutl.tar.gz		# only for client/server
 CFDIR=		${PREFIX}/lib/crossfire	# crossfire base directory
 
+post-patch:
+	@${PERL} -pi -e \
+		's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		 s|%%X11BASE%%|${X11BASE}|g ; \
+		 s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config/crosssite.def
+
+do-configure:
+	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
+
 # If you want to re-make playbook and spoiler you need the ARCH
 # files and a TeX version with a ,great' amount of max_mem
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 post-configure:
-	(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_ARCH})
+	${TAR} -C ${CFDIR} -xzf ${_DISTDIR}/${CF_ARCH}
 .endif
 
 post-install:
-	@(cd ${CFDIR}/lib; tar -xzf ${DISTDIR}/${CF_MAPS})
-	@(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_SOUNDS})
-	@${MKDIR} ${PREFIX}/share/doc/crossfire
-	@${CP} -r ${WRKDIR}/crossfire-${MAJ}.${MIN}.${PL}-doc/* \
-		${PREFIX}/share/doc/crossfire
+	${INSTALL_MAN} ${WRKSRC}/doc/crossedit.man \
+		 ${MANPREFIX}/man/man6/crossedit.6
+	${INSTALL_MAN} ${WRKSRC}/doc/crossfire.man \
+		${MANPREFIX}/man/man6/crossfire.6
+	@${TAR} -C ${CFDIR}/lib -xzf ${_DISTDIR}/${CF_MAPS}
+	@${TAR} -C ${CFDIR} -xzf ${_DISTDIR}/${CF_SOUNDS}
 	@${TOUCH} ${CFDIR}/lib/bookarch
 	@${CHMOD} 664 ${CFDIR}/lib/bookarch
 	@${TOUCH} ${CFDIR}/lib/forbid
@@ -77,9 +84,11 @@ post-install:
 	@${CHMOD} 0664 ${CFDIR}/lib/highscore
 	@${CHOWN} root.games ${PREFIX}/bin/crossfire
 	@${CHMOD} 2555 ${PREFIX}/bin/crossfire
-	${ECHO} "Note: to start crossfire in clientmode"
-	${ECHO} "	crossfire -xpm"
-	${ECHO} "Note: don't forget to update ${PREFIX}/etc/rplay.conf"
-	${ECHO} "	with new sounds in ${CFDIR}/sounds"
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/crossfire
+	@${TAR} -C ${WRKDIR}/${PORTNAME}-${PORTVERSION}-doc -cf - . | \
+		${TAR} -C ${PREFIX}/share/doc/crossfire --unlink -xf -
+.endif
+	@${SED} -e "s:/usr/local:${LOCALBASE}:g" ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/games/crossfire-server/files/patch-aa b/games/crossfire-server/files/patch-aa
index dab90bcd9ff2..e59ed4bb0042 100644
--- a/games/crossfire-server/files/patch-aa
+++ b/games/crossfire-server/files/patch-aa
@@ -1,5 +1,5 @@
---- config/crosssite.def.orig	Thu Apr 16 04:07:49 1998
-+++ config/crosssite.def	Fri May  8 14:51:14 1998
+--- config/crosssite.def.orig	Sat Aug  1 19:23:58 1998
++++ config/crosssite.def	Sat Dec  2 05:14:43 2000
 @@ -36,10 +36,8 @@
   * (mwedel@pyramid.com)
   */
@@ -8,7 +8,7 @@
  #define XPM_PIX
 -#define Xpm_LibDir /usr/local/lib/
 -*/
-+#define Xpm_LibDir !!X11BASE!!/lib/
++#define Xpm_LibDir %%X11BASE%%/lib/
  /* If your include files are someplace odd */
  /*#define Xpm_Include	/usr/local/include*/
  
@@ -17,14 +17,14 @@
   * overall. 
   */
 -#define CTop /home/hugin/a/crossfire/crossfire
-+#define CTop !!LOCALBASE!!/lib/crossfire
++#define CTop %%PREFIX%%/lib/crossfire
  /* #define CTop /net/contrib/crossfire */
  /*#define CTop /usr/local/games/crossfire*/
  
  /* Binaries location If this is undefined, it default to the
     standard location for X binaries on your machine. */
 -#define CBinDir Concat(CTop,/bin)
-+#define CBinDir !!LOCALBASE!!/bin
++#define CBinDir %%PREFIX%%/bin
  
  /* Libraries location If this is undefined it defaults to the
    standard location for X lib files/crossfire on your machine */
@@ -33,23 +33,14 @@
     standard location for manual pages on your machine.*/
  /* #define CManPath Concat(CTop,/man) */
 -#define CManSuffix 6
-+#define CManPath !!LOCALBASE!!/man
++#define CManPath %%PREFIX%%/man
 +/* #define CManSuffix 6 */
  
  
  /* Force CC to use the specified options instead of the default
-@@ -85,7 +84,7 @@
-  * any of the default compiler options for your machine.
-  */
- /*define ForceCCOPTIONS -O -g -Wall */
--#undef ForceCCOPTIONS
-+#define ForceCCOPTIONS -pipe -O
- 
- /* Extra_Flags are added onto the compilers default options.  Can be
-  * quite useful if you just want to add another flag or two, and not
-@@ -102,9 +101,8 @@
- /* Add any extra/special libraries that you may need.  Make sure you 
+@@ -103,9 +102,8 @@
   * use the -l form or put in the complete path name.
+  * Linux users may need to add -lcrypt
   */
 -/*
 -#define Extra_Libraries -lcrypt
@@ -59,7 +50,7 @@
  
  /* Force CC to be a specific compilator? Define this to be the
   * actual compiler (see example).  If defined, the default
-@@ -160,11 +158,9 @@
+@@ -161,11 +159,9 @@
   * too distant future, it probably isn't worth fixing here.
   */
  
@@ -68,12 +59,12 @@
 -#define RPlayLibDir /usr/local/lib
 -#define RPlayIncDir /usr/local/include
 -*/
-+#define RPlayLibDir !!LOCALBASE!!/lib
-+#define RPlayIncDir !!LOCALBASE!!/include
++#define RPlayLibDir %%LOCALBASE%%/lib
++#define RPlayIncDir %%LOCALBASE%%/include
  
  /* define this if using OpenWindows as your enviroment. This only
   * needs to be set if the openwindows server you use is
-@@ -202,7 +198,7 @@
+@@ -203,7 +199,7 @@
   * awk on most other systems will be OK.
   */
  
diff --git a/games/crossfire-server/pkg-message b/games/crossfire-server/pkg-message
new file mode 100644
index 000000000000..2a71b72dcafd
--- /dev/null
+++ b/games/crossfire-server/pkg-message
@@ -0,0 +1,4 @@
+Note: to start crossfire in clientmode
+  crossfire -xpm
+Note: don't forget to update /usr/local/etc/rplay.conf
+  with new sounds in /usr/local/lib/crossfire/sounds
diff --git a/games/crossfire-server/pkg-plist b/games/crossfire-server/pkg-plist
index 3570f04cf23b..37b59ed09d05 100644
--- a/games/crossfire-server/pkg-plist
+++ b/games/crossfire-server/pkg-plist
@@ -2024,138 +2024,138 @@ share/doc/crossfire/spoiler-html/zombie.111.gif
 share/doc/crossfire/spoiler.ps
 share/doc/crossfire/teleporter.doc
 share/doc/crossfire/xbmtobdf.man
-@dirrm lib/crossfire/lib/adm
-@dirrm lib/crossfire/lib/players
-@dirrm lib/crossfire/lib/help
+@dirrm share/doc/crossfire/spoiler-html
+@dirrm share/doc/crossfire/spell-docs
+@dirrm share/doc/crossfire/playbook-html/fig
+@dirrm share/doc/crossfire/playbook-html
+@dirrm share/doc/crossfire
+@dirrm lib/crossfire/sounds
 @dirrm lib/crossfire/lib/unique-items
-@dirrm lib/crossfire/lib/maps/editor/picks
-@dirrm lib/crossfire/lib/maps/editor/walls
-@dirrm lib/crossfire/lib/maps/editor
-@dirrm lib/crossfire/lib/maps/skud
+@dirrm lib/crossfire/lib/players
 @dirrm lib/crossfire/lib/maps/world
-@dirrm lib/crossfire/lib/maps/dtabb/town
-@dirrm lib/crossfire/lib/maps/dtabb/quest
-@dirrm lib/crossfire/lib/maps/dtabb
-@dirrm lib/crossfire/lib/maps/ender/pisland
-@dirrm lib/crossfire/lib/maps/ender/temple
-@dirrm lib/crossfire/lib/maps/ender/island
-@dirrm lib/crossfire/lib/maps/ender
-@dirrm lib/crossfire/lib/maps/kar
-@dirrm lib/crossfire/lib/maps/city/oldcity
-@dirrm lib/crossfire/lib/maps/city/taverns
-@dirrm lib/crossfire/lib/maps/city/houses
-@dirrm lib/crossfire/lib/maps/city/misc
-@dirrm lib/crossfire/lib/maps/city/towers
-@dirrm lib/crossfire/lib/maps/city/cannery
-@dirrm lib/crossfire/lib/maps/city/shops
-@dirrm lib/crossfire/lib/maps/city/kar
-@dirrm lib/crossfire/lib/maps/city/magara
-@dirrm lib/crossfire/lib/maps/city/mansion
-@dirrm lib/crossfire/lib/maps/city
-@dirrm lib/crossfire/lib/maps/cd
-@dirrm lib/crossfire/lib/maps/eeur
-@dirrm lib/crossfire/lib/maps/mcz
-@dirrm lib/crossfire/lib/maps/esben
-@dirrm lib/crossfire/lib/maps/santo_dominion/houses
+@dirrm lib/crossfire/lib/maps/wolfsburg/tt
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower2
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower1
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/cellar1
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/castle
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara
+@dirrm lib/crossfire/lib/maps/wolfsburg
+@dirrm lib/crossfire/lib/maps/thomas/sisters
+@dirrm lib/crossfire/lib/maps/thomas
+@dirrm lib/crossfire/lib/maps/test
+@dirrm lib/crossfire/lib/maps/terrain
+@dirrm lib/crossfire/lib/maps/skud
+@dirrm lib/crossfire/lib/maps/santo_dominion/shops
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/well
-@dirrm lib/crossfire/lib/maps/santo_dominion/magara/north_lighthouse
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/south_lighthouse
+@dirrm lib/crossfire/lib/maps/santo_dominion/magara/north_lighthouse
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/hut
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara
 @dirrm lib/crossfire/lib/maps/santo_dominion/lord_byron
-@dirrm lib/crossfire/lib/maps/santo_dominion/shops
+@dirrm lib/crossfire/lib/maps/santo_dominion/houses
 @dirrm lib/crossfire/lib/maps/santo_dominion
-@dirrm lib/crossfire/lib/maps/hendel
-@dirrm lib/crossfire/lib/maps/terrain
-@dirrm lib/crossfire/lib/maps/peterm/CTower
+@dirrm lib/crossfire/lib/maps/pup_land/s_f
+@dirrm lib/crossfire/lib/maps/pup_land/ruin_barbarian
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/red_town
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv7
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv6
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv5
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv4
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv3
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv2
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv1
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow
+@dirrm lib/crossfire/lib/maps/pup_land/raffle
+@dirrm lib/crossfire/lib/maps/pup_land/pplant
+@dirrm lib/crossfire/lib/maps/pup_land/ordeal
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/reception
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/dick
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/castle_bauer
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg
+@dirrm lib/crossfire/lib/maps/pup_land/lone_town/cave
+@dirrm lib/crossfire/lib/maps/pup_land/lone_town
+@dirrm lib/crossfire/lib/maps/pup_land/kurte
+@dirrm lib/crossfire/lib/maps/pup_land/jk
+@dirrm lib/crossfire/lib/maps/pup_land/cave_weapon
+@dirrm lib/crossfire/lib/maps/pup_land/castle_eureca
+@dirrm lib/crossfire/lib/maps/pup_land/begin
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/siegfried
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/hole
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/ruin
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/mountain
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/kurte
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/castle
+@dirrm lib/crossfire/lib/maps/pup_land/ancient
+@dirrm lib/crossfire/lib/maps/pup_land
 @dirrm lib/crossfire/lib/maps/peterm/temple
-@dirrm lib/crossfire/lib/maps/peterm/Demonology
-@dirrm lib/crossfire/lib/maps/peterm/DragonQuest
 @dirrm lib/crossfire/lib/maps/peterm/FireTemple
+@dirrm lib/crossfire/lib/maps/peterm/DragonQuest
+@dirrm lib/crossfire/lib/maps/peterm/Demonology
+@dirrm lib/crossfire/lib/maps/peterm/CTower
 @dirrm lib/crossfire/lib/maps/peterm
-@dirrm lib/crossfire/lib/maps/langley/pirates
+@dirrm lib/crossfire/lib/maps/navar_city/tower
+@dirrm lib/crossfire/lib/maps/navar_city/magara/houses
+@dirrm lib/crossfire/lib/maps/navar_city/magara
+@dirrm lib/crossfire/lib/maps/navar_city/light
+@dirrm lib/crossfire/lib/maps/navar_city/illusion
+@dirrm lib/crossfire/lib/maps/navar_city
+@dirrm lib/crossfire/lib/maps/mcz
 @dirrm lib/crossfire/lib/maps/langley/town
+@dirrm lib/crossfire/lib/maps/langley/pirates
 @dirrm lib/crossfire/lib/maps/langley/goblin
 @dirrm lib/crossfire/lib/maps/langley
-@dirrm lib/crossfire/lib/maps/asyvan
+@dirrm lib/crossfire/lib/maps/kar
+@dirrm lib/crossfire/lib/maps/hendel
+@dirrm lib/crossfire/lib/maps/good
 @dirrm lib/crossfire/lib/maps/generic/volcano
 @dirrm lib/crossfire/lib/maps/generic
+@dirrm lib/crossfire/lib/maps/espen
+@dirrm lib/crossfire/lib/maps/esben
+@dirrm lib/crossfire/lib/maps/ender/temple
+@dirrm lib/crossfire/lib/maps/ender/pisland
+@dirrm lib/crossfire/lib/maps/ender/island
+@dirrm lib/crossfire/lib/maps/ender
+@dirrm lib/crossfire/lib/maps/eeur
+@dirrm lib/crossfire/lib/maps/editor/walls
+@dirrm lib/crossfire/lib/maps/editor/picks
+@dirrm lib/crossfire/lib/maps/editor
+@dirrm lib/crossfire/lib/maps/dtabb/town
+@dirrm lib/crossfire/lib/maps/dtabb/quest
+@dirrm lib/crossfire/lib/maps/dtabb
+@dirrm lib/crossfire/lib/maps/dragonisland
+@dirrm lib/crossfire/lib/maps/city/towers
+@dirrm lib/crossfire/lib/maps/city/taverns
+@dirrm lib/crossfire/lib/maps/city/shops
+@dirrm lib/crossfire/lib/maps/city/oldcity
+@dirrm lib/crossfire/lib/maps/city/misc
+@dirrm lib/crossfire/lib/maps/city/mansion
+@dirrm lib/crossfire/lib/maps/city/magara
+@dirrm lib/crossfire/lib/maps/city/kar
+@dirrm lib/crossfire/lib/maps/city/houses
+@dirrm lib/crossfire/lib/maps/city/cannery
+@dirrm lib/crossfire/lib/maps/city
+@dirrm lib/crossfire/lib/maps/cd
 @dirrm lib/crossfire/lib/maps/brittany/Brest/Castle
 @dirrm lib/crossfire/lib/maps/brittany/Brest
 @dirrm lib/crossfire/lib/maps/brittany
-@dirrm lib/crossfire/lib/maps/navar_city/illusion
-@dirrm lib/crossfire/lib/maps/navar_city/tower
-@dirrm lib/crossfire/lib/maps/navar_city/light
-@dirrm lib/crossfire/lib/maps/navar_city/magara/houses
-@dirrm lib/crossfire/lib/maps/navar_city/magara
-@dirrm lib/crossfire/lib/maps/navar_city
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower1
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/cellar1
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower2
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/castle
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara
-@dirrm lib/crossfire/lib/maps/wolfsburg/tt
-@dirrm lib/crossfire/lib/maps/wolfsburg
-@dirrm lib/crossfire/lib/maps/espen
-@dirrm lib/crossfire/lib/maps/thomas/sisters
-@dirrm lib/crossfire/lib/maps/thomas
-@dirrm lib/crossfire/lib/maps/Lake_Country/Mwizard
-@dirrm lib/crossfire/lib/maps/Lake_Country/marsh
-@dirrm lib/crossfire/lib/maps/Lake_Country/small_buildings
-@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis/houses
-@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis
-@dirrm lib/crossfire/lib/maps/Lake_Country/RETower
-@dirrm lib/crossfire/lib/maps/Lake_Country/ebony
+@dirrm lib/crossfire/lib/maps/asyvan
 @dirrm lib/crossfire/lib/maps/Lake_Country/snake_pit
-@dirrm lib/crossfire/lib/maps/Lake_Country/Sunset_Lake
-@dirrm lib/crossfire/lib/maps/Lake_Country/flight
+@dirrm lib/crossfire/lib/maps/Lake_Country/small_buildings
 @dirrm lib/crossfire/lib/maps/Lake_Country/shops
 @dirrm lib/crossfire/lib/maps/Lake_Country/quest
+@dirrm lib/crossfire/lib/maps/Lake_Country/marsh
+@dirrm lib/crossfire/lib/maps/Lake_Country/flight
+@dirrm lib/crossfire/lib/maps/Lake_Country/ebony
+@dirrm lib/crossfire/lib/maps/Lake_Country/Sunset_Lake
+@dirrm lib/crossfire/lib/maps/Lake_Country/RETower
+@dirrm lib/crossfire/lib/maps/Lake_Country/Mwizard
+@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis/houses
+@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis
 @dirrm lib/crossfire/lib/maps/Lake_Country
-@dirrm lib/crossfire/lib/maps/test
-@dirrm lib/crossfire/lib/maps/good
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/ruin
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/siegfried
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/hole
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/kurte
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/mountain
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/castle
-@dirrm lib/crossfire/lib/maps/pup_land/ancient
-@dirrm lib/crossfire/lib/maps/pup_land/begin
-@dirrm lib/crossfire/lib/maps/pup_land/castle_eureca
-@dirrm lib/crossfire/lib/maps/pup_land/cave_weapon
-@dirrm lib/crossfire/lib/maps/pup_land/jk
-@dirrm lib/crossfire/lib/maps/pup_land/kurte
-@dirrm lib/crossfire/lib/maps/pup_land/lone_town/cave
-@dirrm lib/crossfire/lib/maps/pup_land/lone_town
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/dick
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/reception
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/castle_bauer
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg
-@dirrm lib/crossfire/lib/maps/pup_land/ordeal
-@dirrm lib/crossfire/lib/maps/pup_land/pplant
-@dirrm lib/crossfire/lib/maps/pup_land/raffle
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv1
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv2
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv3
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv4
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv5
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv6
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv7
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/red_town
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow
-@dirrm lib/crossfire/lib/maps/pup_land/ruin_barbarian
-@dirrm lib/crossfire/lib/maps/pup_land/s_f
-@dirrm lib/crossfire/lib/maps/pup_land
-@dirrm lib/crossfire/lib/maps/dragonisland
 @dirrm lib/crossfire/lib/maps
+@dirrm lib/crossfire/lib/help
+@dirrm lib/crossfire/lib/adm
 @dirrm lib/crossfire/lib
 @dirrm lib/crossfire/fonts
-@dirrm lib/crossfire/sounds
 @dirrm lib/crossfire
-@dirrm share/doc/crossfire/spell-docs
-@dirrm share/doc/crossfire/spoiler-html
-@dirrm share/doc/crossfire/playbook-html/fig
-@dirrm share/doc/crossfire/playbook-html
-@dirrm share/doc/crossfire
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 7849df09287d..c06ab46fcefc 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	crossfire
-PORTVERSION=	${MAJ}.${MIN}.${PL}
+PORTVERSION=	0.94.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/crossfire/old/ \
 		ftp://ftp.sunet.se/pub/unix/games/crossfire/old/
 DISTFILES=	${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
 		${CF_ARCH} ${CF_CLSERV}
+EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
+LIB_DEPENDS=	rplay.1:${PORTSDIR}/audio/rplay
+BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
 
-EXTRACT_ONLY=	${CF_SOURCES} ${CF_DOC}
 USE_PERL5=	yes
-USE_IMAKE=	yes
 USE_XPM=	yes
-PREFIX=		${LOCALBASE}
-MAN6=		crossfire.6 crossedit.6
+MAN6=		crossedit.6 crossfire.6
 
 .include <bsd.port.pre.mk>
 
@@ -37,36 +37,43 @@ RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 # You need TeX to do this ! Please read the README's !
 WANT_CF_ARCH=	NO
 
-MAJ=		0
-MIN=		94
-PL=		3
-CF_SOURCES=	crossfire-${MAJ}.${MIN}.${PL}.tar.gz
-CF_MAPS=	crossfire-${MAJ}.${MIN}.${PL}.maps.tar.gz
+CF_SOURCES=	${PORTNAME}-${PORTVERSION}.tar.gz
+CF_MAPS=	${PORTNAME}-${PORTVERSION}.maps.tar.gz
 # crossfire doc ready for use
-CF_DOC=		crossfire-${MAJ}.${MIN}.${PL}.doc.tar.gz
+CF_DOC=		${PORTNAME}-${PORTVERSION}.doc.tar.gz
 # no newer sounds available
-CF_SOUNDS=	crossfire-${MAJ}.92.7.sounds.tar.gz
+CF_SOUNDS=	${PORTNAME}-0.92.7.sounds.tar.gz
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 # only for rebuild of doc
-CF_ARCH=	crossfire-${MAJ}.${MIN}.${PL}.arch.tar.gz
+CF_ARCH=	${PORTNAME}-${PORTVERSION}.arch.tar.gz
 .endif
 #CF_CLSERV=	eutl.tar.gz		# only for client/server
 CFDIR=		${PREFIX}/lib/crossfire	# crossfire base directory
 
+post-patch:
+	@${PERL} -pi -e \
+		's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		 s|%%X11BASE%%|${X11BASE}|g ; \
+		 s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config/crosssite.def
+
+do-configure:
+	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
+
 # If you want to re-make playbook and spoiler you need the ARCH
 # files and a TeX version with a ,great' amount of max_mem
 # (I had to rebuild teTeX, that already is in fact ,BigTeX')
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
 post-configure:
-	(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_ARCH})
+	${TAR} -C ${CFDIR} -xzf ${_DISTDIR}/${CF_ARCH}
 .endif
 
 post-install:
-	@(cd ${CFDIR}/lib; tar -xzf ${DISTDIR}/${CF_MAPS})
-	@(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_SOUNDS})
-	@${MKDIR} ${PREFIX}/share/doc/crossfire
-	@${CP} -r ${WRKDIR}/crossfire-${MAJ}.${MIN}.${PL}-doc/* \
-		${PREFIX}/share/doc/crossfire
+	${INSTALL_MAN} ${WRKSRC}/doc/crossedit.man \
+		 ${MANPREFIX}/man/man6/crossedit.6
+	${INSTALL_MAN} ${WRKSRC}/doc/crossfire.man \
+		${MANPREFIX}/man/man6/crossfire.6
+	@${TAR} -C ${CFDIR}/lib -xzf ${_DISTDIR}/${CF_MAPS}
+	@${TAR} -C ${CFDIR} -xzf ${_DISTDIR}/${CF_SOUNDS}
 	@${TOUCH} ${CFDIR}/lib/bookarch
 	@${CHMOD} 664 ${CFDIR}/lib/bookarch
 	@${TOUCH} ${CFDIR}/lib/forbid
@@ -77,9 +84,11 @@ post-install:
 	@${CHMOD} 0664 ${CFDIR}/lib/highscore
 	@${CHOWN} root.games ${PREFIX}/bin/crossfire
 	@${CHMOD} 2555 ${PREFIX}/bin/crossfire
-	${ECHO} "Note: to start crossfire in clientmode"
-	${ECHO} "	crossfire -xpm"
-	${ECHO} "Note: don't forget to update ${PREFIX}/etc/rplay.conf"
-	${ECHO} "	with new sounds in ${CFDIR}/sounds"
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/crossfire
+	@${TAR} -C ${WRKDIR}/${PORTNAME}-${PORTVERSION}-doc -cf - . | \
+		${TAR} -C ${PREFIX}/share/doc/crossfire --unlink -xf -
+.endif
+	@${SED} -e "s:/usr/local:${LOCALBASE}:g" ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/games/crossfire/files/patch-aa b/games/crossfire/files/patch-aa
index dab90bcd9ff2..e59ed4bb0042 100644
--- a/games/crossfire/files/patch-aa
+++ b/games/crossfire/files/patch-aa
@@ -1,5 +1,5 @@
---- config/crosssite.def.orig	Thu Apr 16 04:07:49 1998
-+++ config/crosssite.def	Fri May  8 14:51:14 1998
+--- config/crosssite.def.orig	Sat Aug  1 19:23:58 1998
++++ config/crosssite.def	Sat Dec  2 05:14:43 2000
 @@ -36,10 +36,8 @@
   * (mwedel@pyramid.com)
   */
@@ -8,7 +8,7 @@
  #define XPM_PIX
 -#define Xpm_LibDir /usr/local/lib/
 -*/
-+#define Xpm_LibDir !!X11BASE!!/lib/
++#define Xpm_LibDir %%X11BASE%%/lib/
  /* If your include files are someplace odd */
  /*#define Xpm_Include	/usr/local/include*/
  
@@ -17,14 +17,14 @@
   * overall. 
   */
 -#define CTop /home/hugin/a/crossfire/crossfire
-+#define CTop !!LOCALBASE!!/lib/crossfire
++#define CTop %%PREFIX%%/lib/crossfire
  /* #define CTop /net/contrib/crossfire */
  /*#define CTop /usr/local/games/crossfire*/
  
  /* Binaries location If this is undefined, it default to the
     standard location for X binaries on your machine. */
 -#define CBinDir Concat(CTop,/bin)
-+#define CBinDir !!LOCALBASE!!/bin
++#define CBinDir %%PREFIX%%/bin
  
  /* Libraries location If this is undefined it defaults to the
    standard location for X lib files/crossfire on your machine */
@@ -33,23 +33,14 @@
     standard location for manual pages on your machine.*/
  /* #define CManPath Concat(CTop,/man) */
 -#define CManSuffix 6
-+#define CManPath !!LOCALBASE!!/man
++#define CManPath %%PREFIX%%/man
 +/* #define CManSuffix 6 */
  
  
  /* Force CC to use the specified options instead of the default
-@@ -85,7 +84,7 @@
-  * any of the default compiler options for your machine.
-  */
- /*define ForceCCOPTIONS -O -g -Wall */
--#undef ForceCCOPTIONS
-+#define ForceCCOPTIONS -pipe -O
- 
- /* Extra_Flags are added onto the compilers default options.  Can be
-  * quite useful if you just want to add another flag or two, and not
-@@ -102,9 +101,8 @@
- /* Add any extra/special libraries that you may need.  Make sure you 
+@@ -103,9 +102,8 @@
   * use the -l form or put in the complete path name.
+  * Linux users may need to add -lcrypt
   */
 -/*
 -#define Extra_Libraries -lcrypt
@@ -59,7 +50,7 @@
  
  /* Force CC to be a specific compilator? Define this to be the
   * actual compiler (see example).  If defined, the default
-@@ -160,11 +158,9 @@
+@@ -161,11 +159,9 @@
   * too distant future, it probably isn't worth fixing here.
   */
  
@@ -68,12 +59,12 @@
 -#define RPlayLibDir /usr/local/lib
 -#define RPlayIncDir /usr/local/include
 -*/
-+#define RPlayLibDir !!LOCALBASE!!/lib
-+#define RPlayIncDir !!LOCALBASE!!/include
++#define RPlayLibDir %%LOCALBASE%%/lib
++#define RPlayIncDir %%LOCALBASE%%/include
  
  /* define this if using OpenWindows as your enviroment. This only
   * needs to be set if the openwindows server you use is
-@@ -202,7 +198,7 @@
+@@ -203,7 +199,7 @@
   * awk on most other systems will be OK.
   */
  
diff --git a/games/crossfire/pkg-message b/games/crossfire/pkg-message
new file mode 100644
index 000000000000..2a71b72dcafd
--- /dev/null
+++ b/games/crossfire/pkg-message
@@ -0,0 +1,4 @@
+Note: to start crossfire in clientmode
+  crossfire -xpm
+Note: don't forget to update /usr/local/etc/rplay.conf
+  with new sounds in /usr/local/lib/crossfire/sounds
diff --git a/games/crossfire/pkg-plist b/games/crossfire/pkg-plist
index 3570f04cf23b..37b59ed09d05 100644
--- a/games/crossfire/pkg-plist
+++ b/games/crossfire/pkg-plist
@@ -2024,138 +2024,138 @@ share/doc/crossfire/spoiler-html/zombie.111.gif
 share/doc/crossfire/spoiler.ps
 share/doc/crossfire/teleporter.doc
 share/doc/crossfire/xbmtobdf.man
-@dirrm lib/crossfire/lib/adm
-@dirrm lib/crossfire/lib/players
-@dirrm lib/crossfire/lib/help
+@dirrm share/doc/crossfire/spoiler-html
+@dirrm share/doc/crossfire/spell-docs
+@dirrm share/doc/crossfire/playbook-html/fig
+@dirrm share/doc/crossfire/playbook-html
+@dirrm share/doc/crossfire
+@dirrm lib/crossfire/sounds
 @dirrm lib/crossfire/lib/unique-items
-@dirrm lib/crossfire/lib/maps/editor/picks
-@dirrm lib/crossfire/lib/maps/editor/walls
-@dirrm lib/crossfire/lib/maps/editor
-@dirrm lib/crossfire/lib/maps/skud
+@dirrm lib/crossfire/lib/players
 @dirrm lib/crossfire/lib/maps/world
-@dirrm lib/crossfire/lib/maps/dtabb/town
-@dirrm lib/crossfire/lib/maps/dtabb/quest
-@dirrm lib/crossfire/lib/maps/dtabb
-@dirrm lib/crossfire/lib/maps/ender/pisland
-@dirrm lib/crossfire/lib/maps/ender/temple
-@dirrm lib/crossfire/lib/maps/ender/island
-@dirrm lib/crossfire/lib/maps/ender
-@dirrm lib/crossfire/lib/maps/kar
-@dirrm lib/crossfire/lib/maps/city/oldcity
-@dirrm lib/crossfire/lib/maps/city/taverns
-@dirrm lib/crossfire/lib/maps/city/houses
-@dirrm lib/crossfire/lib/maps/city/misc
-@dirrm lib/crossfire/lib/maps/city/towers
-@dirrm lib/crossfire/lib/maps/city/cannery
-@dirrm lib/crossfire/lib/maps/city/shops
-@dirrm lib/crossfire/lib/maps/city/kar
-@dirrm lib/crossfire/lib/maps/city/magara
-@dirrm lib/crossfire/lib/maps/city/mansion
-@dirrm lib/crossfire/lib/maps/city
-@dirrm lib/crossfire/lib/maps/cd
-@dirrm lib/crossfire/lib/maps/eeur
-@dirrm lib/crossfire/lib/maps/mcz
-@dirrm lib/crossfire/lib/maps/esben
-@dirrm lib/crossfire/lib/maps/santo_dominion/houses
+@dirrm lib/crossfire/lib/maps/wolfsburg/tt
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower2
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower1
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/cellar1
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara/castle
+@dirrm lib/crossfire/lib/maps/wolfsburg/magara
+@dirrm lib/crossfire/lib/maps/wolfsburg
+@dirrm lib/crossfire/lib/maps/thomas/sisters
+@dirrm lib/crossfire/lib/maps/thomas
+@dirrm lib/crossfire/lib/maps/test
+@dirrm lib/crossfire/lib/maps/terrain
+@dirrm lib/crossfire/lib/maps/skud
+@dirrm lib/crossfire/lib/maps/santo_dominion/shops
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/well
-@dirrm lib/crossfire/lib/maps/santo_dominion/magara/north_lighthouse
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/south_lighthouse
+@dirrm lib/crossfire/lib/maps/santo_dominion/magara/north_lighthouse
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara/hut
 @dirrm lib/crossfire/lib/maps/santo_dominion/magara
 @dirrm lib/crossfire/lib/maps/santo_dominion/lord_byron
-@dirrm lib/crossfire/lib/maps/santo_dominion/shops
+@dirrm lib/crossfire/lib/maps/santo_dominion/houses
 @dirrm lib/crossfire/lib/maps/santo_dominion
-@dirrm lib/crossfire/lib/maps/hendel
-@dirrm lib/crossfire/lib/maps/terrain
-@dirrm lib/crossfire/lib/maps/peterm/CTower
+@dirrm lib/crossfire/lib/maps/pup_land/s_f
+@dirrm lib/crossfire/lib/maps/pup_land/ruin_barbarian
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/red_town
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv7
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv6
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv5
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv4
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv3
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv2
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv1
+@dirrm lib/crossfire/lib/maps/pup_land/rainbow
+@dirrm lib/crossfire/lib/maps/pup_land/raffle
+@dirrm lib/crossfire/lib/maps/pup_land/pplant
+@dirrm lib/crossfire/lib/maps/pup_land/ordeal
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/reception
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/dick
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/castle_bauer
+@dirrm lib/crossfire/lib/maps/pup_land/nurnberg
+@dirrm lib/crossfire/lib/maps/pup_land/lone_town/cave
+@dirrm lib/crossfire/lib/maps/pup_land/lone_town
+@dirrm lib/crossfire/lib/maps/pup_land/kurte
+@dirrm lib/crossfire/lib/maps/pup_land/jk
+@dirrm lib/crossfire/lib/maps/pup_land/cave_weapon
+@dirrm lib/crossfire/lib/maps/pup_land/castle_eureca
+@dirrm lib/crossfire/lib/maps/pup_land/begin
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/siegfried
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/hole
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/village
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/ruin
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/mountain
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/kurte
+@dirrm lib/crossfire/lib/maps/pup_land/ancient/castle
+@dirrm lib/crossfire/lib/maps/pup_land/ancient
+@dirrm lib/crossfire/lib/maps/pup_land
 @dirrm lib/crossfire/lib/maps/peterm/temple
-@dirrm lib/crossfire/lib/maps/peterm/Demonology
-@dirrm lib/crossfire/lib/maps/peterm/DragonQuest
 @dirrm lib/crossfire/lib/maps/peterm/FireTemple
+@dirrm lib/crossfire/lib/maps/peterm/DragonQuest
+@dirrm lib/crossfire/lib/maps/peterm/Demonology
+@dirrm lib/crossfire/lib/maps/peterm/CTower
 @dirrm lib/crossfire/lib/maps/peterm
-@dirrm lib/crossfire/lib/maps/langley/pirates
+@dirrm lib/crossfire/lib/maps/navar_city/tower
+@dirrm lib/crossfire/lib/maps/navar_city/magara/houses
+@dirrm lib/crossfire/lib/maps/navar_city/magara
+@dirrm lib/crossfire/lib/maps/navar_city/light
+@dirrm lib/crossfire/lib/maps/navar_city/illusion
+@dirrm lib/crossfire/lib/maps/navar_city
+@dirrm lib/crossfire/lib/maps/mcz
 @dirrm lib/crossfire/lib/maps/langley/town
+@dirrm lib/crossfire/lib/maps/langley/pirates
 @dirrm lib/crossfire/lib/maps/langley/goblin
 @dirrm lib/crossfire/lib/maps/langley
-@dirrm lib/crossfire/lib/maps/asyvan
+@dirrm lib/crossfire/lib/maps/kar
+@dirrm lib/crossfire/lib/maps/hendel
+@dirrm lib/crossfire/lib/maps/good
 @dirrm lib/crossfire/lib/maps/generic/volcano
 @dirrm lib/crossfire/lib/maps/generic
+@dirrm lib/crossfire/lib/maps/espen
+@dirrm lib/crossfire/lib/maps/esben
+@dirrm lib/crossfire/lib/maps/ender/temple
+@dirrm lib/crossfire/lib/maps/ender/pisland
+@dirrm lib/crossfire/lib/maps/ender/island
+@dirrm lib/crossfire/lib/maps/ender
+@dirrm lib/crossfire/lib/maps/eeur
+@dirrm lib/crossfire/lib/maps/editor/walls
+@dirrm lib/crossfire/lib/maps/editor/picks
+@dirrm lib/crossfire/lib/maps/editor
+@dirrm lib/crossfire/lib/maps/dtabb/town
+@dirrm lib/crossfire/lib/maps/dtabb/quest
+@dirrm lib/crossfire/lib/maps/dtabb
+@dirrm lib/crossfire/lib/maps/dragonisland
+@dirrm lib/crossfire/lib/maps/city/towers
+@dirrm lib/crossfire/lib/maps/city/taverns
+@dirrm lib/crossfire/lib/maps/city/shops
+@dirrm lib/crossfire/lib/maps/city/oldcity
+@dirrm lib/crossfire/lib/maps/city/misc
+@dirrm lib/crossfire/lib/maps/city/mansion
+@dirrm lib/crossfire/lib/maps/city/magara
+@dirrm lib/crossfire/lib/maps/city/kar
+@dirrm lib/crossfire/lib/maps/city/houses
+@dirrm lib/crossfire/lib/maps/city/cannery
+@dirrm lib/crossfire/lib/maps/city
+@dirrm lib/crossfire/lib/maps/cd
 @dirrm lib/crossfire/lib/maps/brittany/Brest/Castle
 @dirrm lib/crossfire/lib/maps/brittany/Brest
 @dirrm lib/crossfire/lib/maps/brittany
-@dirrm lib/crossfire/lib/maps/navar_city/illusion
-@dirrm lib/crossfire/lib/maps/navar_city/tower
-@dirrm lib/crossfire/lib/maps/navar_city/light
-@dirrm lib/crossfire/lib/maps/navar_city/magara/houses
-@dirrm lib/crossfire/lib/maps/navar_city/magara
-@dirrm lib/crossfire/lib/maps/navar_city
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower1
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/cellar1
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/tower2
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara/castle
-@dirrm lib/crossfire/lib/maps/wolfsburg/magara
-@dirrm lib/crossfire/lib/maps/wolfsburg/tt
-@dirrm lib/crossfire/lib/maps/wolfsburg
-@dirrm lib/crossfire/lib/maps/espen
-@dirrm lib/crossfire/lib/maps/thomas/sisters
-@dirrm lib/crossfire/lib/maps/thomas
-@dirrm lib/crossfire/lib/maps/Lake_Country/Mwizard
-@dirrm lib/crossfire/lib/maps/Lake_Country/marsh
-@dirrm lib/crossfire/lib/maps/Lake_Country/small_buildings
-@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis/houses
-@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis
-@dirrm lib/crossfire/lib/maps/Lake_Country/RETower
-@dirrm lib/crossfire/lib/maps/Lake_Country/ebony
+@dirrm lib/crossfire/lib/maps/asyvan
 @dirrm lib/crossfire/lib/maps/Lake_Country/snake_pit
-@dirrm lib/crossfire/lib/maps/Lake_Country/Sunset_Lake
-@dirrm lib/crossfire/lib/maps/Lake_Country/flight
+@dirrm lib/crossfire/lib/maps/Lake_Country/small_buildings
 @dirrm lib/crossfire/lib/maps/Lake_Country/shops
 @dirrm lib/crossfire/lib/maps/Lake_Country/quest
+@dirrm lib/crossfire/lib/maps/Lake_Country/marsh
+@dirrm lib/crossfire/lib/maps/Lake_Country/flight
+@dirrm lib/crossfire/lib/maps/Lake_Country/ebony
+@dirrm lib/crossfire/lib/maps/Lake_Country/Sunset_Lake
+@dirrm lib/crossfire/lib/maps/Lake_Country/RETower
+@dirrm lib/crossfire/lib/maps/Lake_Country/Mwizard
+@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis/houses
+@dirrm lib/crossfire/lib/maps/Lake_Country/Butakis
 @dirrm lib/crossfire/lib/maps/Lake_Country
-@dirrm lib/crossfire/lib/maps/test
-@dirrm lib/crossfire/lib/maps/good
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/ruin
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/siegfried
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village/hole
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/village
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/kurte
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/mountain
-@dirrm lib/crossfire/lib/maps/pup_land/ancient/castle
-@dirrm lib/crossfire/lib/maps/pup_land/ancient
-@dirrm lib/crossfire/lib/maps/pup_land/begin
-@dirrm lib/crossfire/lib/maps/pup_land/castle_eureca
-@dirrm lib/crossfire/lib/maps/pup_land/cave_weapon
-@dirrm lib/crossfire/lib/maps/pup_land/jk
-@dirrm lib/crossfire/lib/maps/pup_land/kurte
-@dirrm lib/crossfire/lib/maps/pup_land/lone_town/cave
-@dirrm lib/crossfire/lib/maps/pup_land/lone_town
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/dick
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/reception
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg/castle_bauer
-@dirrm lib/crossfire/lib/maps/pup_land/nurnberg
-@dirrm lib/crossfire/lib/maps/pup_land/ordeal
-@dirrm lib/crossfire/lib/maps/pup_land/pplant
-@dirrm lib/crossfire/lib/maps/pup_land/raffle
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv1
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv2
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv3
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv4
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv5
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv6
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/Lv7
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow/red_town
-@dirrm lib/crossfire/lib/maps/pup_land/rainbow
-@dirrm lib/crossfire/lib/maps/pup_land/ruin_barbarian
-@dirrm lib/crossfire/lib/maps/pup_land/s_f
-@dirrm lib/crossfire/lib/maps/pup_land
-@dirrm lib/crossfire/lib/maps/dragonisland
 @dirrm lib/crossfire/lib/maps
+@dirrm lib/crossfire/lib/help
+@dirrm lib/crossfire/lib/adm
 @dirrm lib/crossfire/lib
 @dirrm lib/crossfire/fonts
-@dirrm lib/crossfire/sounds
 @dirrm lib/crossfire
-@dirrm share/doc/crossfire/spell-docs
-@dirrm share/doc/crossfire/spoiler-html
-@dirrm share/doc/crossfire/playbook-html/fig
-@dirrm share/doc/crossfire/playbook-html
-@dirrm share/doc/crossfire