pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games/openttd Update to openttd-0.6.0.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/584b7390e73f
branches:  trunk
changeset: 540825:584b7390e73f
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Apr 07 19:44:19 2008 +0000

description:
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.

diffstat:

 games/openttd/MESSAGE          |    6 +-
 games/openttd/Makefile         |   47 +++--------
 games/openttd/PLIST            |  168 ++++++++++++++++++++--------------------
 games/openttd/distinfo         |   11 +-
 games/openttd/options.mk       |   14 ++-
 games/openttd/patches/patch-aa |  106 ++++++++++++++++++-------
 games/openttd/patches/patch-ab |   13 +++
 7 files changed, 208 insertions(+), 157 deletions(-)

diffs (truncated from 450 to 300 lines):

diff -r aaf68dbde8f3 -r 584b7390e73f games/openttd/MESSAGE
--- a/games/openttd/MESSAGE     Mon Apr 07 19:41:07 2008 +0000
+++ b/games/openttd/MESSAGE     Mon Apr 07 19:44:19 2008 +0000
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2007/04/22 16:46:24 tnn Exp $
+$NetBSD: MESSAGE,v 1.3 2008/04/07 19:44:19 tnn Exp $
 
 To run openttd you need data files provided by the original Transport
 Tycoon Deluxe.
 
-The following files should be copied to ${PREFIX}/share/games/openttd/data
+The following files should be copied to ${PREFIX}/share/openttd/data
 in order to play:
 
        sample.cat
@@ -14,7 +14,7 @@
        trgir.grf
        trgtr.grf
 
-All *.gm files should be copied to ${PREFIX}/share/games/openttd/gm
+All *.gm files should be copied to ${PREFIX}/share/openttd/gm
 in order to play original MIDI music.
 
 Note: On NetBSD playing MIDI music is not supported now. Probably in a
diff -r aaf68dbde8f3 -r 584b7390e73f games/openttd/Makefile
--- a/games/openttd/Makefile    Mon Apr 07 19:41:07 2008 +0000
+++ b/games/openttd/Makefile    Mon Apr 07 19:44:19 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2008/03/04 04:05:30 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2008/04/07 19:44:19 tnn Exp $
 
-DISTNAME=      openttd-0.5.3-source
-PKGNAME=       openttd-0.5.3
+DISTNAME=      openttd-0.6.0-source
+PKGNAME=       ${DISTNAME:S/-source//}
 CATEGORIES=    games x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openttd/}
 
@@ -11,45 +11,24 @@
 EXTRACT_SUFX=  .tar.bz2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
-USE_LANGUAGES+=        c c++
-USE_TOOLS+=    gmake pkg-config
 
-DATA_DIR=      ${DESTDIR}${PREFIX}/share/games/openttd
+HAS_CONFIGURE=         yes
+USE_LANGUAGES+=                c c++
+USE_DIRS+=             xdg-1.1
+USE_TOOLS+=            gmake pkg-config
 
-MAKE_ENV+=     PREFIX=${PREFIX:Q}
-MAKE_ENV+=     INSTALL=1
-MAKE_ENV+=     BINARY_DIR=bin
-MAKE_ENV+=     DATA_DIR=share/games/openttd
-MAKE_ENV+=     USE_HOMEDIR=1
-MAKE_ENV+=     PERSONAL_DIR=.openttd
-MAKE_ENV+=     WITH_NETWORK=1
-MAKE_ENV+=     X11BASE=${X11BASE:Q}
+CONFIGURE_ARGS+=       --prefix-dir=${DESTDIR}${PREFIX}
+CONFIGURE_ARGS+=       --binary-dir=bin
+CONFIGURE_ARGS+=       --data-dir=share/openttd
 
-# disable custom assert for Mac OS X
+# disable custom assert for Mac OS X (XXX: still needed?)
 CFLAGS+=       -DNDEBUG=1
 
-WRKSRC=                ${WRKDIR}/${DISTNAME:S:-source::}
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
+BUILD_TARGET=  bundle
 
 .include "options.mk"
 
