Mon Apr 7 19:44:19 2008 UTC ()
Update to openttd-0.6.0.

This release brings, among other things, newhouses/newindustries (with newGRF),
signals and diagonal tracks under bridges,trams, autoslope, oneway roads,
half tile slopes, drive through road stops and group management of vehicles.


(tnn)
diff -r1.2 -r1.3 pkgsrc/games/openttd/MESSAGE
diff -r1.2 -r1.3 pkgsrc/games/openttd/options.mk
diff -r1.25 -r1.26 pkgsrc/games/openttd/Makefile
diff -r1.8 -r1.9 pkgsrc/games/openttd/PLIST
diff -r1.11 -r1.12 pkgsrc/games/openttd/distinfo
diff -r1.5 -r1.6 pkgsrc/games/openttd/patches/patch-aa
diff -r0 -r1.4 pkgsrc/games/openttd/patches/patch-ab
cvs diff -r1.2 -r1.3 pkgsrc/games/openttd/MESSAGE (expand / switch to unified diff)

--- pkgsrc/games/openttd/MESSAGE 2007/04/22 16:46:24 1.2
+++ pkgsrc/games/openttd/MESSAGE 2008/04/07 19:44:19 1.3
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.2 2007/04/22 16:46:24 tnn Exp $ 2$NetBSD: MESSAGE,v 1.3 2008/04/07 19:44:19 tnn Exp $
3 3
4To run openttd you need data files provided by the original Transport 4To run openttd you need data files provided by the original Transport
5Tycoon Deluxe. 5Tycoon Deluxe.
6 6
7The following files should be copied to ${PREFIX}/share/games/openttd/data 7The following files should be copied to ${PREFIX}/share/openttd/data
8in order to play: 8in order to play:
9 9
10 sample.cat 10 sample.cat
11 trg1r.grf 11 trg1r.grf
12 trgcr.grf 12 trgcr.grf
13 trghr.grf 13 trghr.grf
14 trgir.grf 14 trgir.grf
15 trgtr.grf 15 trgtr.grf
16 16
17All *.gm files should be copied to ${PREFIX}/share/games/openttd/gm 17All *.gm files should be copied to ${PREFIX}/share/openttd/gm
18in order to play original MIDI music. 18in order to play original MIDI music.
19 19
20Note: On NetBSD playing MIDI music is not supported now. Probably in a 20Note: On NetBSD playing MIDI music is not supported now. Probably in a
21future version. 21future version.
22 22
23=========================================================================== 23===========================================================================
cvs diff -r1.2 -r1.3 pkgsrc/games/openttd/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/games/openttd/Attic/options.mk 2008/03/04 12:02:11 1.2
+++ pkgsrc/games/openttd/Attic/options.mk 2008/04/07 19:44:19 1.3
@@ -1,32 +1,42 @@ @@ -1,32 +1,42 @@
1# $NetBSD: options.mk,v 1.2 2008/03/04 12:02:11 tnn Exp $ 1# $NetBSD: options.mk,v 1.3 2008/04/07 19:44:19 tnn Exp $
2 2
3.include "../../mk/bsd.prefs.mk" 3.include "../../mk/bsd.prefs.mk"
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.openttd 5PKG_OPTIONS_VAR= PKG_OPTIONS.openttd
6PKG_SUPPORTED_OPTIONS= ttd-data 6PKG_SUPPORTED_OPTIONS= ttd-data
7PKG_SUGGESTED_OPTIONS= # empty 7PKG_SUGGESTED_OPTIONS= # empty
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11.if !empty(PKG_OPTIONS:Mttd-data) 11.if !empty(PKG_OPTIONS:Mttd-data)
12PLIST_SUBST+= TTD_DATA="" 12PLIST_SUBST+= TTD_DATA=""
13LICENSE= ttd-pseudolicense 13LICENSE= ttd-pseudolicense
14RESTRICTED= No redistribution allowed 14RESTRICTED= No redistribution allowed
15NO_BIN_ON_CDROM= ${RESTRICTED} 15NO_BIN_ON_CDROM= ${RESTRICTED}
16NO_BIN_ON_FTP= ${RESTRICTED} 16NO_BIN_ON_FTP= ${RESTRICTED}
17NO_SRC_ON_CDROM= ${RESTRICTED} 17NO_SRC_ON_CDROM= ${RESTRICTED}
18NO_SRC_ON_FTP= ${RESTRICTED} 18NO_SRC_ON_FTP= ${RESTRICTED}
19 19
20DATAFILES= sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf 20DATAFILES= sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf
21GMFILES= 00 01 02 03 04 05 06 07 08 09 10 21GMFILES= 00 01 02 03 04 05 06 07 08 09 10
22GMFILES+= 11 12 13 14 15 16 17 18 19 20 21 22GMFILES+= 11 12 13 14 15 16 17 18 19 20 21
23GMFILES:= ${GMFILES:C/^/gm_tt/g:C/$/.gm/g} 23GMFILES:= ${GMFILES:C/^/gm_tt/g:C/$/.gm/g}
24DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ 24DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
25 ${DATAFILES:C/^/ttd\//g} ${GMFILES:C/^/ttd\//g} 25 ${DATAFILES:C/^/ttd\//g} ${GMFILES:C/^/ttd\//g}
26 26
27post-extract: 27DATA_DIR= ${DESTDIR}${PREFIX}/share/openttd
 28
 29post-extract: post-extract-ttd-data
 30post-extract-ttd-data: .PHONY
28 ${RUN} for f in ${DATAFILES} ${GMFILES}; do \ 31 ${RUN} for f in ${DATAFILES} ${GMFILES}; do \
29 cp ${DISTDIR}/ttd/$$f ${WRKDIR}; done 32 cp ${DISTDIR}/ttd/$$f ${WRKDIR}; done
 33
 34post-install: post-install-ttd-data
 35post-install-ttd-data: .PHONY
 36 ${RUN} for f in ${DATAFILES}; do \
 37 ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/data; done
 38 ${RUN} for f in ${GMFILES}; do \
 39 ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/gm; done
30.else 40.else
31PLIST_SUBST+= TTD_DATA="@comment " 41PLIST_SUBST+= TTD_DATA="@comment "
32.endif 42.endif
cvs diff -r1.25 -r1.26 pkgsrc/games/openttd/Makefile (expand / switch to unified diff)

--- pkgsrc/games/openttd/Makefile 2008/03/04 04:05:30 1.25
+++ pkgsrc/games/openttd/Makefile 2008/04/07 19:44:19 1.26
@@ -1,58 +1,37 @@ @@ -1,58 +1,37 @@
1# $NetBSD: Makefile,v 1.25 2008/03/04 04:05:30 tnn Exp $ 1# $NetBSD: Makefile,v 1.26 2008/04/07 19:44:19 tnn Exp $
2 2
3DISTNAME= openttd-0.5.3-source 3DISTNAME= openttd-0.6.0-source
4PKGNAME= openttd-0.5.3 4PKGNAME= ${DISTNAME:S/-source//}
5CATEGORIES= games x11 5CATEGORIES= games x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openttd/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openttd/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.openttd.com/ 9HOMEPAGE= http://www.openttd.com/
10COMMENT= Open source clone of Transport Tycoon Deluxe 10COMMENT= Open source clone of Transport Tycoon Deluxe
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14USE_LANGUAGES+= c c++ 
15USE_TOOLS+= gmake pkg-config 
16 14
17DATA_DIR= ${DESTDIR}${PREFIX}/share/games/openttd 15HAS_CONFIGURE= yes
 16USE_LANGUAGES+= c c++
 17USE_DIRS+= xdg-1.1
 18USE_TOOLS+= gmake pkg-config
 19
 20CONFIGURE_ARGS+= --prefix-dir=${DESTDIR}${PREFIX}
 21CONFIGURE_ARGS+= --binary-dir=bin
 22CONFIGURE_ARGS+= --data-dir=share/openttd
18 23
19MAKE_ENV+= PREFIX=${PREFIX:Q} 24# disable custom assert for Mac OS X (XXX: still needed?)
20MAKE_ENV+= INSTALL=1 
21MAKE_ENV+= BINARY_DIR=bin 
22MAKE_ENV+= DATA_DIR=share/games/openttd 
23MAKE_ENV+= USE_HOMEDIR=1 
24MAKE_ENV+= PERSONAL_DIR=.openttd 
25MAKE_ENV+= WITH_NETWORK=1 
26MAKE_ENV+= X11BASE=${X11BASE:Q} 
27 
28# disable custom assert for Mac OS X 
29CFLAGS+= -DNDEBUG=1 25CFLAGS+= -DNDEBUG=1
30 26
31WRKSRC= ${WRKDIR}/${DISTNAME:S:-source::} 27WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
 28BUILD_TARGET= bundle
32 29
33.include "options.mk" 30.include "options.mk"
34 31
35INSTALLATION_DIRS= bin share/games/openttd/data share/games/openttd/docs \ 
36 share/games/openttd/lang share/games/openttd/gm 
37 
38do-install: 
39 ${INSTALL_PROGRAM} ${WRKSRC}/openttd ${DESTDIR}${PREFIX}/bin 
40 ${INSTALL_DATA} -m 644 ${WRKSRC}/lang/*.lng ${DATA_DIR}/lang 
41 ${INSTALL_DATA} -m 644 ${WRKSRC}/data/* ${DATA_DIR}/data 
42 ${INSTALL_DATA} -m 644 ${WRKSRC}/readme.txt ${DATA_DIR}/docs 
43 ${INSTALL_DATA} -m 644 ${WRKSRC}/changelog.txt ${DATA_DIR}/docs 
44 ${INSTALL_DATA} -m 644 ${WRKSRC}/docs/Manual.txt ${DATA_DIR}/docs 
45 ${INSTALL_DATA} -m 644 ${WRKSRC}/docs/multiplayer.txt ${DATA_DIR}/docs 
46.if !empty(PKG_OPTIONS:Mttd-data) 
47 ${RUN} for f in ${DATAFILES}; do \ 
48 ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/data; done 
49 ${RUN} for f in ${GMFILES}; do \ 
50 ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/gm; done 
51.endif 
52 
53.include "../../fonts/fontconfig/buildlink3.mk" 32.include "../../fonts/fontconfig/buildlink3.mk"
54.include "../../graphics/freetype2/buildlink3.mk" 33.include "../../graphics/freetype2/buildlink3.mk"
55.include "../../graphics/png/buildlink3.mk" 34.include "../../graphics/png/buildlink3.mk"
56.include "../../devel/SDL/buildlink3.mk" 35.include "../../devel/SDL/buildlink3.mk"
57.include "../../mk/pthread.buildlink3.mk" 36.include "../../mk/pthread.buildlink3.mk"
58.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/games/openttd/PLIST (expand / switch to unified diff)

--- pkgsrc/games/openttd/PLIST 2008/03/04 04:05:30 1.8
+++ pkgsrc/games/openttd/PLIST 2008/04/07 19:44:19 1.9
@@ -1,85 +1,85 @@ @@ -1,85 +1,85 @@
1@comment $NetBSD: PLIST,v 1.8 2008/03/04 04:05:30 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.9 2008/04/07 19:44:19 tnn Exp $
2bin/openttd 2bin/openttd
3share/games/openttd/data/2ccmap.grf 3share/openttd/data/generictrams_v0.4.grf
4share/games/openttd/data/airports.grf 4share/openttd/data/openttdd.grf
5share/games/openttd/data/autorail.grf 5share/openttd/data/openttdw.grf
6share/games/openttd/data/canalsw.grf 6share/openttd/data/opntitle.dat
7share/games/openttd/data/dosdummy.grf 7${TTD_DATA}share/openttd/data/sample.cat
8share/games/openttd/data/elrailsw.grf 8${TTD_DATA}share/openttd/data/trg1r.grf
9share/games/openttd/data/nsignalsw.grf 9${TTD_DATA}share/openttd/data/trgcr.grf
10share/games/openttd/data/openttd.grf 10${TTD_DATA}share/openttd/data/trghr.grf
11share/games/openttd/data/opntitle.dat 11${TTD_DATA}share/openttd/data/trgir.grf
12share/games/openttd/data/trkfoundw.grf 12${TTD_DATA}share/openttd/data/trgtr.grf
13share/games/openttd/docs/Manual.txt 13share/openttd/docs/32bpp.txt
14share/games/openttd/docs/changelog.txt 14share/openttd/docs/changelog.txt
15share/games/openttd/docs/multiplayer.txt 15share/openttd/docs/known-bugs.txt
16share/games/openttd/docs/readme.txt 16share/openttd/docs/multiplayer.txt
17share/games/openttd/lang/american.lng 17${TTD_DATA}share/openttd/gm/gm_tt00.gm
18share/games/openttd/lang/brazilian_portuguese.lng 18${TTD_DATA}share/openttd/gm/gm_tt01.gm
19share/games/openttd/lang/bulgarian.lng 19${TTD_DATA}share/openttd/gm/gm_tt02.gm
20share/games/openttd/lang/catalan.lng 20${TTD_DATA}share/openttd/gm/gm_tt03.gm
21share/games/openttd/lang/croatian.lng 21${TTD_DATA}share/openttd/gm/gm_tt04.gm
22share/games/openttd/lang/czech.lng 22${TTD_DATA}share/openttd/gm/gm_tt05.gm
23share/games/openttd/lang/danish.lng 23${TTD_DATA}share/openttd/gm/gm_tt06.gm
24share/games/openttd/lang/dutch.lng 24${TTD_DATA}share/openttd/gm/gm_tt07.gm
25share/games/openttd/lang/english.lng 25${TTD_DATA}share/openttd/gm/gm_tt08.gm
26share/games/openttd/lang/esperanto.lng 26${TTD_DATA}share/openttd/gm/gm_tt09.gm
27share/games/openttd/lang/estonian.lng 27${TTD_DATA}share/openttd/gm/gm_tt10.gm
28share/games/openttd/lang/finnish.lng 28${TTD_DATA}share/openttd/gm/gm_tt11.gm
29share/games/openttd/lang/french.lng 29${TTD_DATA}share/openttd/gm/gm_tt12.gm
30share/games/openttd/lang/galician.lng 30${TTD_DATA}share/openttd/gm/gm_tt13.gm
31share/games/openttd/lang/german.lng 31${TTD_DATA}share/openttd/gm/gm_tt14.gm
32share/games/openttd/lang/hungarian.lng 32${TTD_DATA}share/openttd/gm/gm_tt15.gm
33share/games/openttd/lang/icelandic.lng 33${TTD_DATA}share/openttd/gm/gm_tt16.gm
34share/games/openttd/lang/italian.lng 34${TTD_DATA}share/openttd/gm/gm_tt17.gm
35share/games/openttd/lang/japanese.lng 35${TTD_DATA}share/openttd/gm/gm_tt18.gm
36share/games/openttd/lang/korean.lng 36${TTD_DATA}share/openttd/gm/gm_tt19.gm
37share/games/openttd/lang/lithuanian.lng 37${TTD_DATA}share/openttd/gm/gm_tt20.gm
38share/games/openttd/lang/norwegian_bokmal.lng 38${TTD_DATA}share/openttd/gm/gm_tt21.gm
39share/games/openttd/lang/norwegian_nynorsk.lng 39share/openttd/lang/afrikaans.lng
40share/games/openttd/lang/origveh.lng 40share/openttd/lang/brazilian_portuguese.lng
41share/games/openttd/lang/polish.lng 41share/openttd/lang/bulgarian.lng
42share/games/openttd/lang/portuguese.lng 42share/openttd/lang/catalan.lng
43share/games/openttd/lang/romanian.lng 43share/openttd/lang/croatian.lng
44share/games/openttd/lang/russian.lng 44share/openttd/lang/czech.lng
45share/games/openttd/lang/simplified_chinese.lng 45share/openttd/lang/danish.lng
46share/games/openttd/lang/slovak.lng 46share/openttd/lang/dutch.lng
47share/games/openttd/lang/slovenian.lng 47share/openttd/lang/english.lng
48share/games/openttd/lang/spanish.lng 48share/openttd/lang/english_US.lng
49share/games/openttd/lang/swedish.lng 49share/openttd/lang/esperanto.lng
50share/games/openttd/lang/traditional_chinese.lng 50share/openttd/lang/estonian.lng
51share/games/openttd/lang/turkish.lng 51share/openttd/lang/finnish.lng
52share/games/openttd/lang/ukrainian.lng 52share/openttd/lang/french.lng
53${TTD_DATA}share/games/openttd/data/sample.cat 53share/openttd/lang/galician.lng
54${TTD_DATA}share/games/openttd/data/trg1r.grf 54share/openttd/lang/german.lng
55${TTD_DATA}share/games/openttd/data/trgcr.grf 55share/openttd/lang/hungarian.lng
56${TTD_DATA}share/games/openttd/data/trghr.grf 56share/openttd/lang/icelandic.lng
57${TTD_DATA}share/games/openttd/data/trgir.grf 57share/openttd/lang/italian.lng
58${TTD_DATA}share/games/openttd/data/trgtr.grf 58share/openttd/lang/japanese.lng
59${TTD_DATA}share/games/openttd/gm/gm_tt00.gm 59share/openttd/lang/korean.lng
60${TTD_DATA}share/games/openttd/gm/gm_tt01.gm 60share/openttd/lang/lithuanian.lng
61${TTD_DATA}share/games/openttd/gm/gm_tt02.gm 61share/openttd/lang/norwegian_bokmal.lng
62${TTD_DATA}share/games/openttd/gm/gm_tt03.gm 62share/openttd/lang/norwegian_nynorsk.lng
63${TTD_DATA}share/games/openttd/gm/gm_tt04.gm 63share/openttd/lang/origveh.lng
64${TTD_DATA}share/games/openttd/gm/gm_tt05.gm 64share/openttd/lang/piglatin.lng
65${TTD_DATA}share/games/openttd/gm/gm_tt06.gm 65share/openttd/lang/polish.lng
66${TTD_DATA}share/games/openttd/gm/gm_tt07.gm 66share/openttd/lang/portuguese.lng
67${TTD_DATA}share/games/openttd/gm/gm_tt08.gm 67share/openttd/lang/romanian.lng
68${TTD_DATA}share/games/openttd/gm/gm_tt09.gm 68share/openttd/lang/russian.lng
69${TTD_DATA}share/games/openttd/gm/gm_tt10.gm 69share/openttd/lang/simplified_chinese.lng
70${TTD_DATA}share/games/openttd/gm/gm_tt11.gm 70share/openttd/lang/slovak.lng
71${TTD_DATA}share/games/openttd/gm/gm_tt12.gm 71share/openttd/lang/slovenian.lng
72${TTD_DATA}share/games/openttd/gm/gm_tt13.gm 72share/openttd/lang/spanish.lng
73${TTD_DATA}share/games/openttd/gm/gm_tt14.gm 73share/openttd/lang/swedish.lng
74${TTD_DATA}share/games/openttd/gm/gm_tt15.gm 74share/openttd/lang/traditional_chinese.lng
75${TTD_DATA}share/games/openttd/gm/gm_tt16.gm 75share/openttd/lang/turkish.lng
76${TTD_DATA}share/games/openttd/gm/gm_tt17.gm 76share/openttd/lang/ukrainian.lng
77${TTD_DATA}share/games/openttd/gm/gm_tt18.gm 77share/pixmaps/openttd.32.bmp
78${TTD_DATA}share/games/openttd/gm/gm_tt19.gm 78share/pixmaps/openttd.32.xpm
79${TTD_DATA}share/games/openttd/gm/gm_tt20.gm 79share/pixmaps/openttd.64.png
80${TTD_DATA}share/games/openttd/gm/gm_tt21.gm 80@comment in xdg-dirs: @dirrm share/pixmaps
81@dirrm share/games/openttd/lang 81@dirrm share/openttd/lang
82@dirrm share/games/openttd/docs 82@dirrm share/openttd/docs
83@unexec ${RMDIR} %D/share/games/openttd/data 2>/dev/null || ${TRUE} 83@unexec ${RMDIR} %D/share/openttd/data 2>/dev/null || ${TRUE}
84@unexec ${RMDIR} %D/share/games/openttd/gm 2>/dev/null || ${TRUE} 84@unexec ${RMDIR} %D/share/openttd/gm 2>/dev/null || ${TRUE}
85@unexec ${RMDIR} %D/share/games/openttd 2>/dev/null || ${TRUE} 85@unexec ${RMDIR} %D/share/openttd 2>/dev/null || ${TRUE}
cvs diff -r1.11 -r1.12 pkgsrc/games/openttd/distinfo (expand / switch to unified diff)

--- pkgsrc/games/openttd/distinfo 2008/03/04 04:05:30 1.11
+++ pkgsrc/games/openttd/distinfo 2008/04/07 19:44:19 1.12
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.11 2008/03/04 04:05:30 tnn Exp $ 1$NetBSD: distinfo,v 1.12 2008/04/07 19:44:19 tnn Exp $
2 2
3SHA1 (openttd-0.5.3-source.tar.bz2) = ed23b5de67e597b6a96eccca26495369591f1ebc 3SHA1 (openttd-0.6.0-source.tar.bz2) = 94c55f80e3869decb5b613d78f3b889f7168b6e5
4RMD160 (openttd-0.5.3-source.tar.bz2) = 99a19d648652dd84952dd619c0d4b11c1b8d135d 4RMD160 (openttd-0.6.0-source.tar.bz2) = 9ba4d63d4613779ae57a96fa25d4bb897c558976
5Size (openttd-0.5.3-source.tar.bz2) = 3043644 bytes 5Size (openttd-0.6.0-source.tar.bz2) = 3688002 bytes
6SHA1 (ttd/gm_tt00.gm) = 79d21ad066867e9d737fb7b2fb1fbec9a7e3ff67 6SHA1 (ttd/gm_tt00.gm) = 79d21ad066867e9d737fb7b2fb1fbec9a7e3ff67
7RMD160 (ttd/gm_tt00.gm) = 682df44d2080f78d26bfc7095b1da4b026c24e31 7RMD160 (ttd/gm_tt00.gm) = 682df44d2080f78d26bfc7095b1da4b026c24e31
8Size (ttd/gm_tt00.gm) = 29714 bytes 8Size (ttd/gm_tt00.gm) = 29714 bytes
9SHA1 (ttd/gm_tt01.gm) = d906d160b06f8dbaa4bdfa6f2190c4a0a0093d7e 9SHA1 (ttd/gm_tt01.gm) = d906d160b06f8dbaa4bdfa6f2190c4a0a0093d7e
10RMD160 (ttd/gm_tt01.gm) = 46bbef72f56e8728a6f7fabae39e996a5b816b85 10RMD160 (ttd/gm_tt01.gm) = 46bbef72f56e8728a6f7fabae39e996a5b816b85
11Size (ttd/gm_tt01.gm) = 50427 bytes 11Size (ttd/gm_tt01.gm) = 50427 bytes
12SHA1 (ttd/gm_tt02.gm) = b4f728a8fc9ac49e824b085f78d20b39f852bc98 12SHA1 (ttd/gm_tt02.gm) = b4f728a8fc9ac49e824b085f78d20b39f852bc98
13RMD160 (ttd/gm_tt02.gm) = 353b5b7c3f8b938d638acb1aef9cd7b5c76d8bd2 13RMD160 (ttd/gm_tt02.gm) = 353b5b7c3f8b938d638acb1aef9cd7b5c76d8bd2
14Size (ttd/gm_tt02.gm) = 46406 bytes 14Size (ttd/gm_tt02.gm) = 46406 bytes
15SHA1 (ttd/gm_tt03.gm) = a6bec83d018087a07e0c567b56bc568588650505 15SHA1 (ttd/gm_tt03.gm) = a6bec83d018087a07e0c567b56bc568588650505
16RMD160 (ttd/gm_tt03.gm) = 0d32ceb716859ab9cc8a6150ee2a9edfdc7b839f 16RMD160 (ttd/gm_tt03.gm) = 0d32ceb716859ab9cc8a6150ee2a9edfdc7b839f
17Size (ttd/gm_tt03.gm) = 60986 bytes 17Size (ttd/gm_tt03.gm) = 60986 bytes
18SHA1 (ttd/gm_tt04.gm) = e664d19d90de99ea7b67c0a83ca523f49186662f 18SHA1 (ttd/gm_tt04.gm) = e664d19d90de99ea7b67c0a83ca523f49186662f
@@ -77,14 +77,15 @@ RMD160 (ttd/trg1r.grf) = 9bd16bb0c02bdb0 @@ -77,14 +77,15 @@ RMD160 (ttd/trg1r.grf) = 9bd16bb0c02bdb0
77Size (ttd/trg1r.grf) = 2426943 bytes 77Size (ttd/trg1r.grf) = 2426943 bytes
78SHA1 (ttd/trgcr.grf) = 5d1f97c3b82b41bebbd5811b838e129e7714d7a7 78SHA1 (ttd/trgcr.grf) = 5d1f97c3b82b41bebbd5811b838e129e7714d7a7
79RMD160 (ttd/trgcr.grf) = 2aa6a3cf2aa38adf43aea2577a2a3695bfdba799 79RMD160 (ttd/trgcr.grf) = 2aa6a3cf2aa38adf43aea2577a2a3695bfdba799
80Size (ttd/trgcr.grf) = 267110 bytes 80Size (ttd/trgcr.grf) = 267110 bytes
81SHA1 (ttd/trghr.grf) = f01bf6abe7dcfb42f385c28b660b198fdb8d497f 81SHA1 (ttd/trghr.grf) = f01bf6abe7dcfb42f385c28b660b198fdb8d497f
82RMD160 (ttd/trghr.grf) = 83859bb411f7e0806e8756b04858f1f50cdf8ecc 82RMD160 (ttd/trghr.grf) = 83859bb411f7e0806e8756b04858f1f50cdf8ecc
83Size (ttd/trghr.grf) = 410483 bytes 83Size (ttd/trghr.grf) = 410483 bytes
84SHA1 (ttd/trgir.grf) = d31646015cf0238e7752344ac5a882a7713aed79 84SHA1 (ttd/trgir.grf) = d31646015cf0238e7752344ac5a882a7713aed79
85RMD160 (ttd/trgir.grf) = e30d76d101868b3b310af4d17c2e5c2e2353a1ed 85RMD160 (ttd/trgir.grf) = e30d76d101868b3b310af4d17c2e5c2e2353a1ed
86Size (ttd/trgir.grf) = 342377 bytes 86Size (ttd/trgir.grf) = 342377 bytes
87SHA1 (ttd/trgtr.grf) = 436d0ff41b3e2e0229960d56a50c68a871077a10 87SHA1 (ttd/trgtr.grf) = 436d0ff41b3e2e0229960d56a50c68a871077a10
88RMD160 (ttd/trgtr.grf) = a73cb82dd0e18baf5142fa10fa9a90e8f9de1c8c 88RMD160 (ttd/trgtr.grf) = a73cb82dd0e18baf5142fa10fa9a90e8f9de1c8c
89Size (ttd/trgtr.grf) = 559392 bytes 89Size (ttd/trgtr.grf) = 559392 bytes
90SHA1 (patch-aa) = 422ada1f8c68605fa2e759a2911060fdc97b28a6 90SHA1 (patch-aa) = 0301945e21a84d263ff087623b06eb6622eea46e
 91SHA1 (patch-ab) = ae1ff320072c65f68f09a34df55514c2be122b79
cvs diff -r1.5 -r1.6 pkgsrc/games/openttd/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/openttd/patches/Attic/patch-aa 2007/05/06 17:47:35 1.5
+++ pkgsrc/games/openttd/patches/Attic/patch-aa 2008/04/07 19:44:19 1.6
@@ -1,31 +1,79 @@ @@ -1,31 +1,79 @@
1$NetBSD: patch-aa,v 1.5 2007/05/06 17:47:35 jdolecek Exp $ 1$NetBSD: patch-aa,v 1.6 2008/04/07 19:44:19 tnn Exp $
2 2
3--- Makefile.orig 2007-04-20 21:47:49.000000000 +0200 3--- config.lib.orig 2008-04-01 00:31:33.000000000 +0200
4+++ Makefile 2007-05-06 19:17:16.000000000 +0200 4+++ config.lib
5@@ -213,7 +213,7 @@ 5@@ -392,9 +392,9 @@ check_params() {
6 ifndef WIN32 6 exit 1
7 ifndef MORPHOS 7 fi
8 ifndef OSX 8 # OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
9- LDFLAGS+=-lpthread 9- if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then
10+ LDFLAGS+=${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 10+ if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then
11 endif 11 echo "configure: error: invalid option --os=$os"
12 endif 12- echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]"
13 endif 13+ echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]"
14@@ -585,17 +585,6 @@ 14 exit 1
15 CDEFS += -DWITH_COCOA 15 fi
16 LIBS += -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit 16 # cpu_type can be either 32 or 64
17 endif 17@@ -1000,6 +1000,10 @@ make_cflags_and_ldflags() {
18- 18 LIBS="$LIBS -pthread"
19- # OSX path setup 19 fi
20- ifndef SECOND_DATA_PATH 
21- SECOND_DATA_PATH:="$(OSXAPP)/Contents/Data/" 
22- endif 
23- 
24- ifndef CUSTOM_LANG_DIR 
25- ifndef DEDICATED 
26- CUSTOM_LANG_DIR:="$(OSXAPP)/Contents/Lang/" 
27- endif 
28- endif 
29 endif 
30  20
31 ifdef MIDI 21+ if [ "$os" = "NETBSD" ]; then
 22+ LIBS="$LIBS -lpthread"
 23+ fi
 24+
 25 if [ "$os" = "FREEBSD" ]; then
 26 LIBS="$LIBS -lpthread"
 27 fi
 28@@ -1016,7 +1020,7 @@ make_cflags_and_ldflags() {
 29 fi
 30
 31 # Most targets act like UNIX, just with some additions
 32- if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
 33+ if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
 34 CFLAGS="$CFLAGS -DUNIX"
 35 fi
 36 # And others like Windows
 37@@ -1511,7 +1515,7 @@ detect_awk() {
 38
 39 detect_os() {
 40 if [ "$os" = "DETECT" ]; then
 41- # Detect UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
 42+ # Detect UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
 43
 44 # Try first via dumpmachine, then via uname
 45 os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
 46@@ -1519,6 +1523,7 @@ detect_os() {
 47 /darwin/ { print "OSX"; exit}
 48 /freebsd/ { print "FREEBSD"; exit}
 49 /openbsd/ { print "OPENBSD"; exit}
 50+ /netbsd/ { print "NETBSD"; exit}
 51 /morphos/ { print "MORPHOS"; exit}
 52 /beos/ { print "BEOS"; exit}
 53 /sunos/ { print "SUNOS"; exit}
 54@@ -1536,6 +1541,7 @@ detect_os() {
 55 /darwin/ { print "OSX"; exit}
 56 /freebsd/ { print "FREEBSD"; exit}
 57 /openbsd/ { print "OPENBSD"; exit}
 58+ /netbsd/ { print "NETBSD"; exit}
 59 /morphos/ { print "MORPHOS"; exit}
 60 /beos/ { print "BEOS"; exit}
 61 /sunos/ { print "SUNOS"; exit}
 62@@ -1548,7 +1554,7 @@ detect_os() {
 63 if [ -z "$os" ]; then
 64 log 1 "detecting OS... none detected"
 65 log 1 "I couldn't detect your OS. Please use --os=OS to force one"
 66- log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP"
 67+ log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP"
 68 exit 1
 69 fi
 70
 71@@ -2296,7 +2302,7 @@ showhelp() {
 72 echo " --awk=AWK the awk to use in configure [awk]"
 73 echo " --lipo=LIPO the lipo to use (OSX ONLY) [HOST-lipo]"
 74 echo " --os=OS the OS we are compiling for [DETECT]"
 75- echo " DETECT/UNIX/OSX/FREEBSD/OPENBSD/MORPHOS/"
 76+ echo " DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/MORPHOS/"
 77 echo " BEOS/SUNOS/CYGWIN/MINGW/OS2/WINCE/PSP"
 78 echo " --endian=ENDIAN set the endian of the HOST (AUTO/LE/BE)"
 79 echo " --revision=rXXXX overwrite the revision detection."
File Added: pkgsrc/games/openttd/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.4 2008/04/07 19:44:19 tnn Exp $

--- Makefile.in.orig	2008-01-14 21:30:05.000000000 +0100
+++ Makefile.in
@@ -258,7 +258,7 @@ ifdef OSXAPP
 install:
 	@echo '[INSTALL] Cannot install the OSX Application Bundle'
 else
-install: bundle
+install:
 	@echo '[INSTALL] Installing OpenTTD'
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"