- Update to version 111.2.2

- Use PORTDATA instead of a long plist
- Remove plist files

PR:	ports/167529
Submitted by:	Tijl Coosemans <tijl@coosemans.org>
Approved by:	eadler (mentor)

games/simutrans/Makefile

@@ -6,25 +6,22 @@
 #
 
 PORTNAME=	simutrans
-PORTVERSION=	111.0
-PORTREVISION=	1
+PORTVERSION=	111.2.2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${SIMUTRANS_VERSION} \
-		SF/${PORTNAME}/pak64/${SIMUTRANS_VERSION}:pak64
+		SF/${PORTNAME}/pak64/${SIMUTRANS_PAK64}:pak64
 DISTFILES=	simutrans-src-${SIMUTRANS_VERSION}.zip \
-		simulinux-${SIMUTRANS_VERSION}.zip \
-		simupak64-${SIMUTRANS_VERSION}.zip:pak64
+		simupak64-${SIMUTRANS_PAK64}.zip:pak64
 
 MAINTAINER=	tijl@coosemans.org
 COMMENT=	Transportation simulation game
 
 LICENSE=	ART10
-LICENSE_FILE=	${WRKSRC}/simutrans/licence.txt
+LICENSE_FILE=	${WRKSRC}/simutrans/license.txt
 
 SIMUTRANS_VERSION=	${PORTVERSION:S,.,-,g}
-SIMUTRANS_REVISION=	4911
-
-OPTIONS=	FOOD	"Add-on with farms, foods, markets,..." off
+SIMUTRANS_REVISION=	5583
+SIMUTRANS_PAK64=	111-2
 
 MAKE_ARGS=	BACKEND=mixer_sdl \
 		COLOUR_DEPTH=16 \
@@ -32,33 +29,25 @@ MAKE_ARGS=	BACKEND=mixer_sdl \
 		FLAGS="-DUSE_C -DREVISION=${SIMUTRANS_REVISION}" \
 		VERBOSE=1
 NO_WRKSUBDIR=	yes
-USE_DOS2UNIX=	Makefile
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer
 USE_ZIP=	yes
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_FOOD)
-DISTFILES+=	simupak64-addon-food-${SIMUTRANS_VERSION}.zip:pak64
-.endif
-
-.include "${.CURDIR}/Makefile.plist"
-
-PLIST_DIRS=	${SIMUTRANS_DIRS:S,^,%%DATADIR%%/,} %%DATADIR%%
-PLIST_FILES=	${SIMUTRANS_DATA:S,^,%%DATADIR%%/,}
+PLIST_DIRSTRY=	share/applications
+PLIST_FILES=	bin/simutrans \
+		bin/simutrans-bin \
+		share/applications/simutrans.desktop
+PORTDATA=	*
 
 post-patch:
 	@${REINPLACE_CMD} 's/simutrans/.simutrans/' ${WRKSRC}/simsys.cc
 
 do-install:
-	${MKDIR} ${DATADIR}
-.for _D in ${SIMUTRANS_DIRS:O}
-	${MKDIR} ${DATADIR}/${_D}
-.endfor
-.for _D in ${SIMUTRANS_DATA}
-	${INSTALL_DATA} ${WRKSRC}/simutrans/${_D} ${DATADIR}/${_D}
-.endfor
+	cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} \
+		"config font music pak skin text" ${DATADIR}
+.ifndef NOPORTDOCS
+	${INSTALL_DATA} ${WRKSRC}/simutrans/readme.txt ${DATADIR}
+.endif
 	${INSTALL_PROGRAM} ${WRKSRC}/build/default/sim \
 		${PREFIX}/bin/simutrans-bin
 	${INSTALL_SCRIPT} ${FILESDIR}/simutrans ${PREFIX}/bin/simutrans

games/simutrans/distinfo

@@ -1,8 +1,4 @@
-SHA256 (simutrans-src-111-0.zip) = 75ff501c9c244d0759cd677efcf75fbd7816c01c6ee7f8b4b127b6b8ec934f9b
-SIZE (simutrans-src-111-0.zip) = 3136834
-SHA256 (simulinux-111-0.zip) = bbc5b26f13bd18e4a57c27e21af5b40b1f3bb35d583e72807ae959fe43e25b65
-SIZE (simulinux-111-0.zip) = 2676779
-SHA256 (simupak64-111-0.zip) = 70e0b64cf3265178bde11a32274ee568816cbd78eccadef0e947d4ddbf1edf67
-SIZE (simupak64-111-0.zip) = 3477795
-SHA256 (simupak64-addon-food-111-0.zip) = 16117b1a813a9547a48ab9b182622479871ed763b4e1209fa9c9915d6e48d537
-SIZE (simupak64-addon-food-111-0.zip) = 113799
+SHA256 (simutrans-src-111-2-2.zip) = e97279ab7149cef430bb53c6206786ff039915dfa98a1b597e61e3f192840732
+SIZE (simutrans-src-111-2-2.zip) = 3182907
+SHA256 (simupak64-111-2.zip) = 5cda187d578e5263a1a77f8cd09268e2694157f6ca4c3ad4921b3fc8710fea38
+SIZE (simupak64-111-2.zip) = 3688601

games/simutrans/files/patch-utils-csv.cc

@@ -0,0 +1,10 @@
+--- utils/csv.cc.orig	2012-03-27 18:26:57.000000000 +0200
++++ utils/csv.cc	2012-03-27 18:29:14.000000000 +0200
+@@ -7,6 +7,7 @@
+ 
+ #include <cstring>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <assert.h>
+ 
+ #include "csv.h"

games/simutrans/pkg-plist

@@ -1,9 +0,0 @@
-bin/simutrans
-bin/simutrans-bin
-share/applications/simutrans.desktop
-@exec mkdir -p %D/%%DATADIR%%/text/be
-@exec mkdir -p %D/%%DATADIR%%/text/ca
-@exec mkdir -p %D/%%DATADIR%%/text/et
-@exec mkdir -p %D/%%DATADIR%%/text/id
-@exec mkdir -p %D/%%DATADIR%%/text/lt
-@dirrmtry share/applications