8 files changed, 33 insertions, 163 deletions

diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 53fc4df43ec2..f6d46777bbf3 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	crossfire
-# Version required:     0.92.8
+# Version required:     0.93.0
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.8 1997/01/03 08:49:05 obrien Exp $
+# $Id: Makefile,v 1.9 1997/01/03 09:36:32 obrien Exp $
 #
 
-DISTNAME=	crossfire-0.92.8
+DISTNAME=	crossfire-0.93.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ra.pyramid.com/pub/crossfire/ \
 		ftp://ftp.ifi.uio.no/pub/crossfire/ \
@@ -34,17 +34,16 @@ PREFIX=		${LOCALBASE}		# don't use /usr/X11R6
 # You need TeX to do this ! Please read the README's !
 WANT_CF_ARCH=	NO
 
-CF_SOURCES=	crossfire-0.92.8.tar.gz
-CF_MAPS=	crossfire-0.92.8.maps.tar.gz
+CF_SOURCES=	crossfire-0.93.0.tar.gz
+CF_MAPS=	crossfire-0.93.0.maps.tar.gz
+CF_DOC=		crossfire-0.93.0.doc.tar.gz	# crossfire doc ready for use
 CF_SOUNDS=	crossfire-0.92.7.sounds.tar.gz	# no newer sounds available
-CF_DOC=		crossfire-0.92.8.doc.tar.gz	# crossfire doc ready for use
 .if ${WANT_CF_ARCH} == YES || ${WANT_CF_ARCH} == yes
-CF_ARCH=	crossfire-0.92.8.arch.tar.gz	# only for rebuild of doc
+CF_ARCH=	crossfire-0.93.0.arch.tar.gz	# only for rebuild of doc
 .endif
 #CF_CLSERV=	eutl.tar.gz			# only for client/server
 CFDIR=		${PREFIX}/crossfire	# crossfire base directory
 
-
 # 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')
@@ -54,16 +53,18 @@ post-configure:
 .endif
 
 post-install:
