View | Details | Raw Unified | Return to bug 245253
Collapse All | Expand All

(-)Makefile (-7 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	openttd
4
PORTNAME=	openttd
5
DISTVERSION=	1.9.3
5
DISTVERSION=	1.10.0
6
PORTREVISION=	1
7
CATEGORIES=	games
6
CATEGORIES=	games
8
MASTER_SITES=	https://proxy.binaries.openttd.org/openttd-releases/${DISTVERSION}/
7
MASTER_SITES=	https://proxy.binaries.openttd.org/openttd-releases/${DISTVERSION}/
9
DISTNAME=	${PORTNAME}-${DISTVERSION}-source
8
DISTNAME=	${PORTNAME}-${DISTVERSION}-source
Lines 19-26 Link Here
19
USES=		cpe gmake pkgconfig tar:xz
18
USES=		cpe gmake pkgconfig tar:xz
20
HAS_CONFIGURE=	yes
19
HAS_CONFIGURE=	yes
21
CONFIGURE_ENV=	STRIP="${STRIP_CMD} ${STRIP}"
20
CONFIGURE_ENV=	STRIP="${STRIP_CMD} ${STRIP}"
22
CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" \
21
CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}"
23
		--without-libtimidity
24
MAKE_ARGS=	VERBOSE=1
22
MAKE_ARGS=	VERBOSE=1
25
23
26
WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
24
WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
Lines 28-37 Link Here
28
26
29
SUB_FILES=	pkg-message
27
SUB_FILES=	pkg-message
30
28
31
PORTDOCS=	HOWTO_compile_lang_files.txt README.md admin_network.txt \
29
PORTDOCS=	README.md \
32
		changelog.txt elrail.svg elrail_tile.png elrail_track.png \
30
		changelog.txt elrail.svg elrail_tile.png elrail_track.png \
33
		known-bugs.txt landscape.html landscape_externals.html \
31
		known-bugs.txt landscape.html landscape_externals.html \
34
		landscape_grid.html multiplayer.txt obg_format.txt \
32
		landscape_grid.html multiplayer.md obg_format.txt \
35
		obm_format.txt obs_format.txt ottd-colourtext-palette.png \
33
		obm_format.txt obs_format.txt ottd-colourtext-palette.png \
36
		tileh.png
34
		tileh.png
37
35
Lines 68-74 Link Here
68
		libicu-le-hb.so:devel/icu-le-hb \
66
		libicu-le-hb.so:devel/icu-le-hb \
69
		libiculx.so:devel/icu-lx \
67
		libiculx.so:devel/icu-lx \
70
		libfontconfig.so:x11-fonts/fontconfig
68
		libfontconfig.so:x11-fonts/fontconfig
