pkgsrc-Bugs archive

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

pkg/39397: update games/openttd to 0.6.2



>Number:         39397
>Category:       pkg
>Synopsis:       update games/openttd to 0.6.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 24 11:40:00 +0000 2008
>Originator:     Jeff Quast
>Release:        NetBSD 4.99.69
>Organization:
>Environment:
System: NetBSD netbsd.1984.ws 4.99.69 NetBSD 4.99.69 (XEN3_DOMU+PF) #0: Sun Jul 
20 08:11:51 EDT 2008 
root%netbsd.1984.ws@localhost:/usr/src/sys/arch/amd64/compile/XEN3_DOMU+PF amd64
Architecture: x86_64
Machine: amd64
>Description:
openttd out of date.

0.6.2 does not include extra 'generictrams_v0.4.grf' in the source tarball
any longer. freebsd has patch to fetch this file, but this is not done here.
generictrams is not necessary to play this game (though original commercial
files of transport tycoon deluxe are).

http://www.freebsd.org/cgi/query-pr.cgi?pr=126514

patch attached to bring openttd to latest stable version, 0.6.2. It does not 
include fetching of generictrams.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/openttd/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile    8 Apr 2008 23:11:21 -0000       1.27
+++ Makefile    24 Aug 2008 11:26:09 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.27 2008/04/08 23:11:21 tnn Exp $
 
-DISTNAME=      openttd-0.6.0-source
+DISTNAME=      openttd-0.6.2-source
 PKGNAME=       ${DISTNAME:S/-source//}
 CATEGORIES=    games x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openttd/}
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/games/openttd/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- PLIST       12 Apr 2008 22:43:01 -0000      1.10
+++ PLIST       24 Aug 2008 11:26:09 -0000
@@ -1,6 +1,5 @@
 @comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:01 jlam Exp $
 bin/openttd
-share/openttd/data/generictrams_v0.4.grf
 share/openttd/data/openttdd.grf
 share/openttd/data/openttdw.grf
 share/openttd/data/opntitle.dat
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/openttd/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo    7 Apr 2008 19:44:19 -0000       1.12
+++ distinfo    24 Aug 2008 11:26:09 -0000
@@ -1,91 +1,7 @@
 $NetBSD: distinfo,v 1.12 2008/04/07 19:44:19 tnn Exp $
 
