Hi,
Heres an update to openttd.
* updated to 0.7.3
* removed redundant MAKE_ENV stuff
* the remaining MAKE_ENV stuff, i am unsure about. MAINTAINER?
Tested i386
--
Best Regards
Edd Barrett
http://students.dec.bmth.ac.uk/ebarrett
diff -urNax CVS openttd.cvs/Makefile openttd/Makefile
--- openttd.cvs/Makefile Wed Oct 14 16:17:45 2009
+++ openttd/Makefile Wed Oct 14 17:58:42 2009
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.9 2008/06/19 20:40:04 mk Exp $
COMMENT= open source clone of the game Transport Tycoon Deluxe
-DISTNAME= openttd-0.6.1-source
+DISTNAME= openttd-0.7.3-source
PKGNAME= ${DISTNAME:S/-source//}
EXTRACT_SUFX= .tar.bz2
CATEGORIES= games
@@ -30,9 +30,6 @@
MAKE_ENV+= VERBOSE=1 WITH_PNG=1 \
WITH_ZLIB=1 \
- DATA_DIR=share/openttd \
- ICON_DIR=share/pixmaps \
- BINARY_DIR=bin \
PERSONAL_DIR=.openttd
USE_X11= Yes
diff -urNax CVS openttd.cvs/distinfo openttd/distinfo
--- openttd.cvs/distinfo Wed Oct 14 16:17:45 2009
+++ openttd/distinfo Wed Oct 14 16:21:33 2009
@@ -1,5 +1,5 @@
-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
+MD5 (openttd-0.7.3-source.tar.bz2) = /ooAa4vZT9hqnYwqBP51WA==
+RMD160 (openttd-0.7.3-source.tar.bz2) = lFXS4lvAEj+FgwmQbFWFRMfwdtw=
+SHA1 (openttd-0.7.3-source.tar.bz2) = PjTO7IWwDAkYQjeQqtDXLvTNFME=
+SHA256 (openttd-0.7.3-source.tar.bz2) =
7M+hUDjF95kdJpLLGQ80uh/Z3q/48YHdmRReQXkP28M=
+SIZE (openttd-0.7.3-source.tar.bz2) = 4876403
diff -urNax CVS openttd.cvs/patches/patch-Makefile_in
openttd/patches/patch-Makefile_in
--- openttd.cvs/patches/patch-Makefile_in Wed Oct 14 16:17:45 2009
+++ openttd/patches/patch-Makefile_in Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2008/06/19 20:40:04 mk Exp $
---- 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
diff -urNax CVS openttd.cvs/patches/patch-config_lib
openttd/patches/patch-config_lib
--- openttd.cvs/patches/patch-config_lib Wed Oct 14 16:17:45 2009
+++ openttd/patches/patch-config_lib Wed Oct 14 17:27:31 2009
@@ -1,6 +1,6 @@
-$OpenBSD: patch-config_lib,v 1.1 2008/06/19 20:40:04 mk Exp $
---- config.lib.orig Fri Jun 13 21:24:03 2008
-+++ config.lib Fri Jun 13 21:28:19 2008
+$OpenBSD$
+--- config.lib.orig Wed Oct 14 17:27:04 2009
++++ config.lib Wed Oct 14 17:27:25 2009
@@ -26,8 +26,8 @@ set_default() {
revision=""
config_log="config.log"
@@ -9,6 +9,6 @@
- data_dir="share/games/openttd"
+ binary_dir="bin"
+ data_dir="share/openttd"
+ doc_dir="1"
icon_dir="share/pixmaps"
- personal_dir="1"
- shared_dir="1"
+ icon_theme_dir="1"
diff -urNax CVS openttd.cvs/patches/patch-src_fileio_cpp
openttd/patches/patch-src_fileio_cpp
--- openttd.cvs/patches/patch-src_fileio_cpp Thu Jan 1 01:00:00 1970
+++ openttd/patches/patch-src_fileio_cpp Wed Oct 14 17:26:14 2009
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/fileio.cpp.orig Wed Oct 14 17:17:04 2009
++++ src/fileio.cpp Wed Oct 14 17:17:14 2009
+@@ -16,6 +16,7 @@
+ #endif
+ #include <sys/stat.h>
+ #include <algorithm>
++#include <unistd.h>
+
+ /*************************************************/
+ /* FILE IO ROUTINES ******************************/
diff -urNax CVS openttd.cvs/patches/patch-src_settings_cpp
openttd/patches/patch-src_settings_cpp
--- openttd.cvs/patches/patch-src_settings_cpp Wed Oct 14 16:17:45 2009
+++ openttd/patches/patch-src_settings_cpp Wed Oct 14 17:30:52 2009
@@ -1,21 +1,12 @@
-$OpenBSD: patch-src_settings_cpp,v 1.1 2008/06/19 20:40:04 mk Exp $
---- 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),
+$OpenBSD$
+--- src/settings.cpp.orig Wed Oct 14 17:27:48 2009
++++ src/settings.cpp Wed Oct 14 17:30:43 2009
+@@ -1205,7 +1205,7 @@ static const SettingDesc _music_settings[] = {
+ SDT_VAR(MusicFileSettings, effect_vol, SLE_UINT8, S, 0, 127, 0, 127,
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()
+ };
diff -urNax CVS openttd.cvs/pkg/PLIST openttd/pkg/PLIST
--- openttd.cvs/pkg/PLIST Wed Oct 14 16:17:45 2009
+++ openttd/pkg/PLIST Wed Oct 14 17:38:12 2009
@@ -1,40 +1,75 @@
-...@comment $OpenBSD: PLIST,v 1.4 2008/06/19 20:40:04 mk Exp $
+...@comment $OpenBSD$
@bin bin/openttd
+share/applications/
+share/applications/openttd.desktop
share/doc/openttd/
share/doc/openttd/32bpp.txt
+share/doc/openttd/COPYING
share/doc/openttd/HOWTO_compile_lang_files.txt
share/doc/openttd/Manual.txt
share/doc/openttd/OSX_install_instructions.txt
share/doc/openttd/Readme_OS2.txt
share/doc/openttd/Readme_Windows_MSVC.txt
+share/doc/openttd/changelog.txt
share/doc/openttd/elrail.svg
share/doc/openttd/elrail_tile.png
share/doc/openttd/elrail_track.png
+share/doc/openttd/known-bugs.txt
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/obg_format.txt
share/doc/openttd/openttd.6
share/doc/openttd/ottd-colour-palette.gif
share/doc/openttd/ottd-colourtext-palette.png
+share/doc/openttd/readme.txt
share/doc/openttd/tileh.png
share/examples/openttd/
share/examples/openttd/autoexec.scr.example
+share/examples/openttd/game_start.scr.example
share/examples/openttd/on_client.scr.example
share/examples/openttd/on_dedicated.scr.example
share/examples/openttd/on_server.scr.example
+share/examples/openttd/on_server_connect.scr.example
share/examples/openttd/pre_dedicated.scr.example
share/examples/openttd/pre_server.scr.example
share/examples/openttd/readme.txt
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
+share/icons/hicolor/128x128/apps/openttd.png
+share/icons/hicolor/16x16/
+share/icons/hicolor/16x16/apps/
+share/icons/hicolor/16x16/apps/openttd.png
+share/icons/hicolor/256x256/
+share/icons/hicolor/256x256/apps/
+share/icons/hicolor/256x256/apps/openttd.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/openttd.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/openttd.png
+share/icons/hicolor/64x64/
+share/icons/hicolor/64x64/apps/
+share/icons/hicolor/64x64/apps/openttd.png
+share/man/
+share/man/man6/
+...@man share/man/man6/openttd.6.gz
share/openttd/
share/openttd/data/
-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/orig_dos.obg
+share/openttd/data/orig_dos_de.obg
+share/openttd/data/orig_win.obg
share/openttd/gm/
share/openttd/lang/
share/openttd/lang/afrikaans.lng
+share/openttd/lang/arabic_egypt.lng
share/openttd/lang/brazilian_portuguese.lng
share/openttd/lang/bulgarian.lng
share/openttd/lang/catalan.lng
@@ -50,20 +85,24 @@
share/openttd/lang/french.lng
share/openttd/lang/galician.lng
share/openttd/lang/german.lng
+share/openttd/lang/hebrew.lng
share/openttd/lang/hungarian.lng
share/openttd/lang/icelandic.lng
+share/openttd/lang/indonesian.lng
share/openttd/lang/italian.lng
share/openttd/lang/japanese.lng
share/openttd/lang/korean.lng
+share/openttd/lang/latvian.lng
share/openttd/lang/lithuanian.lng
+share/openttd/lang/luxembourgish.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
share/openttd/lang/russian.lng
+share/openttd/lang/serbian.lng
share/openttd/lang/simplified_chinese.lng
share/openttd/lang/slovak.lng
share/openttd/lang/slovenian.lng
@@ -72,8 +111,8 @@
share/openttd/lang/traditional_chinese.lng
share/openttd/lang/turkish.lng
share/openttd/lang/ukrainian.lng
+share/openttd/lang/welsh.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
@@ -83,11 +122,19 @@
share/openttd/media/openttd.48.png
share/openttd/media/openttd.64.png
share/openttd/media/openttd.64.xpm
+share/openttd/media/openttd.desktop
+share/openttd/media/openttd.desktop.in
+share/openttd/media/openttd.desktop.install
share/openttd/media/openttd.ico
-share/openttd/media/palette.act
-share/openttd/scenario/
-share/openttd/scenario/heightmap/
+share/openttd/scripts/
+share/openttd/scripts/autoexec.scr.example
+share/openttd/scripts/game_start.scr.example
+share/openttd/scripts/on_client.scr.example
+share/openttd/scripts/on_dedicated.scr.example
+share/openttd/scripts/on_server.scr.example
+share/openttd/scripts/on_server_connect.scr.example
+share/openttd/scripts/pre_dedicated.scr.example
+share/openttd/scripts/pre_server.scr.example
+share/openttd/scripts/readme.txt
share/pixmaps/
-share/pixmaps/openttd.32.bmp
share/pixmaps/openttd.32.xpm
-share/pixmaps/openttd.64.png
