- Update to 1.15.0

PR:		148554
Submitted by:	Ports Fury

games/crossfire-server/Makefile

@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	crossfire
-PORTVERSION=	1.11.0
-PORTREVISION=	2
+PORTVERSION=	1.50.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-server/${PORTVERSION} \
-		ftp://ftp.real-time.com/pub/games/crossfire/
-
+		SF/${PORTNAME}/${PORTNAME}-maps/${PORTVERSION}:maps
 PKGNAMESUFFIX=	-server
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${DISTNAME}.maps${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
+		${DISTNAME}.maps${EXTRACT_SUFX}:maps
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Server for multiplayer graphical arcade and adventure game
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+		png.6:${PORTSDIR}/graphics/png
 
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
-USE_GNOME=	gnometarget
+USE_SQLITE=	3
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
@@ -31,7 +30,7 @@ USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-check=no
 
-MAN6=		crossedit.6 crossfire.6 crossfire-config.6 crossloop.6 \
+MAN6=		crossfire-config.6 crossfire-server.6 crossloop.6 \
 		crossloop.web.6
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
@@ -51,8 +50,8 @@ post-patch:
 post-install:
 	@${MKDIR} ${DATADIR}/maps
 	cd ${WRKDIR}/maps && ${COPYTREE_SHARE} . ${DATADIR}/maps
-	@${CHOWN} ${BINOWN}:games ${PREFIX}/bin/crossfire
-	@${CHMOD} 2755 ${PREFIX}/bin/crossfire
+	@${CHOWN} ${BINOWN}:games ${PREFIX}/bin/crossfire-server
+	@${CHMOD} 2755 ${PREFIX}/bin/crossfire-server
 	@${CHGRP} -R games ${PREFIX}/var/crossfire
 
 .include <bsd.port.mk>

games/crossfire-server/distinfo

@@ -1,6 +1,6 @@
-MD5 (crossfire-1.11.0.tar.gz) = 4c2e8f60ca57fb140808d07e62b072a9
-SHA256 (crossfire-1.11.0.tar.gz) = ad259903d37ddecbfc69507f01e5bfcf5c3f847fd22e711b1cc7df2d47ad222c
-SIZE (crossfire-1.11.0.tar.gz) = 6302656
-MD5 (crossfire-1.11.0.maps.tar.gz) = f0c3f1459e42163a500ce9be3cad39d2
-SHA256 (crossfire-1.11.0.maps.tar.gz) = 848dc10e292f0e4812f9ec4cd802375da8e18df7648d090942e484bbde94b08b
-SIZE (crossfire-1.11.0.maps.tar.gz) = 24675542
+MD5 (crossfire-1.50.0.tar.gz) = d52f092031f11bd8cf5c6387057d5f8f
+SHA256 (crossfire-1.50.0.tar.gz) = eef737c4ce98017325dc2864faac9e89eae5507b08d9eb7095ea1f62f2735982
+SIZE (crossfire-1.50.0.tar.gz) = 6215543
+MD5 (crossfire-1.50.0.maps.tar.gz) = aa66671704b6b0163fa234689ecfbd95
+SHA256 (crossfire-1.50.0.maps.tar.gz) = f859ffaffcda1053cc40fc3eda8741ba1fc0f08d0eea303b513354967ab44c3d
+SIZE (crossfire-1.50.0.maps.tar.gz) = 27392351

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

@@ -1,11 +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);
- 	    }
+--- common/exp.c.orig	2010-04-26 15:23:21.000000000 +0900
++++ common/exp.c	2010-05-25 04:22:52.000000000 +0900
+@@ -224,7 +224,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
- 	     */
+-            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

@@ -1,13 +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;
+--- common/loader.l.orig	2010-04-26 15:23:21.000000000 +0900
++++ common/loader.l	2010-05-25 04:25:03.000000000 +0900
+@@ -830,8 +830,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;