diff options
Diffstat (limited to 'games/openttd')
-rw-r--r-- | games/openttd/Makefile | 6 | ||||
-rw-r--r-- | games/openttd/PLIST | 25 | ||||
-rw-r--r-- | games/openttd/distinfo | 10 | ||||
-rw-r--r-- | games/openttd/patches/patch-aa | 78 | ||||
-rw-r--r-- | games/openttd/patches/patch-ab | 13 |
5 files changed, 24 insertions, 108 deletions
diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 62bfff0a9bf..055a175fb0e 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2008/08/21 11:37:01 abs Exp $ +# $NetBSD: Makefile,v 1.30 2008/12/14 01:31:01 ahoka Exp $ -DISTNAME= openttd-0.6.2-source -PKGREVISION= 1 +DISTNAME= openttd-0.6.3-source PKGNAME= ${DISTNAME:S/-source//} CATEGORIES= games x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openttd/} @@ -23,6 +22,7 @@ USE_TOOLS+= gmake pkg-config CONFIGURE_ARGS+= --prefix-dir=${PREFIX} CONFIGURE_ARGS+= --binary-dir=bin CONFIGURE_ARGS+= --data-dir=share/openttd +CONFIGURE_ARGS+= --man-dir=${PKGMANDIR}/man6 # disable custom assert for Mac OS X (XXX: still needed?) CFLAGS+= -DNDEBUG=1 diff --git a/games/openttd/PLIST b/games/openttd/PLIST index 302e351fafd..a524c1dfbf6 100644 --- a/games/openttd/PLIST +++ b/games/openttd/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.11 2008/08/05 12:38:22 kefren Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/12/14 01:31:01 ahoka Exp $ bin/openttd +man/man6/openttd.6 share/openttd/data/openttdd.grf share/openttd/data/openttdw.grf share/openttd/data/opntitle.dat @@ -9,10 +10,6 @@ ${PLIST.ttd-data}share/openttd/data/trgcr.grf ${PLIST.ttd-data}share/openttd/data/trghr.grf ${PLIST.ttd-data}share/openttd/data/trgir.grf ${PLIST.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 ${PLIST.ttd-data}share/openttd/gm/gm_tt00.gm ${PLIST.ttd-data}share/openttd/gm/gm_tt01.gm ${PLIST.ttd-data}share/openttd/gm/gm_tt02.gm @@ -73,12 +70,24 @@ 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 +share/applications/openttd.desktop +share/doc/openttd/32bpp.txt +share/doc/openttd/multiplayer.txt +share/icons/hicolor/128x128/apps/openttd.128.png +share/icons/hicolor/16x16/apps/openttd.16.png +share/icons/hicolor/256x256/apps/openttd.256.png +share/icons/hicolor/32x32/apps/openttd.32.png +share/icons/hicolor/48x48/apps/openttd.48.png +share/icons/hicolor/64x64/apps/openttd.64.png +share/openttd/data/generictrams_v0.4.grf +share/openttd/scenario/Greenistan.scn +share/openttd/scenario/Polopolis.scn +share/openttd/scenario/Skadi Islands.scn +share/openttd/scenario/Terra Incognita.scn +share/openttd/scenario/Wales and West England.scn @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 --git a/games/openttd/distinfo b/games/openttd/distinfo index cb9a3f002d2..5ec88e6fcb3 100644 --- a/games/openttd/distinfo +++ b/games/openttd/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.13 2008/08/05 12:38:22 kefren Exp $ +$NetBSD: distinfo,v 1.14 2008/12/14 01:31:01 ahoka Exp $ -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) = 389ff1a447804e53df12072184c99b6ca3d70d62 -SHA1 (patch-ab) = ae1ff320072c65f68f09a34df55514c2be122b79 +SHA1 (openttd-0.6.3-source.tar.bz2) = 5fb359789fae9b03550da268973fb1238ddf224c +RMD160 (openttd-0.6.3-source.tar.bz2) = ab1f2ae17cbc97c2ebc4eceb1496bc708e6d83d4 +Size (openttd-0.6.3-source.tar.bz2) = 4609714 bytes SHA1 (ttd/gm_tt00.gm) = 79d21ad066867e9d737fb7b2fb1fbec9a7e3ff67 RMD160 (ttd/gm_tt00.gm) = 682df44d2080f78d26bfc7095b1da4b026c24e31 Size (ttd/gm_tt00.gm) = 29714 bytes diff --git a/games/openttd/patches/patch-aa b/games/openttd/patches/patch-aa deleted file mode 100644 index 8724295e8f0..00000000000 --- a/games/openttd/patches/patch-aa +++ /dev/null @@ -1,78 +0,0 @@ ---- ./config.lib.orig 2008-08-02 02:52:22.000000000 +0300 -+++ ./config.lib 2008-08-05 13:34:05.000000000 +0300 -@@ -392,9 +392,9 @@ - exit 1 - fi - # OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP -- if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then -+ if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then - echo "configure: error: invalid option --os=$os" -- echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]" -+ echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]" - exit 1 - fi - # cpu_type can be either 32 or 64 -@@ -1003,6 +1003,10 @@ - LIBS="$LIBS -pthread" - fi - -+ if [ "$os" = "NETBSD" ]; then -+ LIBS="$LIBS -lpthread" -+ fi -+ - if [ "$os" = "FREEBSD" ]; then - LIBS="$LIBS -lpthread" - fi -@@ -1019,7 +1023,7 @@ - fi - - # Most targets act like UNIX, just with some additions -- if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then -+ if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then - CFLAGS="$CFLAGS -DUNIX" - fi - # And others like Windows -@@ -1542,7 +1546,7 @@ - - detect_os() { - if [ "$os" = "DETECT" ]; then -- # Detect UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP -+ # Detect UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP - - # Try first via dumpmachine, then via uname - os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk ' -@@ -1550,6 +1554,8 @@ - /darwin/ { print "OSX"; exit} - /freebsd/ { print "FREEBSD"; exit} - /openbsd/ { print "OPENBSD"; exit} -+ /netbsd/ { print "NETBSD"; exit} -+ /netbsd/ { print "NETBSD"; exit} - /morphos/ { print "MORPHOS"; exit} - /beos/ { print "BEOS"; exit} - /sunos/ { print "SUNOS"; exit} -@@ -1566,6 +1572,7 @@ - /linux/ { print "UNIX"; exit} - /darwin/ { print "OSX"; exit} - /freebsd/ { print "FREEBSD"; exit} -+ /netbsd/ { print "NETBSD"; exit} - /openbsd/ { print "OPENBSD"; exit} - /morphos/ { print "MORPHOS"; exit} - /beos/ { print "BEOS"; exit} -@@ -1579,7 +1586,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" -- log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP" -+ log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP" - exit 1 - fi - -@@ -2320,7 +2327,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]" -- echo " DETECT/UNIX/OSX/FREEBSD/OPENBSD/MORPHOS/" -+ echo " DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/MORPHOS/" - echo " BEOS/SUNOS/CYGWIN/MINGW/OS2/WINCE/PSP" - echo " --endian=ENDIAN set the endian of the HOST (AUTO/LE/BE)" - echo " --revision=rXXXX overwrite the revision detection." diff --git a/games/openttd/patches/patch-ab b/games/openttd/patches/patch-ab deleted file mode 100644 index 4852912440a..00000000000 --- a/games/openttd/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$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)" |