ports/171112: [patch] games/simutrans: version 111.3.1

[Tijl Coosemans]

>Number:         171112
>Category:       ports
>Synopsis:       [patch] games/simutrans: version 111.3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 27 10:50:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
>Description:
Update games/simutrans to version 111.3.1.
>How-To-Repeat:
>Fix:
files/patch-Makefile and files/patch-utils-csv.cc can be deleted.

--- simutrans.update begins here ---
diff -urN /usr/ports/games/simutrans/Makefile ./Makefile
--- /usr/ports/games/simutrans/Makefile	2012-05-09 04:20:13.000000000 +0200
+++ ./Makefile	2012-08-27 12:19:17.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	simutrans
-PORTVERSION=	111.2.2
+PORTVERSION=	111.3.1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${SIMUTRANS_VERSION} \
 		SF/${PORTNAME}/pak64/${SIMUTRANS_PAK64}:pak64
@@ -20,9 +20,10 @@
 LICENSE_FILE=	${WRKSRC}/simutrans/license.txt
 
 SIMUTRANS_VERSION=	${PORTVERSION:S,.,-,g}
-SIMUTRANS_REVISION=	5583
-SIMUTRANS_PAK64=	111-2
+SIMUTRANS_REVISION=	5843
+SIMUTRANS_PAK64=	111-3
 
+OPTIONS_DEFINE= DOCS
 MAKE_ARGS=	BACKEND=mixer_sdl \
 		COLOUR_DEPTH=16 \
 		OSTYPE=freebsd \
@@ -39,20 +40,23 @@
 		share/applications/simutrans.desktop
 PORTDATA=	*
 
+.include <bsd.port.options.mk>
+
 post-patch:
+	@${REINPLACE_CMD} 's/-O[^ ]*//' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's/simutrans/.simutrans/' ${WRKSRC}/simsys.cc
 
 do-install:
 	cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} \
 		"config font music pak skin text" ${DATADIR}
-.ifndef NOPORTDOCS
+.if ${PORT_OPTIONS:MDOCS}
 	${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
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FILESDIR}/simutrans.desktop \
+	${INSTALL_SCRIPT} ${FILESDIR}/simutrans.desktop \
 		${PREFIX}/share/applications/simutrans.desktop
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/simutrans/distinfo ./distinfo
--- /usr/ports/games/simutrans/distinfo	2012-05-09 04:20:13.000000000 +0200
+++ ./distinfo	2012-08-04 15:43:56.000000000 +0200
@@ -1,4 +1,4 @@
-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
+SHA256 (simutrans-src-111-3-1.zip) = 732339b347e896a419502ae4177cc5876533646d8df7d627ffd85460d1dc66e6
+SIZE (simutrans-src-111-3-1.zip) = 3274627
+SHA256 (simupak64-111-3.zip) = d2dcd7de3e9c0a1a3d387b8d62afc5a6be957ed1b47edd070c0a4a611d034055
+SIZE (simupak64-111-3.zip) = 3533240
diff -urN /usr/ports/games/simutrans/files/patch-Makefile ./files/patch-Makefile
--- /usr/ports/games/simutrans/files/patch-Makefile	2011-04-03 21:58:32.000000000 +0200
+++ ./files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -85,8 +85,6 @@
-       CFLAGS += -minline-all-stringops
-     endif
-   endif
--else
--  CFLAGS += -O
- endif
- 
- ifdef DEBUG
diff -urN /usr/ports/games/simutrans/files/patch-utils-csv.cc ./files/patch-utils-csv.cc
--- /usr/ports/games/simutrans/files/patch-utils-csv.cc	2012-05-09 04:20:13.000000000 +0200
+++ ./files/patch-utils-csv.cc	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- 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"
--- simutrans.update ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: