cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to openttd-1.10.0

Browse Source 
ok maintainer bentley@
This commit is contained in:
solene 2020-04-07 15:13:34 +00:00
parent cb56040188
commit 3ee83a3258
6 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
games/openttd/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.66 2020/02/12 10:23:36 cwen Exp $
# $OpenBSD: Makefile,v 1.67 2020/04/07 15:13:34 solene Exp $
COMMENT= open source clone of the game Transport Tycoon Deluxe
V = 1.9.3
V = 1.10.0
DISTNAME = openttd-$V-source
PKGNAME = openttd-$V
REVISION = 1
CATEGORIES= games
@ -16,7 +15,7 @@ MAINTAINER = Anthony J. Bentley <anthony@anjbe.name>
# GPLv2 only
PERMIT_PACKAGE= Yes
WANTLIB += SDL c fluidsynth fontconfig freetype icudata icui18n icuuc
WANTLIB += SDL2 c fluidsynth fontconfig freetype icudata icui18n icuuc
WANTLIB += lzma lzo2 m png pthread ${COMPILER_LIBCXX} xdg-basedir z
COMPILER = base-clang ports-gcc base-gcc
@ -28,7 +27,7 @@ DIST_SUBDIR = openttd
LIB_DEPENDS= archivers/lzo2 \
audio/fluidsynth \
devel/sdl \
devel/sdl2 \
graphics/png \
textproc/icu4c \
archivers/xz \
@ -52,7 +51,6 @@ CONFIGURE_ARGS+= --prefix-dir=${PREFIX} \
--with-png \
--with-zlib \
--without-allegro \
--without-libtimidity \
--CFLAGS_BUILD="${CFLAGS}" \
--disable-strip

4
games/openttd/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (openttd/openttd-1.9.3-source.tar.xz) = GYjhf1tvS49CPISe8cV5wh9nhyKuRED4eyel/qY4WEY=
SIZE (openttd/openttd-1.9.3-source.tar.xz) = 6659508
SHA256 (openttd/openttd-1.10.0-source.tar.xz) = G6IarJod6Ysj+A/ulStLnF4tPMSsGH9SA3MIJrPw4lM=
SIZE (openttd/openttd-1.10.0-source.tar.xz) = 6801228

6
games/openttd/patches/patch-Makefile_bundle_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile_bundle_in,v 1.7 2018/06/26 06:20:41 bentley Exp $
$OpenBSD: patch-Makefile_bundle_in,v 1.8 2020/04/07 15:13:34 solene Exp $
Don't gzip(1) the manual page.
Index: Makefile.bundle.in
--- Makefile.bundle.in.orig
+++ Makefile.bundle.in
@@ -77,7 +77,6 @@ endif
@@ -75,7 +75,6 @@ endif
ifdef MAN_DIR
$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
$(Q)cp "$(ROOT_DIR)/docs/openttd.6" "$(BUNDLE_DIR)/man/"
@ -13,7 +13,7 @@ Index: Makefile.bundle.in
endif
$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
$(Q)cp "$(ROOT_DIR)/media/openttd."*.png "$(BUNDLE_DIR)/media/"
@@ -219,7 +218,7 @@ endif
@@ -211,7 +210,7 @@ endif
ifdef MAN_DIR
ifndef DO_NOT_INSTALL_MAN
$(Q)install -d "$(INSTALL_MAN_DIR)"