-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
-SHA1 (ttd/gm_tt01.gm) = d906d160b06f8dbaa4bdfa6f2190c4a0a0093d7e
-RMD160 (ttd/gm_tt01.gm) = 46bbef72f56e8728a6f7fabae39e996a5b816b85
-Size (ttd/gm_tt01.gm) = 50427 bytes
-SHA1 (ttd/gm_tt02.gm) = b4f728a8fc9ac49e824b085f78d20b39f852bc98
-RMD160 (ttd/gm_tt02.gm) = 353b5b7c3f8b938d638acb1aef9cd7b5c76d8bd2
-Size (ttd/gm_tt02.gm) = 46406 bytes
-SHA1 (ttd/gm_tt03.gm) = a6bec83d018087a07e0c567b56bc568588650505
-RMD160 (ttd/gm_tt03.gm) = 0d32ceb716859ab9cc8a6150ee2a9edfdc7b839f
-Size (ttd/gm_tt03.gm) = 60986 bytes
-SHA1 (ttd/gm_tt04.gm) = e664d19d90de99ea7b67c0a83ca523f49186662f
-RMD160 (ttd/gm_tt04.gm) = ae7107811633c54dd9d1b1b08f748e6f8c519bd4
-Size (ttd/gm_tt04.gm) = 62712 bytes
-SHA1 (ttd/gm_tt05.gm) = 0502e045126e78ce3a811ef932b5de32e796105d
-RMD160 (ttd/gm_tt05.gm) = ee6677fe91083a89a654b281e66c113090cbf581
-Size (ttd/gm_tt05.gm) = 62952 bytes
-SHA1 (ttd/gm_tt06.gm) = 45c37a9bda218c19bf46c2143846d7331d17d83c
-RMD160 (ttd/gm_tt06.gm) = b7c45a88dd5d379e074efa8b2eb1661065f3c6e5
-Size (ttd/gm_tt06.gm) = 69089 bytes
-SHA1 (ttd/gm_tt07.gm) = 5c2484faa0ac4f8c87ef20100f1732c212cbfe3a
-RMD160 (ttd/gm_tt07.gm) = 2d398f1dafda8d9b6b8fec8d98fd353845b1f6e1
-Size (ttd/gm_tt07.gm) = 37182 bytes
-SHA1 (ttd/gm_tt08.gm) = e6ad03a452c521a7f685def4aa6b7facf9c6787e
-RMD160 (ttd/gm_tt08.gm) = cba6468fc6fd9a0144dabed4f06049fdd2d98ee6
-Size (ttd/gm_tt08.gm) = 17877 bytes
-SHA1 (ttd/gm_tt09.gm) = 1373c0bcf049706c1a2ff4d3ab0e0957fda06ac5
-RMD160 (ttd/gm_tt09.gm) = 8b3cc19bf26dfc43c090a6f815f5d6c42a875886
-Size (ttd/gm_tt09.gm) = 57940 bytes
-SHA1 (ttd/gm_tt10.gm) = c003252c57d3e114aeeac3bb85a34476b2536146
-RMD160 (ttd/gm_tt10.gm) = 011cf01f448b4b123d53c197daa0205f43c7ff85
-Size (ttd/gm_tt10.gm) = 43530 bytes
-SHA1 (ttd/gm_tt11.gm) = 25c6bc295aa691e832c6916b092254ac22f8964f
-RMD160 (ttd/gm_tt11.gm) = 5e1c54d8fc179b6fd47b04fe5fe47a4502ac0885
-Size (ttd/gm_tt11.gm) = 57439 bytes
-SHA1 (ttd/gm_tt12.gm) = b7a2308258b6b7f8cbe00f08ac0656c9fa986a40
-RMD160 (ttd/gm_tt12.gm) = 7bb3207d99f0c945bb93353b073909b394c1a355
-Size (ttd/gm_tt12.gm) = 40305 bytes
-SHA1 (ttd/gm_tt13.gm) = ea8e7428111f3aba480234a529d85c9523404f88
-RMD160 (ttd/gm_tt13.gm) = 5bd95bd2910937883eb5f8b09d74cfc23f8d1af6
-Size (ttd/gm_tt13.gm) = 35152 bytes
-SHA1 (ttd/gm_tt14.gm) = 3e60a6e6fdb92839e9e6f277b17fd79fa59dd258
-RMD160 (ttd/gm_tt14.gm) = a95ce86fd4e291ad9edbb8ca724db35488bdcc95
-Size (ttd/gm_tt14.gm) = 14751 bytes
-SHA1 (ttd/gm_tt15.gm) = 0139d6735d311e6ddf4719c1869712d1dfb9a797
-RMD160 (ttd/gm_tt15.gm) = 3824d45c46d669c0e544f35279a8a7b2dd580d70
-Size (ttd/gm_tt15.gm) = 60572 bytes
-SHA1 (ttd/gm_tt16.gm) = 75b434d09035251395b7003b0a6ffbfc7be057a9
-RMD160 (ttd/gm_tt16.gm) = fe0be50d44837e8bdf82202e2d86ae3d3c6a8cbd
-Size (ttd/gm_tt16.gm) = 48614 bytes
-SHA1 (ttd/gm_tt17.gm) = f49f08efe80e318fb512f70d5b1843a0cc6448dd
-RMD160 (ttd/gm_tt17.gm) = 100a4c8d799195a1fb0cfcbd6b0e440309529b16
-Size (ttd/gm_tt17.gm) = 43766 bytes
-SHA1 (ttd/gm_tt18.gm) = 826256ccbdb2cac17b03ae22610837096ec71713
-RMD160 (ttd/gm_tt18.gm) = 64f033ce01504a91b002507665e42e13b27624cb
-Size (ttd/gm_tt18.gm) = 52082 bytes
-SHA1 (ttd/gm_tt19.gm) = 02adfff8276798eb24b20802d939c29d80d8fff5
-RMD160 (ttd/gm_tt19.gm) = fadc6a100edd8f6590fd949e73991fbf66a3da9d
-Size (ttd/gm_tt19.gm) = 50279 bytes
-SHA1 (ttd/gm_tt20.gm) = 3130a5818ff751474a40443195bad7b47ad1f232
-RMD160 (ttd/gm_tt20.gm) = 3764e9179cb002790f8d68a9401feaab349907bd
-Size (ttd/gm_tt20.gm) = 64219 bytes
-SHA1 (ttd/gm_tt21.gm) = fc3fdf5ab16a961647966b7701b0e559f45d9095
-RMD160 (ttd/gm_tt21.gm) = 6262f3298a079ac099138ec3e1cbc07cc8dedc35
-Size (ttd/gm_tt21.gm) = 46812 bytes
-SHA1 (ttd/sample.cat) = 57ff8c136db86a5d91a497931b2d6df53e8635b5
-RMD160 (ttd/sample.cat) = e760abc6ee8ff68345d1c5d74215a830f1d83c77
-Size (ttd/sample.cat) = 1608618 bytes
-SHA1 (ttd/trg1r.grf) = 6d385630f7ad8413758bbfe8b4b16b0ed946e7ee
-RMD160 (ttd/trg1r.grf) = 9bd16bb0c02bdb0dc9743215809a2ad8c15cd02a
-Size (ttd/trg1r.grf) = 2426943 bytes
-SHA1 (ttd/trgcr.grf) = 5d1f97c3b82b41bebbd5811b838e129e7714d7a7
-RMD160 (ttd/trgcr.grf) = 2aa6a3cf2aa38adf43aea2577a2a3695bfdba799
-Size (ttd/trgcr.grf) = 267110 bytes
-SHA1 (ttd/trghr.grf) = f01bf6abe7dcfb42f385c28b660b198fdb8d497f
-RMD160 (ttd/trghr.grf) = 83859bb411f7e0806e8756b04858f1f50cdf8ecc
-Size (ttd/trghr.grf) = 410483 bytes
-SHA1 (ttd/trgir.grf) = d31646015cf0238e7752344ac5a882a7713aed79
-RMD160 (ttd/trgir.grf) = e30d76d101868b3b310af4d17c2e5c2e2353a1ed
-Size (ttd/trgir.grf) = 342377 bytes
-SHA1 (ttd/trgtr.grf) = 436d0ff41b3e2e0229960d56a50c68a871077a10
-RMD160 (ttd/trgtr.grf) = a73cb82dd0e18baf5142fa10fa9a90e8f9de1c8c
-Size (ttd/trgtr.grf) = 559392 bytes
-SHA1 (patch-aa) = 0301945e21a84d263ff087623b06eb6622eea46e
-SHA1 (patch-ab) = ae1ff320072c65f68f09a34df55514c2be122b79
+SHA1 (openttd-0.6.2-source.tar.bz2) = c53ec5515729613fe55bbb714af48b908e70af39
+RMD160 (openttd-0.6.2-source.tar.bz2) = 
6e6d8864773138ed2f588b19c0a7f399607cf6ea
+Size (openttd-0.6.2-source.tar.bz2) = 3670638 bytes
+SHA1 (patch-aa) = 5c7a715087f08e9f08ebd2fcc5165c5d45bed45d
+SHA1 (patch-ab) = 02f7e5333de4981f87b5e8e4d290dc38d172100c
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/games/openttd/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- patches/patch-aa    7 Apr 2008 19:44:19 -0000       1.6
+++ patches/patch-aa    24 Aug 2008 11:26:09 -0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2008/04/07 19:44:19 tnn Exp $
-
---- config.lib.orig    2008-04-01 00:31:33.000000000 +0200
-+++ config.lib
-@@ -392,9 +392,9 @@ check_params() {
+--- config.lib.orig    2008-08-01 19:52:22.000000000 -0400
++++ config.lib 2008-08-16 11:41:06.000000000 -0400
+@@ -392,9 +392,9 @@
                exit 1
        fi
        # OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, 
SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
@@ -14,7 +12,7 @@
                exit 1
        fi
        # cpu_type can be either 32 or 64
-@@ -1000,6 +1000,10 @@ make_cflags_and_ldflags() {
+@@ -1003,6 +1003,10 @@
                LIBS="$LIBS -pthread"
        fi
  
@@ -25,7 +23,7 @@
        if [ "$os" = "FREEBSD" ]; then
                LIBS="$LIBS -lpthread"
        fi
-@@ -1016,7 +1020,7 @@ make_cflags_and_ldflags() {
+@@ -1019,7 +1023,7 @@
        fi
  
        # Most targets act like UNIX, just with some additions
@@ -34,7 +32,7 @@
                CFLAGS="$CFLAGS -DUNIX"
        fi
        # And others like Windows
-@@ -1511,7 +1515,7 @@ detect_awk() {
+@@ -1542,7 +1546,7 @@
  
  detect_os() {
        if [ "$os" = "DETECT" ]; then
@@ -43,7 +41,7 @@
  
                # Try first via dumpmachine, then via uname
                os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
-@@ -1519,6 +1523,7 @@ detect_os() {
+@@ -1550,6 +1554,7 @@
                                        /darwin/       { print "OSX";     exit}
                                        /freebsd/      { print "FREEBSD"; exit}
                                        /openbsd/      { print "OPENBSD"; exit}
@@ -51,7 +49,7 @@
                                        /morphos/      { print "MORPHOS"; exit}
                                        /beos/         { print "BEOS";    exit}
                                        /sunos/        { print "SUNOS";   exit}
-@@ -1536,6 +1541,7 @@ detect_os() {
+@@ -1567,6 +1572,7 @@
                                        /darwin/       { print "OSX";     exit}
                                        /freebsd/      { print "FREEBSD"; exit}
                                        /openbsd/      { print "OPENBSD"; exit}
@@ -59,7 +57,7 @@
                                        /morphos/      { print "MORPHOS"; exit}
                                        /beos/         { print "BEOS";    exit}
                                        /sunos/        { print "SUNOS";   exit}
-@@ -1548,7 +1554,7 @@ detect_os() {
+@@ -1579,7 +1585,7 @@
                if [ -z "$os" ]; then
                        log 1 "detecting OS... none detected"
                        log 1 "I couldn't detect your OS. Please use --os=OS to 
force one"
@@ -68,7 +66,7 @@
                        exit 1
                fi
  
-@@ -2296,7 +2302,7 @@ showhelp() {
+@@ -2320,7 +2326,7 @@
        echo "  --awk=AWK                      the awk to use in configure 
[awk]"
        echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) 
[HOST-lipo]"
        echo "  --os=OS                        the OS we are compiling for 
[DETECT]"
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/games/openttd/patches/patch-ab,v
retrieving revision 1.4
diff -u -r1.4 patch-ab
--- patches/patch-ab    7 Apr 2008 19:44:19 -0000       1.4
+++ patches/patch-ab    24 Aug 2008 11:26:09 -0000
@@ -1,8 +1,6 @@
-$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.orig   2008-04-24 08:15:24.000000000 -0400
 +++ Makefile.in
-@@ -258,7 +258,7 @@ ifdef OSXAPP
+@@ -257,7 +257,7 @@
  install:
        @echo '[INSTALL] Cannot install the OSX Application Bundle'
  else



Home | Main Index | Thread Index | Old Index