-	(cd ${CFDIR}/lib; tar -xzf ${DISTDIR}/${CF_MAPS})
-	(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_SOUNDS})
-	${MKDIR} ${CFDIR}/doc
-	${CP} -r ${WRKDIR}/crossfire-0.92.8-doc/* ${CFDIR}/doc
-	touch ${PREFIX}/crossfire/lib/bookarch
-	chmod 664 ${PREFIX}/crossfire/lib/bookarch
-	/usr/sbin/chown -R games.games ${CFDIR}
-	chmod 0664 ${PREFIX}/crossfire/lib/highscore
-	/usr/sbin/chown games.games ${PREFIX}/bin/crossfire
-	chmod 6555 ${PREFIX}/bin/crossfire
+	@(cd ${CFDIR}/lib; tar -xzf ${DISTDIR}/${CF_MAPS})
+	@(cd ${CFDIR}; tar -xzf ${DISTDIR}/${CF_SOUNDS})
+	@${MKDIR} ${CFDIR}/doc
+	@${CP} -r ${WRKDIR}/crossfire-0.93.0-doc/* ${CFDIR}/doc
+	@touch ${PREFIX}/crossfire/lib/bookarch
+	@chmod 664 ${PREFIX}/crossfire/lib/bookarch
+	@touch ${PREFIX}/crossfire/lib/players/.keep_me  
+	@touch ${PREFIX}/crossfire/lib/unique-items/.keep_me  
+	@/usr/sbin/chown -R games.games ${CFDIR}
+	@chmod 0664 ${PREFIX}/crossfire/lib/highscore
+	@/usr/sbin/chown games.games ${PREFIX}/bin/crossfire
+	@chmod 6555 ${PREFIX}/bin/crossfire
 	@echo ""
 	@echo "======================================================"
 	@echo "===== ATTENTION BEFORE PLAYING ======================="
diff --git a/games/crossfire-server/distinfo b/games/crossfire-server/distinfo
index eee2efd18d3f..fc79984f48cb 100644
--- a/games/crossfire-server/distinfo
+++ b/games/crossfire-server/distinfo
@@ -1,5 +1,4 @@
-MD5 (crossfire-0.92.8.tar.gz) = 6faa0ab361f95e95a6bd9a22d343c353
-MD5 (crossfire-0.92.8.doc.tar.gz) = 8521d88e7f820ff1b970f3ac2f1447ef
-MD5 (crossfire-0.92.8.maps.tar.gz) = 9d665615b938b6606e1e613752681aba
+MD5 (crossfire-0.93.0.tar.gz) = 9605de4a9650398399dcd738e7272ef9
+MD5 (crossfire-0.93.0.doc.tar.gz) = dd47515cb75d11187b1b36bf7724f6e9
+MD5 (crossfire-0.93.0.maps.tar.gz) = de8541ce762a811fae2048ac5ea59bd5
 MD5 (crossfire-0.92.7.sounds.tar.gz) = 9f5496b93000956014c4541f4b66acba
-MD5 (crossfire-0.92.8.arch.tar.gz) = ada63b54eecb0c5fe9a39ac5f9386027
diff --git a/games/crossfire-server/files/patch-aa b/games/crossfire-server/files/patch-aa
index 2b1a7baec1e8..d693a141c44f 100644
--- a/games/crossfire-server/files/patch-aa
+++ b/games/crossfire-server/files/patch-aa
@@ -1,5 +1,5 @@
---- config/crosssite.def.orig	Mon Sep 30 07:54:14 1996
-+++ config/crosssite.def	Sun Oct 27 15:43:06 1996
+--- config/crosssite.def.orig	Sat Jan 25 12:16:24 1997
++++ config/crosssite.def	Sat Jan 25 12:20:45 1997
 @@ -38,7 +38,7 @@
  
  /*
@@ -30,8 +30,8 @@
     standard location for manual pages on your machine.*/
  /* #define CManPath Concat(CTop,/man) */
 -#define CManSuffix 6
-+/* #define CManSuffix 6 */
 +#define CManPath /usr/local/man
++/* #define CManSuffix 6 */
  
  
  /* Force CC to use the specified options instead of the default
@@ -40,7 +40,7 @@
   */
  /*define ForceCCOPTIONS -O -g -Wall */
 -#undef ForceCCOPTIONS
-+#define ForceCCOPTIONS -pipe -O
++#define ForceCCOPTIONS -pipe -O2
  
  /* 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
diff --git a/games/crossfire-server/files/patch-ab b/games/crossfire-server/files/patch-ab
index 46e85db9e2a5..d850d0935ec3 100644
--- a/games/crossfire-server/files/patch-ab
+++ b/games/crossfire-server/files/patch-ab
@@ -1,24 +1,6 @@
---- include/config.h.orig	Tue Oct 29 11:58:02 1996
-+++ include/config.h	Fri Nov  1 13:13:05 1996
-@@ -174,6 +174,8 @@
- 
- #define FULL_RING_DESCRIPTION
- 
-+#define SHOP_LISTINGS
-+
- /* if EXPLORE_MODE is defined, it allows players to enter explore mode,
-  * where they can not die.  Unlike other games (nethack for instance) explore
-  * modes, the only thing Crossfire explore mode does is prevent death.
-@@ -305,7 +307,7 @@
-  */
- 
- #ifndef DM_MAIL
--/* #define DM_MAIL "master@rahul.net" */
-+#define DM_MAIL "master@rahul.net"
- #endif
- 
- /*
-@@ -499,10 +501,10 @@
+--- include/config.h.orig	Mon Jan  6 01:59:44 1997
++++ include/config.h	Sat Jan 25 12:38:37 1997
+@@ -499,7 +499,7 @@
  /* CF 0.91.6 - SAVE_PLAYER now standard part of game */
  /*#define SAVE_PLAYER*/
  
