summaryrefslogtreecommitdiff
path: root/games/openttd
diff options
context:
space:
mode:
Diffstat (limited to 'games/openttd')
-rw-r--r--games/openttd/Makefile5
-rw-r--r--games/openttd/PLIST3
-rw-r--r--games/openttd/distinfo13
-rw-r--r--games/openttd/patches/patch-Makefile.setting.in25
-rw-r--r--games/openttd/patches/patch-Makefile.src.in20
-rw-r--r--games/openttd/patches/patch-ab16
-rw-r--r--games/openttd/patches/patch-src_string.cpp16
7 files changed, 8 insertions, 90 deletions
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 67f85ad9111..892da50b192 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2014/10/07 16:47:25 adam Exp $
+# $NetBSD: Makefile,v 1.55 2014/12/20 21:52:38 ryoon Exp $
-DISTNAME= openttd-1.3.2-source
+DISTNAME= openttd-1.4.4-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 3
CATEGORIES= games x11
MASTER_SITES= http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.xz
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index 45e2e41c3d3..38dcdc64e17 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2013/08/05 19:24:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2014/12/20 21:52:38 ryoon Exp $
bin/openttd
man/man6/openttd.6
share/applications/openttd.desktop
@@ -18,6 +18,7 @@ share/openttd/ai/compat_1.0.nut
share/openttd/ai/compat_1.1.nut
share/openttd/ai/compat_1.2.nut
share/openttd/ai/compat_1.3.nut
+share/openttd/ai/compat_1.4.nut
share/openttd/baseset/no_music.obm
share/openttd/baseset/no_sound.obs
share/openttd/baseset/openttd.grf
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index 7e78ee27fcf..6a303470fb9 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.19 2014/12/11 22:10:04 joerg Exp $
+$NetBSD: distinfo,v 1.20 2014/12/20 21:52:38 ryoon Exp $
-SHA1 (openttd-1.3.2-source.tar.xz) = 82283728e8812acf01e6aff59090de19edb40e5f
-RMD160 (openttd-1.3.2-source.tar.xz) = bfe9c7324debf55ec672b3b25a20af052d1f3f1a
-Size (openttd-1.3.2-source.tar.xz) = 6347104 bytes
-SHA1 (patch-Makefile.setting.in) = 1766a977ec259c443d13d64e16e77295bb2c6802
-SHA1 (patch-Makefile.src.in) = 8b695a1ef030189c2716add7af3fd18298bc1bc7
+SHA1 (openttd-1.4.4-source.tar.xz) = c3aa122cda75162b76cd12dc4586371e841102b3
+RMD160 (openttd-1.4.4-source.tar.xz) = 591ffe69e26e4820af29f8e04ec181d4c5119170
+Size (openttd-1.4.4-source.tar.xz) = 6342508 bytes
SHA1 (patch-aa) = b34cc7e0adf8a91657f1426ff2d888eb7c31bcb2
-SHA1 (patch-ab) = 866cfea4555b8947bcb21e684a288c35f8936ee2
-SHA1 (patch-src_fontcache.cpp) = df4101aa28ad7f0c3ccd371bc864117d928f4b93
-SHA1 (patch-src_string.cpp) = c694d4a44b5cfd766b0f962210b524674b01dfea
diff --git a/games/openttd/patches/patch-Makefile.setting.in b/games/openttd/patches/patch-Makefile.setting.in
deleted file mode 100644
index e63d3002e3a..00000000000
--- a/games/openttd/patches/patch-Makefile.setting.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-Makefile.setting.in,v 1.2 2013/08/05 19:24:35 adam Exp $
-
---- Makefile.setting.in.orig 2013-07-27 15:09:40.000000000 +0000
-+++ Makefile.setting.in
-@@ -9,14 +9,17 @@ SETTINGSGEN = !!SETTINGSGEN!!
- ENDIAN_CHECK = !!ENDIAN_CHECK!!
- SRC_DIR = !!SRC_DIR!!
- CXX_BUILD = !!CXX_BUILD!!
--CFLAGS_BUILD = !!CFLAGS_BUILD!!
--CXXFLAGS_BUILD = !!CXXFLAGS_BUILD!!
--LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
-+CFLAGS_BUILD = !!CFLAGS!! !!CFLAGS_BUILD!!
-+CXXFLAGS_BUILD = !!CXXFLAGS!! !!CXXFLAGS_BUILD!!
-+LDFLAGS_BUILD = !!LDFLAGS!! !!LDFLAGS_BUILD!! !!LIBS!!
- STAGE = !!STAGE!!
- SETTING_OBJS_DIR = !!SETTING_OBJS_DIR!!
-
- ENDIAN_TARGETS := endian_host.h endian_target.h $(ENDIAN_CHECK)
-
-+# Make sure endian_host.h is reachable as if it was in the src/ dir
-+CFLAGS_BUILD += -I $(SETTING_OBJS_DIR)
-+
- # Check if we want to show what we are doing
- ifdef VERBOSE
- Q =
diff --git a/games/openttd/patches/patch-Makefile.src.in b/games/openttd/patches/patch-Makefile.src.in
deleted file mode 100644
index 65862ecb865..00000000000
--- a/games/openttd/patches/patch-Makefile.src.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-Makefile.src.in,v 1.1 2012/04/28 06:56:43 adam Exp $
-
---- Makefile.src.in.orig 2012-04-27 16:50:24.000000000 +0000
-+++ Makefile.src.in
-@@ -12,12 +12,12 @@ CXX_BUILD = !!CXX_BUILD!!
- WINDRES = !!WINDRES!!
- STRIP = !!STRIP!!
- CFLAGS = !!CFLAGS!!
--CFLAGS_BUILD = !!CFLAGS_BUILD!!
-+CFLAGS_BUILD = !!CFLAGS!! !!CFLAGS_BUILD!!
- CXXFLAGS = !!CXXFLAGS!!
--CXXFLAGS_BUILD = !!CXXFLAGS_BUILD!!
-+CXXFLAGS_BUILD = !!CXXFLAGS!! !!CXXFLAGS_BUILD!!
- LIBS = !!LIBS!!
- LDFLAGS = !!LDFLAGS!!
--LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
-+LDFLAGS_BUILD = !!LDFLAGS!! !!LDFLAGS_BUILD!! !!LIBS!!
- ROOT_DIR = !!ROOT_DIR!!
- BIN_DIR = !!BIN_DIR!!
- LANG_DIR = !!LANG_DIR!!
diff --git a/games/openttd/patches/patch-ab b/games/openttd/patches/patch-ab
deleted file mode 100644
index 96af4ea678f..00000000000
--- a/games/openttd/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2013/08/05 19:24:35 adam Exp $
-
---- Makefile.lang.in.orig 2013-07-27 15:09:40.000000000 +0000
-+++ Makefile.lang.in
-@@ -13,9 +13,9 @@ BIN_DIR = !!BIN_DIR!!
- LANGS_SRC = $(shell ls $(LANG_DIR)/*.txt)
- LANGS = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
- CXX_BUILD = !!CXX_BUILD!!
--CFLAGS_BUILD = !!CFLAGS_BUILD!!
-+CFLAGS_BUILD = !!CFLAGS!! !!CFLAGS_BUILD!!
- CXXFLAGS_BUILD= !!CXXFLAGS_BUILD!!
--LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
-+LDFLAGS_BUILD = !!LDFLAGS!! !!LDFLAGS_BUILD!! !!LIBS!!
- STRGEN_FLAGS = !!STRGEN_FLAGS!!
- STAGE = !!STAGE!!
- LANG_SUPPRESS = !!LANG_SUPPRESS!!
diff --git a/games/openttd/patches/patch-src_string.cpp b/games/openttd/patches/patch-src_string.cpp
deleted file mode 100644
index dc3d2f3055b..00000000000
--- a/games/openttd/patches/patch-src_string.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_string.cpp,v 1.1 2012/04/28 06:56:43 adam Exp $
-
-Define Collator when building strgen.
-
---- src/string.cpp.orig 2012-04-27 16:01:34.000000000 +0000
-+++ src/string.cpp
-@@ -29,6 +29,9 @@
- #include <unicode/ustring.h>
- #include "language.h"
- #include "gfx_func.h"
-+#if defined(STRGEN) || defined(SETTINGSGEN)
-+Collator *_current_collator = NULL;
-+#endif
- #endif /* WITH_ICU */
-
- /**