- Repocopy and move games/crossfire to games/crossfire-server

  and games/crossfire-client
- Update games/crossfire-client to 1.1.0 and games/crossfire-server
  to 1.0.0

PR:		34450
Submitted by:	Jasper Jongmans <j.jongmans@aprogas.net>
Repocopied by:	joe
Approved by:	portmgr

9 files changed, 0 insertions, 224 deletions

diff --git a/games/crossfire-server/files/patch-aa b/games/crossfire-server/files/patch-aa
deleted file mode 100644
index e59ed4bb0042..000000000000
--- a/games/crossfire-server/files/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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)
-  */
- 
--/*
- #define XPM_PIX
--#define Xpm_LibDir /usr/local/lib/
--*/
-+#define Xpm_LibDir %%X11BASE%%/lib/
- /* If your include files are someplace odd */
- /*#define Xpm_Include	/usr/local/include*/
- 
-@@ -51,13 +49,13 @@
-  * This is a top root directory of all game staff as in UNIX-style
-  * overall. 
-  */
--#define CTop /home/hugin/a/crossfire/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 %%PREFIX%%/bin
- 
- /* Libraries location If this is undefined it defaults to the
-   standard location for X lib files/crossfire on your machine */
-@@ -76,7 +74,8 @@
- /* Crossfire manual location If this is undefined it defaults to the
-    standard location for manual pages on your machine.*/
- /* #define CManPath Concat(CTop,/man) */
--#define CManSuffix 6
-+#define CManPath %%PREFIX%%/man
-+/* #define CManSuffix 6 */
- 
- 
- /* Force CC to use the specified options instead of the default
-@@ -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
--*/
-+
-+#define Extra_Libraries -lcrypt -lcompat
- 
- /* Force CC to be a specific compilator? Define this to be the
-  * actual compiler (see example).  If defined, the default
-@@ -161,11 +159,9 @@
-  * too distant future, it probably isn't worth fixing here.
-  */
- 
--/*
- #define Rplay_Sound
--#define RPlayLibDir /usr/local/lib
--#define RPlayIncDir /usr/local/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
-@@ -203,7 +199,7 @@
-  * awk on most other systems will be OK.
-  */
- 
--AWK = gawk
-+AWK = awk
- 
- /* Use debugged malloc?  I don't know if this exists on all machines/OS's,
-  * but it does exist on SunOs 4.1.1.
diff --git a/games/crossfire-server/files/patch-ab b/games/crossfire-server/files/patch-ab
deleted file mode 100644
index 8435ab72153b..000000000000
--- a/games/crossfire-server/files/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
---- include/config.h.orig	Sat Aug  1 12:23:57 1998
-+++ include/config.h	Mon Aug 31 14:19:29 1998
-@@ -163,7 +163,7 @@
-  * in the crosssite.def file if I want this.  By default, you probably
-  * dont want this defined.
-  */
--#ifndef DEBUG
-+#ifdef DEBUG
- #define DEBUG
- #endif
- 
-@@ -649,7 +649,7 @@
-  */
- 
- #ifndef DM_MAIL
--/* #define DM_MAIL "mark@pyramid.com" */
-+#define DM_MAIL "root"
- #endif
- 
- /*
-@@ -956,9 +956,9 @@
-  */
- 
- /* #define SAVE_HOMEDIR */
--/* #define LOCK_PLAYER */
-+#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"
diff --git a/games/crossfire-server/files/patch-ag b/games/crossfire-server/files/patch-ag
deleted file mode 100644
index 6b36400a06c9..000000000000
--- a/games/crossfire-server/files/patch-ag
+++ /dev/null
@@ -1,47 +0,0 @@
---- server/main.c.orig	Sun Jan  5 19:59:27 1997
-+++ server/main.c	Wed Sep 17 15:34:40 1997
-@@ -139,6 +139,36 @@
-   }
- }
- 
-+#if defined(__FreeBSD__)
-+static unsigned char itoa64[] =
-+    "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
-+
-+static void
-+to64(char *s, long v, int n)
-+{
-+	while (--n >= 0) {
-+		*s++ = itoa64[v&0x3f];
-+		v >>= 6;
-+	}
-+}
-+
-+char *
-+crypt_string(char *str, char *salt)
-+{
-+	char	s[10];
-+	if (salt==NULL) {
-+		struct timeval	tv;
-+		gettimeofday(&tv,0);
-+		to64(&s[0], random(), 3);
-+		to64(&s[3], tv.tv_usec, 3);
-+		to64(&s[6], tv.tv_sec, 2);
-+		s[8] = '\0';
-+		salt = s;
-+	}
-+	return (crypt(str, salt));
-+}
-+#else
-+
- char *crypt_string(char *str, char *salt) {
-   static char *c=
-     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
-@@ -151,6 +181,7 @@
-     s[1]= salt[1];
-   return crypt(str,s);
- }
-+#endif
- 
- int check_password(char *typed,char *crypted) {
-   return !strcmp(crypt_string(typed,crypted),crypted);
diff --git a/games/crossfire-server/files/patch-ai b/games/crossfire-server/files/patch-ai
deleted file mode 100644
index 1f168195dd6a..000000000000
--- a/games/crossfire-server/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/playbook/makeps.orig	Fri Nov  1 15:34:44 1996
-+++ doc/playbook/makeps	Fri Nov  1 15:35:33 1996
-@@ -7,7 +7,7 @@
- 
- BEGIN {
-     # Set colour to 1 if you want colour postscript.
--    colour = 0;
-+    colour = 1;
- 
-     if (colour) {
-       xpm2ps = "xpmtoppm | pnmdepth 255 | pnmtops"
diff --git a/games/crossfire-server/files/patch-ak b/games/crossfire-server/files/patch-ak
deleted file mode 100644
index 56af0748e854..000000000000
--- a/games/crossfire-server/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/skills.c.orig	Thu Apr 16 04:07:47 1998
-+++ server/skills.c	Thu May  7 21:03:01 1998
-@@ -1057,7 +1057,7 @@
- 
- int write_scroll (object *pl, object *scroll) {
-     int success=0,confused=0,chosen_spell=-1,stat1=get_skill_stat1(pl);
--    object *newScroll;
-+    object *newScroll = NULL;
- 
-     /* this is a sanity check */
-     if (scroll->type!=SCROLL) {
diff --git a/games/crossfire-server/files/patch-al b/games/crossfire-server/files/patch-al
deleted file mode 100644
index 19089e690e69..000000000000
--- a/games/crossfire-server/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/init.c.orig	Sun Jan  5 19:59:27 1997
-+++ server/init.c	Wed Sep 17 12:27:59 1997
-@@ -450,7 +450,7 @@
-   printf("New improve weapon:\t<false>\n");
- #endif
-   printf("Max_time:\t%d\n",MAX_TIME);
--  execl("/bin/uname", "uname", "-a", NULL);
-+  execl("/usr/bin/uname", "uname", "-a", NULL);
-   LOG(llevError, "Opps, should't have gotten here.");
-   perror("execl");
-   exit(-1);
diff --git a/games/crossfire-server/files/patch-am b/games/crossfire-server/files/patch-am
deleted file mode 100644
index 53d47c620e01..000000000000
--- a/games/crossfire-server/files/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/structs.h.orig	Sun Jan  5 19:59:46 1997
-+++ include/structs.h	Wed Sep 17 14:29:59 1997
-@@ -562,7 +562,11 @@
-   char write_buf[MAX_BUF];
-   char **info;
-   unsigned char infolines,infochars; /* How big the info-array is */
-+#if defined(__FreeBSD__)
-+  char password[40];
-+#else
-   char password[16]; /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */
-+#endif
- #ifdef SAVE_INTERVAL
-   time_t last_save_time;
- #endif /* SAVE_INTERVAL */
diff --git a/games/crossfire-server/files/patch-an b/games/crossfire-server/files/patch-an
deleted file mode 100644
index 6773fcba278a..000000000000
--- a/games/crossfire-server/files/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
---- server/daemon.c.orig	Sun Jan  5 19:59:27 1997
-+++ server/daemon.c	Wed Sep 17 14:39:21 1997
-@@ -50,6 +50,9 @@
-     printf("Couldn't create logfile.\n");
-     exit(0);
-   } 
-+#if defined(__FreeBSD__)
-+  setlinebuf (logfile);
-+#endif
-   fputs("\n========================\n",logfile);    
-   fputs("Begin New Server Session\n",logfile);    
-   fputs("========================\n\n",logfile);    
diff --git a/games/crossfire-server/files/patch-ao b/games/crossfire-server/files/patch-ao
deleted file mode 100644
index 9b1c2becdac5..000000000000
--- a/games/crossfire-server/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/crossfire.cf.orig	Sat Sep 18 18:31:54 1999
-+++ config/crossfire.cf	Sat Sep 18 18:32:23 1999
-@@ -174,7 +174,7 @@
- 				/* use /bin/cc you will be able to compile */
- 				/* crossfire itself. */
- 
--#ifdef AlphaArchitecture
-+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture)
- CC = cc -std1 -Olimit 1000    /* Alpha */
- #endif
-