@@ -26,8 +8,4 @@
 +#define SAVE_HOMEDIR
  /* #define LOCK_PLAYER */
  #define USE_CHECKSUM
--/* #define ENABLE_CHECKSUM */ /* Will be default in distant future versions */
-+#define ENABLE_CHECKSUM	/* Will be default in distant future versions */
- 
- #ifndef PLAYERDIR
- #define PLAYERDIR "players"
+ /* #define ENABLE_CHECKSUM */ /* Will be default in distant future versions */
diff --git a/games/crossfire-server/files/patch-ak b/games/crossfire-server/files/patch-ak
deleted file mode 100644
index 6b90de63dca3..000000000000
--- a/games/crossfire-server/files/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-Date: Sun, 3 Nov 96 08:03:51 EST
-From: "Brian Thomas" <thomas@astro.psu.edu>
-Message-Id: <9611031303.AA04680@zaphod.astro.psu.edu>
-Subject: CF: skill status upon login
-
-	It is possible right now for a player to log 
-	back into a game and have 2 skills readied
-	(applied!). This can confuse the code, and
-	cause problems for a while. This patch 
-	fixes that.
-
-					-b.t.
-
-*** server/skill_util.c.orig	Tue Oct 29 05:57:46 1996
---- server/skill_util.c	Sun Nov  3 07:57:20 1996
-***************
-*** 877,886 ****
---- 880,891 ----
-  	      return 0;
-  	   } 
-    }
-    /* Ok, create linked list and link the associated skills to exp objects */
-     for(i=0;i<sk_index;i++) {
-+         /* for startup, lets unapply all skills */
-+         if(QUERY_FLAG(sk_ob[i],FLAG_APPLIED)) CLEAR_FLAG(sk_ob[i],FLAG_APPLIED);
-  #ifdef LINKED_SKILL_LIST
-    	objectlink *obl;
-  	obl = (objectlink *) malloc(sizeof(objectlink));
-  	obl->ob=sk_ob[i];
-  	obl->id=sk_ob[i]->stats.sp; 
-
diff --git a/games/crossfire-server/files/patch-al b/games/crossfire-server/files/patch-al
deleted file mode 100644
index 37217ed94e1b..000000000000
--- a/games/crossfire-server/files/patch-al
+++ /dev/null
@@ -1,36 +0,0 @@
-Date: Wed, 6 Nov 96 04:19:33 EST
-From: "Brian Thomas" <thomas@astro.psu.edu>
-Message-Id: <9611060919.AA25706@zaphod.astro.psu.edu>
-To: crossfire@ifi.uio.no
-Subject: CF: Berserker weapon patch
-
-        Ok, I found the problem.. the artifact code
-        assigns a level value to artifacts with kind
-        "Berserkergang". The specialweapon/apply code,
-	when it finds a weapon with a "level" 
-	immediately compares the title field to the
-	weilder's name. If they dont match, it can't be used.
-
-	I created a patch to remove the level designation
-	from the artifact code since other named weaopns
-	(cf "glamdri") dont have a level assigned.
-
-					-b.t.
-
-*** lib/artifacts.orig	Wed Nov  6 04:15:22 1996
---- lib/artifacts	Wed Nov  6 04:15:32 1996
-***************
-*** 548,558 ****
-  Con 7
-  Int -10
-  Wis -10
-  Cha -15
-  protected 2
-- level 20
-  material 256
-  weight 50
-  exp 3
-  hp 2
-  msg
---- 548,557 ----
-
diff --git a/games/crossfire-server/files/patch-am b/games/crossfire-server/files/patch-am
deleted file mode 100644
index 4fa4ec81ef76..000000000000
--- a/games/crossfire-server/files/patch-am
+++ /dev/null
@@ -1,42 +0,0 @@
-To: Mark Wedel <mwedel@pyramid.com>
-cc: crossfire@ifi.uio.no
-Subject: CF: Bug in inventory-code
-Date: Wed, 06 Nov 1996 13:29:14 +0100
-From: Klaus Elsbernd <elsbernd@dfki.uni-kl.de>
-
-Hello.
-In version 0.92.8 is a bug in the inventory-unlock-code, which prevents
-unlocking.
-The following patch will fix the problem:
-
-*** server/c_object.c.dist      Tue Oct 29 11:57:45 1996
---- server/c_object.c   Wed Nov  6 13:24:18 1996
-***************
-*** 1063,1069 ****
-  
-      op->contr->freeze_inv=1;
-      op->contr->freeze_look=1;
-!     if (!params) lock_inv(op,find_first_inventory_item(op));
-      else {
-        if (op->type==PLAYER) show_what=op->contr->show_what;
-        for (tmp=op->inv; tmp; tmp=tmp->below) {
---- 1063,1069 ----
-  
-      op->contr->freeze_inv=1;
-      op->contr->freeze_look=1;
-!     if (!params) unlock_inv(op,find_first_inventory_item(op));
-      else {
-        if (op->type==PLAYER) show_what=op->contr->show_what;
-        for (tmp=op->inv; tmp; tmp=tmp->below) {
-
-MfG
-Klaus
-
--- 
-._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._.
-| Klaus Elsbernd, DFKI/Universit"at Kaiserslautern  | elsbernd@dfki.uni-kl.de |
-| System Administrator                              | BOFH                    |
-| 67657 Kaiserslautern; Germany                     | Tel: (+49) 0631/205-3486|
-|_._._._._._._._._._._._._._._._._._._._._._._._._._|_._._._._._._._._._._._._|
-
-
diff --git a/games/crossfire-server/pkg-plist b/games/crossfire-server/pkg-plist
index ced48ab5e88a..f66e45250571 100644
--- a/games/crossfire-server/pkg-plist
+++ b/games/crossfire-server/pkg-plist
@@ -10,6 +10,8 @@ bin/mktable
 bin/tcpsockets.pl
 man/man6/crossfire.6.gz
 man/man6/crossedit.6.gz
+crossfire/lib/players/.keep_me
+crossfire/lib/unique-items/.keep_me
 crossfire/doc/Crossedit.doc
 crossfire/doc/Imakefile
 crossfire/doc/PlayerStats
@@ -32,7 +34,6 @@ crossfire/doc/playbook-html/.bmaps
 crossfire/doc/playbook-html/2x2.ppm
 crossfire/doc/playbook-html/Imakefile
 crossfire/doc/playbook-html/Makefile
-crossfire/doc/playbook-html/Makefile.bak
 crossfire/doc/playbook-html/Pdragonmail.111.gif
 crossfire/doc/playbook-html/altar.111.gif
 crossfire/doc/playbook-html/altar.html
@@ -366,7 +367,6 @@ crossfire/doc/spoiler-html/DShield.111.gif
 crossfire/doc/spoiler-html/GreatDemon.111.gif
 crossfire/doc/spoiler-html/Imakefile
 crossfire/doc/spoiler-html/Makefile
-crossfire/doc/spoiler-html/Makefile.bak
 crossfire/doc/spoiler-html/Pdragonmail.111.gif
 crossfire/doc/spoiler-html/acid-pool.111.gif
 crossfire/doc/spoiler-html/acidsphere.111.gif
@@ -1045,6 +1045,7 @@ crossfire/lib/maps/city/shops/generalshop
 crossfire/lib/maps/city/shops/magicshop
 crossfire/lib/maps/city/shops/potionshop
 crossfire/lib/maps/city/shops/weaponshop
+crossfire/lib/maps/city/taverns/apartments
 crossfire/lib/maps/city/taverns/goths
 crossfire/lib/maps/city/taverns/goths0
 crossfire/lib/maps/city/taverns/goths2