Update to version 1.6.0

PR:		ports/71056
Submitted by:	Ports Fury

games/crossfire-server/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	crossfire
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.ifi.uio.no/pub/crossfire/ \
@@ -22,6 +21,7 @@ COMMENT=	Server for multiplayer graphical arcade and adventure game
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+USE_BZIP2=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
@@ -29,17 +29,24 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
-LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN6=		crossfire.6 crossedit.6
+MAN6=		crossedit.6 crossfire.6 crossfire-config.6 crossloop.6 \
+		crossloop.web.6
+
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include \
+		-I${OPENSSLINC}/openssl
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldes|-lcrypto|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-ldes|-lcrypto|g ; \
+		 s|des_crypt|DES_crypt|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|des_crypt|DES_crypt|g' ${WRKSRC}/server/main.c
 
 post-install:
-	@${TAR} -C ${WRKDIR} -cf - maps | ${TAR} -C ${DATADIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+	@${MKDIR} ${DATADIR}/maps
+	cd ${WRKDIR}/maps-bigworld && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/maps
 	@${CHOWN} ${BINOWN}:games ${PREFIX}/bin/crossfire
 	@${CHMOD} 2755 ${PREFIX}/bin/crossfire
 	@${CHGRP} -R games ${PREFIX}/var/crossfire

games/crossfire-server/distinfo

@@ -1,4 +1,4 @@
-MD5 (crossfire-1.5.0.tar.gz) = b22556499a1aa99a19e6c5c7b33d501f
-SIZE (crossfire-1.5.0.tar.gz) = 3776505
-MD5 (crossfire-1.5.0.maps-big.tar.gz) = b54d2b1e3aa446ddda3e87185f2cb6ef
-SIZE (crossfire-1.5.0.maps-big.tar.gz) = 19867913
+MD5 (crossfire-1.6.0.tar.bz2) = 4a488134c9437b0b341d7c4bab4dd5ae
+SIZE (crossfire-1.6.0.tar.bz2) = 3892308
+MD5 (crossfire-1.6.0.maps-big.tar.bz2) = e5aa783d65ba8c224a75f075d3820ab1
+SIZE (crossfire-1.6.0.maps-big.tar.bz2) = 14933477

games/crossfire-server/files/patch-common::exp.c

@@ -0,0 +1,11 @@
+--- common/exp.c.orig	Sat Mar 27 06:59:25 2004
++++ common/exp.c	Thu Aug 26 05:56:20 2004
+@@ -190,7 +190,7 @@
+ 		exit(1);
+ 	    }
+ 
+-	    tmpexp = atoll(cp);
++	    tmpexp = strtoll(cp, (char **)NULL, 10);
+ 	    /* Do some sanity checking - if value is bogus, just exit because
+ 	     * the table otherwise is probably in an inconsistent state
+ 	     */

games/crossfire-server/files/patch-common::loader.l

@@ -0,0 +1,13 @@
+--- common/loader.l.orig	Sat Mar 27 06:59:28 2004
++++ common/loader.l	Thu Aug 26 05:54:55 2004
+@@ -632,8 +632,8 @@
+ ^maxsp{S}	op->stats.maxsp = IVAL;
+ ^grace{S}	op->stats.grace = IVAL;
+ ^maxgrace{S}	op->stats.maxgrace = IVAL;
+-^exp{S}		op->stats.exp = atoll(yval());
+-^perm_exp{S}	op->perm_exp = atoll(yval());
++^exp{S}		op->stats.exp = strtoll(yval(), (char **)NULL, 10);
++^perm_exp{S}	op->perm_exp = strtoll(yval(), (char **)NULL, 10);
+ ^food{S}	op->stats.food = IVAL;
+ ^dam{S}		op->stats.dam = IVAL;
+ ^wc{S}		op->stats.wc = IVAL;