dmalloc.h MUST be included after unistd.h on DragonFly, since it

messes with compat function names.
Fix errno.
Use bzip2 to extract a bzipped file, it works somehow better than
gzip.

4 files changed, 40 insertions, 3 deletions

diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index 63a2102ba18..e475cb8829a 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/29 17:41:27 joerg Exp $
 #
 
 DISTNAME=	crossfire-1.0.0
@@ -33,7 +33,7 @@ REPLACE_PERL+=	doc/spoiler-html/makeps.pl
 
 post-install:
 	cd ${PREFIX}/share/crossfire && \
-	    ${GZCAT} ${DISTDIR}/${CF_MAPS} | ${GTAR} xmf -
+	    ${BZCAT} ${DISTDIR}/${CF_MAPS} | ${GTAR} xmf -
 	@${CHOWN} ${ROOT_USER}:games ${PREFIX}/bin/crossfire
 	@${CHMOD} 2755 ${PREFIX}/bin/crossfire
 	@${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/share/crossfire
diff --git a/games/crossfire-srv/distinfo b/games/crossfire-srv/distinfo
index fb6c41cedae..7254b8178d1 100644
--- a/games/crossfire-srv/distinfo
+++ b/games/crossfire-srv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 23:11:56 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/12/29 17:41:27 joerg Exp $
 
 SHA1 (crossfire-1.0.0.tar.bz2) = 2ec13e71591d245726e19aa10de7619a2e113b0d
 RMD160 (crossfire-1.0.0.tar.bz2) = 6935c8896d133de8f1f28f8ebfbbe4c2bbfa510b
@@ -9,3 +9,5 @@ Size (crossfire-1.0.0-maps.tar.bz2) = 3066588 bytes
 SHA1 (patch-aa) = 48b06c6db01ed17a0cc1c7263ae74d5559cff8ca
 SHA1 (patch-ab) = c702d3432ee2481175c3b6f863cd1f1357a6f7ed
 SHA1 (patch-ac) = f5e2103dfd33e993a8ed8dc8fd78198d51801dc1
+SHA1 (patch-ad) = 9d902f3fae2acc5cf87d367c8b2669a746006b4b
+SHA1 (patch-ae) = 2d55dfbf1c6c9c979ac9fd6aa0d83c3af7603fa7
diff --git a/games/crossfire-srv/patches/patch-ad b/games/crossfire-srv/patches/patch-ad
new file mode 100644
index 00000000000..8d09bb3fcab
--- /dev/null
+++ b/games/crossfire-srv/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2005/12/29 17:41:27 joerg Exp $
+
+--- include/includes.h.orig	2005-12-29 16:56:01.000000000 +0000
++++ include/includes.h
+@@ -72,14 +72,14 @@
+ #include <fcntl.h>
+ #endif
+ 
+-#ifdef HAVE_LIBDMALLOC
+-#include <dmalloc.h>
+-#endif
+-
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
++#ifdef HAVE_LIBDMALLOC
++#include <dmalloc.h>
++#endif
++
+ #ifdef HAVE_SYS_TIME_H 
+ #include <sys/time.h>
+ #endif
diff --git a/games/crossfire-srv/patches/patch-ae b/games/crossfire-srv/patches/patch-ae
new file mode 100644
index 00000000000..499dec5b9bf
--- /dev/null
+++ b/games/crossfire-srv/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2005/12/29 17:41:27 joerg Exp $
+
+--- socket/lowlevel.c.orig	2005-12-29 17:09:51.000000000 +0000
++++ socket/lowlevel.c
+@@ -97,7 +97,6 @@ short GetShort_String(unsigned char *dat
+ int SockList_ReadPacket(int fd, SockList *sl, int len)
+ {
+     int stat,toread;
+-    extern int errno;
+ 
+     /* Sanity check - shouldn't happen */
+     if (sl->len < 0) {