71
USE_SDL=	sdl
69
USE_SDL=	sdl2
72
INSTALLS_ICONS=	yes
70
INSTALLS_ICONS=	yes
73
.endif
71
.endif
74
72
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1568662216
1
TIMESTAMP = 1585743720
2
SHA256 (openttd-1.9.3-source.tar.xz) = 1988e17f5b6f4b8f423c849ef1c579c21f678722ae4440f87b27a5fea6385846
2
SHA256 (openttd-1.10.0-source.tar.xz) = 1ba21aac9a1de98b23f80fee952b4b9c5e2d3cc4ac187f5203730826b3f0e253
3
SIZE (openttd-1.9.3-source.tar.xz) = 6659508
3
SIZE (openttd-1.10.0-source.tar.xz) = 6801228
(-)files/patch-config.lib (-12 / +12 lines)
Lines 1-6 Link Here
1
--- config.lib.orig	2016-04-01 18:33:55 UTC
1
--- config.lib.orig	2020-04-01 08:25:41 UTC
2
+++ config.lib
2
+++ config.lib
3
@@ -816,15 +816,15 @@ check_params() {
3
@@ -810,15 +810,15 @@ check_params() {
4
 	pre_detect_with_lzma=$with_lzma
4
 	pre_detect_with_lzma=$with_lzma
5
 	detect_lzma
5
 	detect_lzma
6
 
6
 
Lines 18-24 Link Here
18
 			log 1 " If you want to compile without lzma use --without-lzma as parameter"
18
 			log 1 " If you want to compile without lzma use --without-lzma as parameter"
19
 			exit
19
 			exit
20
 		fi
20
 		fi
21
@@ -1468,7 +1468,6 @@ make_cflags_and_ldflags() {
21
@@ -1491,7 +1491,6 @@ make_cflags_and_ldflags() {
22
 			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
22
 			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
23
 			CFLAGS="-fomit-frame-pointer $CFLAGS"
23
 			CFLAGS="-fomit-frame-pointer $CFLAGS"
24
 		fi
24
 		fi
Lines 26-37 Link Here
26
 	else
26
 	else
27
 		OBJS_SUBDIR="debug"
27
 		OBJS_SUBDIR="debug"
28
 
28
 
29
@@ -1675,16 +1674,14 @@ make_cflags_and_ldflags() {
29
@@ -1678,16 +1677,14 @@ make_cflags_and_ldflags() {
30
 		fi
30
 		fi
31
 	fi
31
 	fi
32
 
32
 
33
-	if [ -n "$lzma_config" ]; then
33
-	if [ -n "$lzma_config" ]; then
34
-		CFLAGS="$CFLAGS -DWITH_LZMA"
34
-		CFLAGS="$CFLAGS -DWITH_LIBLZMA"
35
-		CFLAGS="$CFLAGS `$lzma_config --cflags | tr '\n\r' '  '`"
35
-		CFLAGS="$CFLAGS `$lzma_config --cflags | tr '\n\r' '  '`"
36
-
36
-
37
-		if [ "$enable_static" != "0" ]; then
37
-		if [ "$enable_static" != "0" ]; then
Lines 44-54 Link Here
44
-			LIBS="$LIBS `$lzma_config --libs | tr '\n\r' '  '`"
44
-			LIBS="$LIBS `$lzma_config --libs | tr '\n\r' '  '`"
45
+			LIBS="$LIBS -llzma"
45
+			LIBS="$LIBS -llzma"
46
 		fi
46
 		fi
47
+		CFLAGS="$CFLAGS -DWITH_LZMA"
47
+		CFLAGS="$CFLAGS -DWITH_LIBLZMA"
48
 	fi
48
 	fi
49
 
49
 
50
 	if [ "$with_lzo2" != "0" ]; then
50
 	if [ "$with_lzo2" != "0" ]; then
51
@@ -2692,6 +2689,10 @@ detect_lzo2() {
51
@@ -2728,6 +2725,10 @@ detect_lzo2() {
52
 	detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h"
52
 	detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h"
53
 }
53
 }
54
 
54
 
Lines 56-65 Link Here
56
+	detect_library "$with_lzma" "lzma" "liblzma.a" "" "lzma.h"
56
+	detect_library "$with_lzma" "lzma" "liblzma.a" "" "lzma.h"
57
+}
57
+}
58
+
58
+
59
 detect_libtimidity() {
59
 detect_fluidsynth() {
60
 	detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1"
60
 	detect_library "$with_fluidsynth" "fluidsynth" "" "" "fluidsynth.h"
61
 }
61
 }
62
@@ -2756,10 +2757,6 @@ detect_pkg_config() {
62
@@ -2792,10 +2793,6 @@ detect_pkg_config() {
63
 	log 1 "checking $2... found"
63
 	log 1 "checking $2... found"
64
 }
64
 }
65
 
65
 
Lines 70-77 Link Here
70
 detect_xdg_basedir() {
70
 detect_xdg_basedir() {
71
 	detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2"
71
 	detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2"
72
 }
72
 }
73
@@ -3523,8 +3520,7 @@ showhelp() {
73
@@ -3528,8 +3525,7 @@ showhelp() {
74
 	echo "  --with-sdl[=\"pkg-config sdl\"]  enables SDL video driver support"
74
 	echo "  --with-sdl[=\"sdl1|sdl2\"]       enables SDL video driver support"
75
 	echo "  --with-zlib[=\"pkg-config zlib\"]"
75
 	echo "  --with-zlib[=\"pkg-config zlib\"]"
76
 	echo "                                 enables zlib support"
76
 	echo "                                 enables zlib support"
77
-	echo "  --with-liblzma[=\"pkg-config liblzma\"]"
77
-	echo "  --with-liblzma[=\"pkg-config liblzma\"]"
(-)pkg-plist (-2 / +4 lines)
Lines 11-16 Link Here
11
%%DATADIR%%/ai/compat_1.7.nut
11
%%DATADIR%%/ai/compat_1.7.nut
12
%%DATADIR%%/ai/compat_1.8.nut
12
%%DATADIR%%/ai/compat_1.8.nut
13
%%DATADIR%%/ai/compat_1.9.nut
13
%%DATADIR%%/ai/compat_1.9.nut
14
%%DATADIR%%/ai/compat_1.10.nut
14
%%DATADIR%%/baseset/no_music.obm
15
%%DATADIR%%/baseset/no_music.obm
15
%%DATADIR%%/baseset/no_sound.obs
16
%%DATADIR%%/baseset/no_sound.obs
16
%%DATADIR%%/baseset/openttd.grf
17
%%DATADIR%%/baseset/openttd.grf
Lines 32-37 Link Here
32
%%DATADIR%%/game/compat_1.7.nut
33
%%DATADIR%%/game/compat_1.7.nut
33
%%DATADIR%%/game/compat_1.8.nut
34
%%DATADIR%%/game/compat_1.8.nut
34
%%DATADIR%%/game/compat_1.9.nut
35
%%DATADIR%%/game/compat_1.9.nut
36
%%DATADIR%%/game/compat_1.10.nut
35
%%DATADIR%%/lang/afrikaans.lng
37
%%DATADIR%%/lang/afrikaans.lng
36
%%DATADIR%%/lang/arabic_egypt.lng
38
%%DATADIR%%/lang/arabic_egypt.lng
37
%%DATADIR%%/lang/basque.lng
39
%%DATADIR%%/lang/basque.lng
Lines 97-106 Link Here
97
%%DATADIR%%/scripts/pre_dedicated.scr.example
99
%%DATADIR%%/scripts/pre_dedicated.scr.example
98
%%DATADIR%%/scripts/pre_server.scr.example
100
%%DATADIR%%/scripts/pre_server.scr.example
99
%%DATADIR%%/scripts/readme.txt
101
%%DATADIR%%/scripts/readme.txt
102
share/icons/hicolor/128x128/apps/openttd.png
100
share/icons/hicolor/16x16/apps/openttd.png
103
share/icons/hicolor/16x16/apps/openttd.png
104
share/icons/hicolor/256x256/apps/openttd.png
101
share/icons/hicolor/32x32/apps/openttd.png
105
share/icons/hicolor/32x32/apps/openttd.png
102
share/icons/hicolor/48x48/apps/openttd.png
106
share/icons/hicolor/48x48/apps/openttd.png
103
share/icons/hicolor/64x64/apps/openttd.png
107
share/icons/hicolor/64x64/apps/openttd.png
104
share/icons/hicolor/128x128/apps/openttd.png
105
share/icons/hicolor/256x256/apps/openttd.png
106
share/pixmaps/openttd.32.xpm
108
share/pixmaps/openttd.32.xpm

Return to bug 245253