summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/openttd/Makefile20
-rw-r--r--games/openttd/PLIST8
-rw-r--r--games/openttd/distinfo18
-rw-r--r--games/openttd/patches/patch-aa13
-rw-r--r--games/openttd/patches/patch-ab27
-rw-r--r--games/openttd/patches/patch-ac13
-rw-r--r--games/openttd/patches/patch-ad22
-rw-r--r--games/openttd/patches/patch-ae36
-rw-r--r--games/openttd/patches/patch-af45
-rw-r--r--games/openttd/patches/patch-ag13
-rw-r--r--games/openttd/patches/patch-ah13
-rw-r--r--games/openttd/patches/patch-ai31
-rw-r--r--games/openttd/patches/patch-aj13
13 files changed, 18 insertions, 254 deletions
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 47095f12f3f..e107284d328 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2006/06/12 16:28:10 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/08/10 13:28:37 abs Exp $
-DISTNAME= openttd-0.4.0.1-source
-PKGNAME= openttd-0.4.0.1
-PKGREVISION= 6
+DISTNAME= openttd-0.4.8-RC2-source
+PKGNAME= openttd-0.4.8rc2
CATEGORIES= games x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openttd/}
MAINTAINER= froz@icix.org
HOMEPAGE= http://www.openttd.com/
COMMENT= Open source clone of Transport Tycoon Deluxe
+EXTRACT_SUFX= .tar.bz2
USE_TOOLS+= gmake pkg-config
@@ -23,17 +23,17 @@ MAKE_ENV+= PERSONAL_DIR=.openttd
MAKE_ENV+= WITH_NETWORK=1
MAKE_ENV+= X11BASE=${X11BASE:Q}
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC= ${WRKDIR}/${DISTNAME:S:-source::}
INSTALLATION_DIRS= bin
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/openttd ${PREFIX}/bin
- @${INSTALL_DATA_DIR} ${DATA_DIR}
- @${INSTALL_DATA_DIR} ${DATA_DIR}/lang
- @${INSTALL_DATA_DIR} ${DATA_DIR}/data
- @${INSTALL_DATA_DIR} ${DATA_DIR}/docs
- @${INSTALL_DATA_DIR} ${DATA_DIR}/gm
+ ${INSTALL_DATA_DIR} ${DATA_DIR}
+ ${INSTALL_DATA_DIR} ${DATA_DIR}/lang
+ ${INSTALL_DATA_DIR} ${DATA_DIR}/data
+ ${INSTALL_DATA_DIR} ${DATA_DIR}/docs
+ ${INSTALL_DATA_DIR} ${DATA_DIR}/gm
${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
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index e28e2ba73ea..e5a2b446d68 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2005/09/26 16:28:31 rpaulo Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/08/10 13:28:37 abs Exp $
bin/openttd
share/games/openttd/data/autorail.grf
share/games/openttd/data/canalsw.grf
share/games/openttd/data/dosdummy.grf
+share/games/openttd/data/nsignalsw.grf
share/games/openttd/data/openttd.grf
share/games/openttd/data/opntitle.dat
-share/games/openttd/data/signalsw.grf
share/games/openttd/data/trkfoundw.grf
share/games/openttd/docs/Manual.txt
share/games/openttd/docs/changelog.txt
@@ -18,6 +18,7 @@ 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/estonian.lng
share/games/openttd/lang/finnish.lng
share/games/openttd/lang/french.lng
share/games/openttd/lang/galician.lng
@@ -25,8 +26,6 @@ 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/latvian.lng
-share/games/openttd/lang/lithuanian.lng
share/games/openttd/lang/norwegian.lng
share/games/openttd/lang/origveh.lng
share/games/openttd/lang/polish.lng
@@ -35,6 +34,7 @@ share/games/openttd/lang/romanian.lng
share/games/openttd/lang/slovak.lng
share/games/openttd/lang/spanish.lng
share/games/openttd/lang/swedish.lng
+share/games/openttd/lang/turkish.lng
@dirrm share/games/openttd/lang
@dirrm share/games/openttd/docs
@unexec ${RMDIR} %D/share/games/openttd/data 2>/dev/null || ${TRUE}
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index 8a422293636..d80ab9db90a 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,15 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/09/11 11:44:29 adrianp Exp $
+$NetBSD: distinfo,v 1.4 2006/08/10 13:28:37 abs Exp $
-SHA1 (openttd-0.4.0.1-source.tar.gz) = 992d3d497161b63cb8de94f34ed63611e23ae08e
-RMD160 (openttd-0.4.0.1-source.tar.gz) = 4bd07812c27cf7a637feaf92ee66ccdff56c6b65
-Size (openttd-0.4.0.1-source.tar.gz) = 2950778 bytes
-SHA1 (patch-aa) = aebea9710752bd4b8a7f5562f0ee49ac8b071d68
-SHA1 (patch-ab) = 1353468886982f88180279319e704a70ace8301f
-SHA1 (patch-ac) = ed02aac0e304c8b32783d0d9e8c5c6c0a0922743
-SHA1 (patch-ad) = edcab881f70c59bf02b6ef434255d8ba0a1852a6
-SHA1 (patch-ae) = fe505481f222ec850cf62dcd7780b47ae655ebb8
-SHA1 (patch-af) = 5eac3df49f155e6640870de59730946c8571ee64
-SHA1 (patch-ag) = 08fffdde2f6fb5bda88f044365f9bc87082e0247
-SHA1 (patch-ah) = 9de971efd8647673a32185dbfc5a5ec2bc294c72
-SHA1 (patch-ai) = 5d7fee67d031eac8b9796d58a8783412df3ac639
-SHA1 (patch-aj) = a6949e266c9b65289d84b7e973481350f4b786aa
+SHA1 (openttd-0.4.8-RC2-source.tar.bz2) = 26351512d98e81fb06d5964683aea8c24c9606f8
+RMD160 (openttd-0.4.8-RC2-source.tar.bz2) = 59a66b05ce563a1c5d12b0f5ebe4bee818c8fe94
+Size (openttd-0.4.8-RC2-source.tar.bz2) = 2211442 bytes
diff --git a/games/openttd/patches/patch-aa b/games/openttd/patches/patch-aa
deleted file mode 100644
index 694b2c81911..00000000000
--- a/games/openttd/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/08 19:06:03 rpaulo Exp $
-
---- makefiledir/Makefile.libdetection.orig 2005-05-16 09:30:32.000000000 +0100
-+++ makefiledir/Makefile.libdetection 2005-09-07 22:45:41.000000000 +0100
-@@ -66,7 +66,7 @@
- WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
-
- # libpng detection
--WITH_PNG:=$(shell libpng-config --version 2>/dev/null)
-+WITH_PNG:=$(shell pkg-config --version libpng12 2>/dev/null)
-
- ifdef WITH_PNG
- # LibPNG depends on Zlib
diff --git a/games/openttd/patches/patch-ab b/games/openttd/patches/patch-ab
deleted file mode 100644
index fe84877584f..00000000000
--- a/games/openttd/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/09/08 19:06:03 rpaulo Exp $
-
---- Makefile.orig 2005-05-21 23:39:44.000000000 +0100
-+++ Makefile 2005-09-07 23:27:16.000000000 +0100
-@@ -458,19 +458,12 @@
- # libpng config
- ifdef WITH_PNG
- CDEFS += -DWITH_PNG
--CFLAGS += $(shell libpng-config --cflags)
-+CFLAGS += $(shell pkg-config --cflags libpng12)
-
--# seems like older libpng versions are broken and need this
--PNGCONFIG_FLAGS = --ldflags --libs
- ifdef STATIC
--ifdef OSX
--# Seems like we need a tiny hack for OSX static to work
--LIBS += $(shell libpng-config --prefix)/lib/libpng.a
--else
--LIBS += $(shell libpng-config --static $(PNGCONFIG_FLAGS))
--endif
-+LIBS += $(shell pkg-config --static libpng12)
- else
--LIBS += $(shell libpng-config --L_opts $(PNGCONFIG_FLAGS))
-+LIBS += $(shell pkg-config --libs libpng12)
- endif
- endif
-
diff --git a/games/openttd/patches/patch-ac b/games/openttd/patches/patch-ac
deleted file mode 100644
index ea6fb1ae6d6..00000000000
--- a/games/openttd/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/09/11 11:44:29 adrianp Exp $
-
---- console_cmds.c.orig 2005-05-20 18:59:24.000000000 +0100
-+++ console_cmds.c
-@@ -1101,7 +1101,7 @@ DEF_CONSOLE_HOOK(ConProcPlayerName)
- SEND_COMMAND(PACKET_CLIENT_SET_NAME)(_network_player_name);
- } else {
- if (NetworkFindName(_network_player_name)) {
-- NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, _network_player_name);
-+ NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", _network_player_name);
- ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name));
- NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
- }
diff --git a/games/openttd/patches/patch-ad b/games/openttd/patches/patch-ad
deleted file mode 100644
index 90076115f5a..00000000000
--- a/games/openttd/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- network.c.orig 2005-05-17 17:01:19.000000000 +0100
-+++ network.c
-@@ -96,7 +96,7 @@ void CDECL NetworkTextMessage(NetworkAct
- StringID TempStr = STR_NULL;
-
- va_start(va, str);
-- vsprintf(buf, str, va);
-+ vsnprintf(buf, lengthof(buf), str, va);
- va_end(va);
-
- switch (action) {
-@@ -507,7 +507,7 @@ void NetworkCloseClient(NetworkClientSta
-
- GetString(str, STR_NETWORK_ERR_CLIENT_GENERAL + errorno);
-
-- NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+ NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
-
- // Inform other clients of this... strange leaving ;)
- FOR_ALL_CLIENTS(new_cs) {
diff --git a/games/openttd/patches/patch-ae b/games/openttd/patches/patch-ae
deleted file mode 100644
index 413b35f541e..00000000000
--- a/games/openttd/patches/patch-ae
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- network_client.c.orig 2005-05-15 19:50:55.000000000 +0100
-+++ network_client.c
-@@ -344,7 +344,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER
- if (ci != NULL) {
- if (playas == ci->client_playas && strcmp(name, ci->client_name) != 0) {
- // Client name changed, display the change
-- NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, name);
-+ NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", name);
- } else if (playas != ci->client_playas) {
- // The player changed from client-player..
- // Do not display that for now
-@@ -665,7 +665,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER
-
- ci = NetworkFindClientInfoFromIndex(index);
- if (ci != NULL) {
-- NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str);
-+ NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str);
-
- // The client is gone, give the NetworkClientInfo free
- ci->client_index = NETWORK_EMPTY_INDEX;
-@@ -683,11 +683,11 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER
- NetworkClientInfo *ci;
-
- index = NetworkRecv_uint16(MY_CLIENT, p);
-- NetworkRecv_string(MY_CLIENT, p, str, 100);
-+ NetworkRecv_string(MY_CLIENT, p, str, lengthof(str));
-
- ci = NetworkFindClientInfoFromIndex(index);
- if (ci != NULL) {
-- NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str);
-+ NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str);
-
- // The client is gone, give the NetworkClientInfo free
- ci->client_index = NETWORK_EMPTY_INDEX;
diff --git a/games/openttd/patches/patch-af b/games/openttd/patches/patch-af
deleted file mode 100644
index 5722ca98192..00000000000
--- a/games/openttd/patches/patch-af
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- network_server.c.orig 2005-05-17 19:22:59.000000000 +0100
-+++ network_server.c
-@@ -159,7 +159,7 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SER
-
- DEBUG(net, 2)("[NET] %s made an error (%s) and his connection is closed", client_name, str);
-
-- NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+ NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
-
- FOR_ALL_CLIENTS(new_cs) {
- if (new_cs->status > STATUS_AUTH && new_cs != cs) {
-@@ -907,7 +907,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
-
- DEBUG(net, 2)("[NET] %s reported an error and is closing his connection (%s)", client_name, str);
-
-- NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+ NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
-
- FOR_ALL_CLIENTS(new_cs) {
- if (new_cs->status > STATUS_AUTH) {
-@@ -932,11 +932,11 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
- return;
- }
-
-- NetworkRecv_string(cs, p, str, 100);
-+ NetworkRecv_string(cs, p, str, lengthof(str));
-
- NetworkGetClientName(client_name, sizeof(client_name), cs);
-
-- NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+ NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
-
- FOR_ALL_CLIENTS(new_cs) {
- if (new_cs->status > STATUS_AUTH) {
-@@ -1111,7 +1111,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
- if (ci != NULL) {
- // Display change
- if (NetworkFindName(client_name)) {
-- NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, client_name);
-+ NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", client_name);
- ttd_strlcpy(ci->client_name, client_name, sizeof(ci->client_name));
- NetworkUpdateClientInfo(ci->client_index);
- }
diff --git a/games/openttd/patches/patch-ag b/games/openttd/patches/patch-ag
deleted file mode 100644
index 4e5eb2be992..00000000000
--- a/games/openttd/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- os2.c.orig 2005-05-15 15:01:35.000000000 +0100
-+++ os2.c
-@@ -642,7 +642,7 @@ static long CDECL MidiSendCommand(const
- va_list va;
- char buf[512];
- va_start(va, cmd);
-- vsprintf(buf, cmd, va);
-+ vsnprintf(buf, sizeof(buf), cmd, va);
- va_end(va);
- return mciSendString(buf, NULL, 0, NULL, 0);
- }
diff --git a/games/openttd/patches/patch-ah b/games/openttd/patches/patch-ah
deleted file mode 100644
index 8fe8451fa6f..00000000000
--- a/games/openttd/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- texteff.c.orig 2005-03-28 13:38:02.000000000 +0100
-+++ texteff.c
-@@ -57,7 +57,7 @@ void CDECL AddTextMessage(uint16 color,
- int length;
-
- va_start(va, message);
-- vsprintf(buf, message, va);
-+ vsnprintf(buf, lengthof(buf), message, va);
- va_end(va);
-
- /* Special color magic */
diff --git a/games/openttd/patches/patch-ai b/games/openttd/patches/patch-ai
deleted file mode 100644
index 35e64a32ca9..00000000000
--- a/games/openttd/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- ttd.c.orig 2005-05-16 17:19:32.000000000 +0100
-+++ ttd.c
-@@ -70,7 +70,7 @@ void CDECL error(const char *s, ...) {
- va_list va;
- char buf[512];
- va_start(va, s);
-- vsprintf(buf, s, va);
-+ vsnprintf(buf, sizeof(buf), s, va);
- va_end(va);
-
- ShowOSErrorBox(buf);
-@@ -86,7 +86,7 @@ void CDECL ShowInfoF(const char *str, ..
- va_list va;
- char buf[1024];
- va_start(va, str);
-- vsprintf(buf, str, va);
-+ vsnprintf(buf, sizeof(buf), str, va);
- va_end(va);
- ShowInfo(buf);
- }
-@@ -99,7 +99,7 @@ char * CDECL str_fmt(const char *str, ..
- char *p;
-
- va_start(va, str);
-- len = vsprintf(buf, str, va);
-+ len = vsnprintf(buf, sizeof(buf), str, va);
- va_end(va);
- p = malloc(len + 1);
- if (p)
diff --git a/games/openttd/patches/patch-aj b/games/openttd/patches/patch-aj
deleted file mode 100644
index 50ee4aaa05e..00000000000
--- a/games/openttd/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- win32.c.orig 2005-05-16 17:19:32.000000000 +0100
-+++ win32.c
-@@ -841,7 +841,7 @@ static long CDECL MidiSendCommand(const
- char buf[512];
-
- va_start(va, cmd);
-- vsprintf(buf, cmd, va);
-+ vsnprintf(buf, sizeof(buf), cmd, va);
- va_end(va);
- return mciSendStringA(buf, NULL, 0, 0);
- }
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 18:31:32 +0000