This is a first stab at an update to 0.6.1 which now has trams and lots
of bugfixes etc. Quickly tested by myself. Since this removes files,
you probably want to apply with -E.
Comments? Nays or yays, or even hurrays? Ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openttd/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 26 Jan 2008 16:32:14 -0000 1.8
+++ Makefile 14 Jun 2008 15:31:23 -0000
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2008/01/26 16:32:14 merdely Exp $
COMMENT= open source clone of the game Transport Tycoon Deluxe
-DISTNAME= openttd-0.5.3-source
-PKGNAME= ${DISTNAME:S/-source//}p0
+DISTNAME= openttd-0.6.1-source
+PKGNAME= ${DISTNAME:S/-source//}
EXTRACT_SUFX= .tar.bz2
CATEGORIES= games
@@ -23,7 +23,12 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE
LIB_DEPENDS= SDL::devel/sdl \
png.>=2::graphics/png
-MAKE_ENV+= INSTALL=1 USE_HOMEDIR=1 VERBOSE=1 WITH_PNG=1 \
+CONFIGURE_STYLE= simple
+
+CONFIGURE_ARGS+= --prefix-dir=${PREFIX} \
+ --install-dir=${WRKINST}
+
+MAKE_ENV+= VERBOSE=1 WITH_PNG=1 \
WITH_ZLIB=1 \
DATA_DIR=share/openttd \
ICON_DIR=share/pixmaps \
@@ -41,12 +46,11 @@ EXAMPLESDIR= ${PREFIX}/share/examples/o
GAMEDIR= ${PREFIX}/share/openttd
post-install:
- ${INSTALL_DATA_DIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
- ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/scripts/* ${EXAMPLESDIR}
- ${INSTALL_DATA_DIR} ${GAMEDIR}
${INSTALL_DATA_DIR} ${GAMEDIR}/media
${INSTALL_DATA} ${WRKSRC}/media/* ${GAMEDIR}/media
-
+ ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${EXAMPLESDIR}
+ ${INSTALL_DATA_DIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
+
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/openttd/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 5 Oct 2007 18:22:22 -0000 1.5
+++ distinfo 14 Jun 2008 15:31:23 -0000
@@ -1,5 +1,5 @@
-MD5 (openttd-0.5.3-source.tar.bz2) = WSwEeQOj5/F/lSefd7ih3Q==
-RMD160 (openttd-0.5.3-source.tar.bz2) = maGdZIZS3YSVLdYZwNSxHBuNE10=
-SHA1 (openttd-0.5.3-source.tar.bz2) = 7SO13mfll7apbszKJklTaVkfHrw=
-SHA256 (openttd-0.5.3-source.tar.bz2) =
aCcL6vOedjyYyd0MEb/9JRBnNrHPX2AVorHb9nwkzPg=
-SIZE (openttd-0.5.3-source.tar.bz2) = 3043644
+MD5 (openttd-0.6.1-source.tar.bz2) = 98DxncygUc0oZBEJ15XyAg==
+RMD160 (openttd-0.6.1-source.tar.bz2) = +sCIp9VM/O43aMHaWseysQuFzb4=
+SHA1 (openttd-0.6.1-source.tar.bz2) = Cc8rAcBjiddeW2KT5T66sdjIs6A=
+SHA256 (openttd-0.6.1-source.tar.bz2) =
19JuQfeKkE6E2/r60PVV5dKaog82iOjWhlpXpGg3CGw=
+SIZE (openttd-0.6.1-source.tar.bz2) = 3690207
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 26 Jan 2008 16:32:14 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2008/01/26 16:32:14 merdely Exp $
---- Makefile.orig Sat Sep 15 05:31:37 2007
-+++ Makefile Wed Jan 23 20:43:53 2008
-@@ -319,7 +319,7 @@ CC_VERSION = $(shell $(CC_TARGET) -dumpversion | cut -
- # GNU make can only test for (in)equality
- # this is a workaround to test for >=
- ifeq ($(shell expr $(CC_VERSION) \>= 29), 1)
-- CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wundef
-+ CFLAGS += -Wall -Wno-multichar -Wsign-compare -Wundef
- CC_CFLAGS += -Wstrict-prototypes
- CFLAGS += -Wwrite-strings -Wpointer-arith
- endif
-@@ -408,7 +408,6 @@ LRT:=
- endif
- endif
-
--CFLAGS += $(BASECFLAGS)
-
- ifdef UNIX
- CDEFS += -DUNIX
-@@ -933,7 +932,7 @@ endif
-
- $(STRGEN): strgen/strgen.c string.c endian_host.h table/control_codes.h
- @echo '===> Compiling and Linking $@'
-- $(Q)$(CC_HOST) $(CFLAGS_HOST) -DSTRGEN strgen/strgen.c string.c -o $@
-+ $(Q)$(CC_HOST) $(CFLAGS) -DSTRGEN strgen/strgen.c string.c -o $@
-
- table/strings.h: lang/english.txt $(STRGEN)
- @echo '===> Generating $@'
-@@ -957,8 +956,6 @@ release: all
- $(Q)cp -R $(TTD) "/t/openttd-$(REV)-morphos/"
- $(Q)cp data/* "/t/openttd-$(REV)-morphos/data/"
- $(Q)cp lang/*.lng "/t/openttd-$(REV)-morphos/lang/"
-- $(Q)-cp scenario/*.scn
"/t/openttd-$(REV)-morphos/scenario/"
-- $(Q)-cp scenario/heightmap/*
"/t/openttd-$(REV)-morphos/scenario/heightmap/"
- $(Q)cp readme.txt
"/t/openttd-$(REV)-morphos/docs/ReadMe"
- $(Q)cp COPYING "/t/openttd-$(REV)-morphos/docs/"
- $(Q)cp changelog.txt
"/t/openttd-$(REV)-morphos/docs/ChangeLog"
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 14 Jun 2008 15:31:23 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- Makefile.in.orig Sat Jun 14 17:04:56 2008
++++ Makefile.in Sat Jun 14 17:06:01 2008
+@@ -264,11 +264,9 @@ install: bundle
+ $(Q)install -d "$(INSTALL_DATA_DIR)/gm"
+ $(Q)install -d "$(INSTALL_DATA_DIR)/data"
+ $(Q)install -d "$(INSTALL_DATA_DIR)/lang"
+- $(Q)install -d "$(INSTALL_DATA_DIR)/docs"
+ $(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)"
+ $(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
+ $(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
+- $(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DATA_DIR)/docs"
+ $(Q)install -m 644 "$(BUNDLE_DIR)/media/"* "$(INSTALL_ICON_DIR)"
+ $(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
+ endif # OSXAPP
Index: patches/patch-config_lib
===================================================================
RCS file: patches/patch-config_lib
diff -N patches/patch-config_lib
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-config_lib 14 Jun 2008 15:31:23 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- config.lib.orig Fri Jun 13 21:24:03 2008
++++ config.lib Fri Jun 13 21:28:19 2008
+@@ -26,8 +26,8 @@ set_default() {
+ revision=""
+ config_log="config.log"
+ prefix_dir="/usr/local"
+- binary_dir="games"
+- data_dir="share/games/openttd"
++ binary_dir="bin"
++ data_dir="share/openttd"
+ icon_dir="share/pixmaps"
+ personal_dir="1"
+ shared_dir="1"
Index: patches/patch-endian_check_c
===================================================================
RCS file: patches/patch-endian_check_c
diff -N patches/patch-endian_check_c
--- patches/patch-endian_check_c 11 Jun 2007 10:56:28 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-endian_check_c,v 1.3 2007/06/11 10:56:28 mk Exp $
---- endian_check.c.orig Tue May 29 14:57:42 2007
-+++ endian_check.c Tue May 29 14:58:01 2007
-@@ -1,6 +1,7 @@
- /* $Id: patch-endian_check_c,v 1.3 2007/06/11 10:56:28 mk Exp $ */
-
- #include <stdio.h>
-+#include <string.h>
-
- // This pretty simple file checks if the system is LITTLE_ENDIAN or BIG_ENDIAN
- // it does that by putting a 1 and a 0 in an array, and read it out as one
Index: patches/patch-settings_c
===================================================================
RCS file: patches/patch-settings_c
diff -N patches/patch-settings_c
--- patches/patch-settings_c 11 Jun 2007 10:56:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-settings_c,v 1.2 2007/06/11 10:56:28 mk Exp $
---- settings.c.orig Tue Apr 10 11:57:35 2007
-+++ settings.c Tue May 29 15:00:57 2007
-@@ -1163,7 +1163,7 @@ static int32 EngineRenewMoneyUpdate(int32 p1)
- /* End - Callback Functions */
-
- #ifndef EXTERNAL_PLAYER
--#define EXTERNAL_PLAYER "timidity"
-+#define EXTERNAL_PLAYER "midiplay"
- #endif
-
- static const SettingDesc _music_settings[] = {
-@@ -1172,7 +1172,7 @@ static const SettingDesc _music_settings[] = {
- SDT_VAR(MusicFileSettings, effect_vol, SLE_UINT8, S, 0, 128, 0, 100,
1, STR_NULL, NULL),
- SDT_LIST(MusicFileSettings, custom_1, SLE_UINT8, S, 0, NULL,
STR_NULL, NULL),
- SDT_LIST(MusicFileSettings, custom_2, SLE_UINT8, S, 0, NULL,
STR_NULL, NULL),
-- SDT_BOOL(MusicFileSettings, playing, S, 0, true,
STR_NULL, NULL),
-+ SDT_BOOL(MusicFileSettings, playing, S, 0, false,
STR_NULL, NULL),
- SDT_BOOL(MusicFileSettings, shuffle, S, 0, false,
STR_NULL, NULL),
- SDT_STR(MusicFileSettings, extmidi, SLE_STRB, S, 0,
EXTERNAL_PLAYER, STR_NULL, NULL),
- SDT_END()
Index: patches/patch-src_settings_cpp
===================================================================
RCS file: patches/patch-src_settings_cpp
diff -N patches/patch-src_settings_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_settings_cpp 14 Jun 2008 15:31:23 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/settings.cpp.orig Fri Jun 13 20:09:13 2008
++++ src/settings.cpp Fri Jun 13 20:10:45 2008
+@@ -1253,7 +1253,7 @@ static int32 ConvertLandscape(const char *value)
+ /* End - Callback Functions */
+
+ #ifndef EXTERNAL_PLAYER
+-#define EXTERNAL_PLAYER "timidity"
++#define EXTERNAL_PLAYER "midiplay"
+ #endif
+
+ static const SettingDesc _music_settings[] = {
+@@ -1262,7 +1262,7 @@ static const SettingDesc _music_settings[] = {
+ SDT_VAR(MusicFileSettings, effect_vol, SLE_UINT8, S, 0, 128, 0, 100,
1, STR_NULL, NULL),
+ SDT_LIST(MusicFileSettings, custom_1, SLE_UINT8, S, 0, NULL,
STR_NULL, NULL),
+ SDT_LIST(MusicFileSettings, custom_2, SLE_UINT8, S, 0, NULL,
STR_NULL, NULL),
+- SDT_BOOL(MusicFileSettings, playing, S, 0, true,
STR_NULL, NULL),
++ SDT_BOOL(MusicFileSettings, playing, S, 0, false,
STR_NULL, NULL),
+ SDT_BOOL(MusicFileSettings, shuffle, S, 0, false,
STR_NULL, NULL),
+ SDT_STR(MusicFileSettings, extmidi, SLE_STRB, S, 0,
EXTERNAL_PLAYER, STR_NULL, NULL),
+ SDT_END()
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/openttd/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 11 Jun 2007 10:56:28 -0000 1.3
+++ pkg/PLIST 14 Jun 2008 15:31:23 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2007/06/11 10:56:28 mk Exp $
-bin/openttd
[EMAIL PROTECTED] bin/openttd
share/doc/openttd/
+share/doc/openttd/32bpp.txt
share/doc/openttd/HOWTO_compile_lang_files.txt
-share/doc/openttd/Howto_compile_lng_files_from_CLI.txt
share/doc/openttd/Manual.txt
share/doc/openttd/OSX_install_instructions.txt
share/doc/openttd/Readme_OS2.txt
@@ -11,6 +11,7 @@ share/doc/openttd/elrail.svg
share/doc/openttd/elrail_tile.png
share/doc/openttd/elrail_track.png
share/doc/openttd/landscape.html
+share/doc/openttd/landscape_externals.html
share/doc/openttd/landscape_grid.html
share/doc/openttd/multiplayer.txt
share/doc/openttd/openttd.6
@@ -27,26 +28,22 @@ share/examples/openttd/pre_server.scr.ex
share/examples/openttd/readme.txt
share/openttd/
share/openttd/data/
-share/openttd/data/2ccmap.grf
-share/openttd/data/airports.grf
-share/openttd/data/autorail.grf
-share/openttd/data/canalsw.grf
-share/openttd/data/dosdummy.grf
-share/openttd/data/elrailsw.grf
-share/openttd/data/nsignalsw.grf
-share/openttd/data/openttd.grf
+share/openttd/data/generictrams_v0.4.grf
+share/openttd/data/openttdd.grf
+share/openttd/data/openttdw.grf
share/openttd/data/opntitle.dat
-share/openttd/data/trkfoundw.grf
share/openttd/gm/
share/openttd/lang/
-share/openttd/lang/american.lng
+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
@@ -62,6 +59,7 @@ 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
@@ -75,6 +73,7 @@ share/openttd/lang/traditional_chinese.l
share/openttd/lang/turkish.lng
share/openttd/lang/ukrainian.lng
share/openttd/media/
+share/openttd/media/mainicon.ico
share/openttd/media/openttd.128.png
share/openttd/media/openttd.16.png
share/openttd/media/openttd.256.png
@@ -84,6 +83,7 @@ share/openttd/media/openttd.32.xpm
share/openttd/media/openttd.48.png
share/openttd/media/openttd.64.png
share/openttd/media/openttd.64.xpm
+share/openttd/media/openttd.ico
share/openttd/media/palette.act
share/openttd/scenario/
share/openttd/scenario/heightmap/
--
`Real stupidity beats artificial intelligence every time.'
-- (Terry Pratchett, Hogfather)