-INSTALLATION_DIRS=     bin share/games/openttd/data share/games/openttd/docs \
-                         share/games/openttd/lang share/games/openttd/gm
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/openttd ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA} -m 644 ${WRKSRC}/lang/*.lng ${DATA_DIR}/lang
-       ${INSTALL_DATA} -m 644 ${WRKSRC}/data/* ${DATA_DIR}/data
-       ${INSTALL_DATA} -m 644 ${WRKSRC}/readme.txt ${DATA_DIR}/docs
-       ${INSTALL_DATA} -m 644 ${WRKSRC}/changelog.txt ${DATA_DIR}/docs
-       ${INSTALL_DATA} -m 644 ${WRKSRC}/docs/Manual.txt ${DATA_DIR}/docs
-       ${INSTALL_DATA} -m 644 ${WRKSRC}/docs/multiplayer.txt ${DATA_DIR}/docs
-.if !empty(PKG_OPTIONS:Mttd-data)
-       ${RUN} for f in ${DATAFILES}; do \
-         ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/data; done
-       ${RUN} for f in ${GMFILES}; do \
-         ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/gm; done
-.endif
-
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff -r aaf68dbde8f3 -r 584b7390e73f games/openttd/PLIST
--- a/games/openttd/PLIST       Mon Apr 07 19:41:07 2008 +0000
+++ b/games/openttd/PLIST       Mon Apr 07 19:44:19 2008 +0000
@@ -1,85 +1,85 @@
-@comment $NetBSD: PLIST,v 1.8 2008/03/04 04:05:30 tnn Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/04/07 19:44:19 tnn Exp $
 bin/openttd
-share/games/openttd/data/2ccmap.grf
-share/games/openttd/data/airports.grf
-share/games/openttd/data/autorail.grf
-share/games/openttd/data/canalsw.grf
-share/games/openttd/data/dosdummy.grf
-share/games/openttd/data/elrailsw.grf
-share/games/openttd/data/nsignalsw.grf
-share/games/openttd/data/openttd.grf
-share/games/openttd/data/opntitle.dat
-share/games/openttd/data/trkfoundw.grf
-share/games/openttd/docs/Manual.txt
-share/games/openttd/docs/changelog.txt
-share/games/openttd/docs/multiplayer.txt
-share/games/openttd/docs/readme.txt
-share/games/openttd/lang/american.lng
-share/games/openttd/lang/brazilian_portuguese.lng
-share/games/openttd/lang/bulgarian.lng
-share/games/openttd/lang/catalan.lng
-share/games/openttd/lang/croatian.lng
-share/games/openttd/lang/czech.lng
-share/games/openttd/lang/danish.lng
-share/games/openttd/lang/dutch.lng
-share/games/openttd/lang/english.lng
-share/games/openttd/lang/esperanto.lng
-share/games/openttd/lang/estonian.lng
-share/games/openttd/lang/finnish.lng
-share/games/openttd/lang/french.lng
-share/games/openttd/lang/galician.lng
-share/games/openttd/lang/german.lng
-share/games/openttd/lang/hungarian.lng
-share/games/openttd/lang/icelandic.lng
-share/games/openttd/lang/italian.lng
-share/games/openttd/lang/japanese.lng
-share/games/openttd/lang/korean.lng
-share/games/openttd/lang/lithuanian.lng
-share/games/openttd/lang/norwegian_bokmal.lng
-share/games/openttd/lang/norwegian_nynorsk.lng
-share/games/openttd/lang/origveh.lng
-share/games/openttd/lang/polish.lng
-share/games/openttd/lang/portuguese.lng
-share/games/openttd/lang/romanian.lng
-share/games/openttd/lang/russian.lng
-share/games/openttd/lang/simplified_chinese.lng
-share/games/openttd/lang/slovak.lng
-share/games/openttd/lang/slovenian.lng
-share/games/openttd/lang/spanish.lng
-share/games/openttd/lang/swedish.lng
-share/games/openttd/lang/traditional_chinese.lng
-share/games/openttd/lang/turkish.lng
-share/games/openttd/lang/ukrainian.lng
-${TTD_DATA}share/games/openttd/data/sample.cat
-${TTD_DATA}share/games/openttd/data/trg1r.grf
-${TTD_DATA}share/games/openttd/data/trgcr.grf
-${TTD_DATA}share/games/openttd/data/trghr.grf
-${TTD_DATA}share/games/openttd/data/trgir.grf
-${TTD_DATA}share/games/openttd/data/trgtr.grf
-${TTD_DATA}share/games/openttd/gm/gm_tt00.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt01.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt02.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt03.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt04.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt05.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt06.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt07.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt08.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt09.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt10.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt11.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt12.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt13.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt14.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt15.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt16.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt17.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt18.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt19.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt20.gm
-${TTD_DATA}share/games/openttd/gm/gm_tt21.gm
-@dirrm share/games/openttd/lang
-@dirrm share/games/openttd/docs
-@unexec ${RMDIR} %D/share/games/openttd/data 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/games/openttd/gm 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/games/openttd 2>/dev/null || ${TRUE}
+share/openttd/data/generictrams_v0.4.grf
+share/openttd/data/openttdd.grf
+share/openttd/data/openttdw.grf
+share/openttd/data/opntitle.dat
+${TTD_DATA}share/openttd/data/sample.cat
+${TTD_DATA}share/openttd/data/trg1r.grf
+${TTD_DATA}share/openttd/data/trgcr.grf
+${TTD_DATA}share/openttd/data/trghr.grf
+${TTD_DATA}share/openttd/data/trgir.grf
+${TTD_DATA}share/openttd/data/trgtr.grf
+share/openttd/docs/32bpp.txt
+share/openttd/docs/changelog.txt
+share/openttd/docs/known-bugs.txt
+share/openttd/docs/multiplayer.txt
+${TTD_DATA}share/openttd/gm/gm_tt00.gm
+${TTD_DATA}share/openttd/gm/gm_tt01.gm
+${TTD_DATA}share/openttd/gm/gm_tt02.gm
+${TTD_DATA}share/openttd/gm/gm_tt03.gm
+${TTD_DATA}share/openttd/gm/gm_tt04.gm
+${TTD_DATA}share/openttd/gm/gm_tt05.gm
+${TTD_DATA}share/openttd/gm/gm_tt06.gm
+${TTD_DATA}share/openttd/gm/gm_tt07.gm
+${TTD_DATA}share/openttd/gm/gm_tt08.gm
+${TTD_DATA}share/openttd/gm/gm_tt09.gm
+${TTD_DATA}share/openttd/gm/gm_tt10.gm
+${TTD_DATA}share/openttd/gm/gm_tt11.gm
+${TTD_DATA}share/openttd/gm/gm_tt12.gm
+${TTD_DATA}share/openttd/gm/gm_tt13.gm
+${TTD_DATA}share/openttd/gm/gm_tt14.gm
+${TTD_DATA}share/openttd/gm/gm_tt15.gm
+${TTD_DATA}share/openttd/gm/gm_tt16.gm
+${TTD_DATA}share/openttd/gm/gm_tt17.gm
+${TTD_DATA}share/openttd/gm/gm_tt18.gm
+${TTD_DATA}share/openttd/gm/gm_tt19.gm
+${TTD_DATA}share/openttd/gm/gm_tt20.gm
+${TTD_DATA}share/openttd/gm/gm_tt21.gm
+share/openttd/lang/afrikaans.lng
+share/openttd/lang/brazilian_portuguese.lng
+share/openttd/lang/bulgarian.lng
+share/openttd/lang/catalan.lng
+share/openttd/lang/croatian.lng
+share/openttd/lang/czech.lng
+share/openttd/lang/danish.lng
+share/openttd/lang/dutch.lng
+share/openttd/lang/english.lng
+share/openttd/lang/english_US.lng
+share/openttd/lang/esperanto.lng
+share/openttd/lang/estonian.lng
+share/openttd/lang/finnish.lng
+share/openttd/lang/french.lng
+share/openttd/lang/galician.lng
+share/openttd/lang/german.lng
+share/openttd/lang/hungarian.lng
+share/openttd/lang/icelandic.lng
+share/openttd/lang/italian.lng
+share/openttd/lang/japanese.lng
+share/openttd/lang/korean.lng
+share/openttd/lang/lithuanian.lng
+share/openttd/lang/norwegian_bokmal.lng
+share/openttd/lang/norwegian_nynorsk.lng
+share/openttd/lang/origveh.lng
+share/openttd/lang/piglatin.lng
+share/openttd/lang/polish.lng
+share/openttd/lang/portuguese.lng
+share/openttd/lang/romanian.lng
+share/openttd/lang/russian.lng
+share/openttd/lang/simplified_chinese.lng
+share/openttd/lang/slovak.lng
+share/openttd/lang/slovenian.lng
+share/openttd/lang/spanish.lng
+share/openttd/lang/swedish.lng
+share/openttd/lang/traditional_chinese.lng
+share/openttd/lang/turkish.lng
+share/openttd/lang/ukrainian.lng
+share/pixmaps/openttd.32.bmp
+share/pixmaps/openttd.32.xpm
+share/pixmaps/openttd.64.png
+@comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm share/openttd/lang
+@dirrm share/openttd/docs
+@unexec ${RMDIR} %D/share/openttd/data 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/openttd/gm 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/openttd 2>/dev/null || ${TRUE}
diff -r aaf68dbde8f3 -r 584b7390e73f games/openttd/distinfo
--- a/games/openttd/distinfo    Mon Apr 07 19:41:07 2008 +0000
+++ b/games/openttd/distinfo    Mon Apr 07 19:44:19 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2008/03/04 04:05:30 tnn Exp $
+$NetBSD: distinfo,v 1.12 2008/04/07 19:44:19 tnn Exp $
 
-SHA1 (openttd-0.5.3-source.tar.bz2) = ed23b5de67e597b6a96eccca26495369591f1ebc
-RMD160 (openttd-0.5.3-source.tar.bz2) = 99a19d648652dd84952dd619c0d4b11c1b8d135d
-Size (openttd-0.5.3-source.tar.bz2) = 3043644 bytes
+SHA1 (openttd-0.6.0-source.tar.bz2) = 94c55f80e3869decb5b613d78f3b889f7168b6e5
+RMD160 (openttd-0.6.0-source.tar.bz2) = 9ba4d63d4613779ae57a96fa25d4bb897c558976
+Size (openttd-0.6.0-source.tar.bz2) = 3688002 bytes
 SHA1 (ttd/gm_tt00.gm) = 79d21ad066867e9d737fb7b2fb1fbec9a7e3ff67
 RMD160 (ttd/gm_tt00.gm) = 682df44d2080f78d26bfc7095b1da4b026c24e31
 Size (ttd/gm_tt00.gm) = 29714 bytes
@@ -87,4 +87,5 @@
 SHA1 (ttd/trgtr.grf) = 436d0ff41b3e2e0229960d56a50c68a871077a10
 RMD160 (ttd/trgtr.grf) = a73cb82dd0e18baf5142fa10fa9a90e8f9de1c8c
 Size (ttd/trgtr.grf) = 559392 bytes
-SHA1 (patch-aa) = 422ada1f8c68605fa2e759a2911060fdc97b28a6
+SHA1 (patch-aa) = 0301945e21a84d263ff087623b06eb6622eea46e
+SHA1 (patch-ab) = ae1ff320072c65f68f09a34df55514c2be122b79
diff -r aaf68dbde8f3 -r 584b7390e73f games/openttd/options.mk
--- a/games/openttd/options.mk  Mon Apr 07 19:41:07 2008 +0000
+++ b/games/openttd/options.mk  Mon Apr 07 19:44:19 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/03/04 12:02:11 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/07 19:44:19 tnn Exp $
 
 .include "../../mk/bsd.prefs.mk"
 



Home | Main Index | Thread Index | Old Index