10
games/openttd/patches/patch-config_lib
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-config_lib,v 1.6 2019/04/20 00:33:32 bentley Exp $
$OpenBSD: patch-config_lib,v 1.7 2020/04/07 15:13:34 solene Exp $
Don't build with -O1. The reason they add it is irrevelant to OpenBSD anyway.
Index: config.lib
--- config.lib.orig
+++ config.lib
@@ -1566,7 +1566,7 @@ make_cflags_and_ldflags() {
@@ -1525,7 +1525,7 @@ make_cflags_and_ldflags() {
cc_build_is_gcc=`basename "$cc_build" | grep "gcc" 2>/dev/null`
if [ -n "$cc_build_is_gcc" ]; then
# Just add -O1 to the tools needed for building.
- CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2 -O1"
+ CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2"
fi
fi
if [ "$os" = "MINGW" ]; then
# Prevent undefined references when _FORTIFY_SOURCE > 0
LDFLAGS_BUILD="$LDFLAGS_BUILD -fstack-protector"

9
games/openttd/patches/patch-src_string_func_h
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-src_string_func_h,v 1.3 2015/04/15 01:39:16 bentley Exp $
$OpenBSD: patch-src_string_func_h,v 1.4 2020/04/07 15:13:34 solene Exp $
Don't use openttd's internal copy of strcasestr().
--- src/string_func.h.orig Thu Apr 2 21:51:26 2015
+++ src/string_func.h Thu Apr 2 21:54:19 2015
@@ -250,7 +250,7 @@ static inline bool IsWhitespace(WChar c)
Index: src/string_func.h
--- src/string_func.h.orig
+++ src/string_func.h
@@ -248,7 +248,7 @@ static inline bool IsWhitespace(WChar c)
#endif
/* strcasestr is available for _GNU_SOURCE, BSD and some Apple */

25
games/openttd/pkg/PLIST
View File

@ -1,16 +1,16 @@
@comment $OpenBSD: PLIST,v 1.30 2019/04/20 00:33:32 bentley Exp $
@comment $OpenBSD: PLIST,v 1.31 2020/04/07 15:13:34 solene Exp $
@bin bin/openttd
@man man/man6/openttd.6
share/applications/openttd.desktop
share/doc/openttd/
share/doc/openttd/COPYING
share/doc/openttd/HOWTO_compile_lang_files.txt
share/doc/openttd/COPYING.md
share/doc/openttd/README.md
share/doc/openttd/Readme_OS2.txt
share/doc/openttd/Readme_Windows_MSVC.md
share/doc/openttd/admin_network.txt
share/doc/openttd/admin_network.md
share/doc/openttd/changelog.txt
share/doc/openttd/desync.txt
share/doc/openttd/compiling_lang_files.md
share/doc/openttd/debugging_desyncs.md
share/doc/openttd/desync.md
share/doc/openttd/directory_structure.md
share/doc/openttd/elrail.svg
share/doc/openttd/elrail_tile.png
share/doc/openttd/elrail_track.png
@ -18,8 +18,9 @@ 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/linkgraph.txt
share/doc/openttd/multiplayer.txt
share/doc/openttd/linkgraph.md
share/doc/openttd/logging_and_performance_metrics.md
share/doc/openttd/multiplayer.md
share/doc/openttd/obg_format.txt
share/doc/openttd/obm_format.txt
share/doc/openttd/obs_format.txt
@ -50,6 +51,7 @@ share/openttd/ai/
share/openttd/ai/compat_0.7.nut
share/openttd/ai/compat_1.0.nut
share/openttd/ai/compat_1.1.nut
share/openttd/ai/compat_1.10.nut
share/openttd/ai/compat_1.2.nut
share/openttd/ai/compat_1.3.nut
share/openttd/ai/compat_1.4.nut
@ -73,6 +75,7 @@ share/openttd/baseset/orig_win.obg
share/openttd/baseset/orig_win.obm
share/openttd/baseset/orig_win.obs
share/openttd/game/
share/openttd/game/compat_1.10.nut
share/openttd/game/compat_1.2.nut
share/openttd/game/compat_1.3.nut
share/openttd/game/compat_1.4.nut
@ -186,6 +189,9 @@ share/openttd/media/extra_grf/oneway.png
share/openttd/media/extra_grf/openttd.nfo
share/openttd/media/extra_grf/openttdgui.nfo
share/openttd/media/extra_grf/openttdgui.png
share/openttd/media/extra_grf/openttdgui_build_tram.png
share/openttd/media/extra_grf/openttdgui_convert_road.png
share/openttd/media/extra_grf/openttdgui_convert_tram.png
share/openttd/media/extra_grf/openttdgui_group_livery.png
share/openttd/media/extra_grf/orig_extra.nfo
share/openttd/media/extra_grf/palette.nfo
@ -212,6 +218,7 @@ share/openttd/media/extra_grf/sloped_tracks.nfo
share/openttd/media/extra_grf/sloped_tracks.png
share/openttd/media/extra_grf/tramtracks.nfo
share/openttd/media/extra_grf/tramtracks.png
share/openttd/media/extra_grf/tramtracks_bare_depot.png
share/openttd/media/extra_grf/tunnel_portals.nfo
share/openttd/media/extra_grf/tunnel_portals.png
share/openttd/media/openttd.128.png