View | Details | Raw Unified | Return to bug 245741 | Differences between
and this patch

Collapse All | Expand All

(-)games/scummvm/Makefile (-10 / +15 lines)
Lines 2-16 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	scummvm
4
PORTNAME=	scummvm
5
PORTVERSION=	2.1.1
5
PORTVERSION=	2.2.0
6
PORTREVISION=	1
7
CATEGORIES=	games emulators
6
CATEGORIES=	games emulators
8
MASTER_SITES=	http://www.scummvm.org/frs/scummvm/${PORTVERSION}/
7
MASTER_SITES=	https://downloads.scummvm.org/frs/scummvm/${PORTVERSION}/
9
8
10
PATCH_SITES=	https://github.com/scummvm/scummvm/commit/
11
PATCHFILES=	8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch:-p1 \
12
		68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch:-p1
13
14
MAINTAINER=	lme@FreeBSD.org
9
MAINTAINER=	lme@FreeBSD.org
15
COMMENT=	Interpreter for several adventure games
10
COMMENT=	Interpreter for several adventure games
16
11
Lines 19-24 Link Here
19
14
20
LIB_DEPENDS=	libfaad.so:audio/faad \
15
LIB_DEPENDS=	libfaad.so:audio/faad \
21
		libfreetype.so:print/freetype2 \
16
		libfreetype.so:print/freetype2 \
17
		libfribidi.so:converters/fribidi \
22
		libmpeg2.so:multimedia/libmpeg2 \
18
		libmpeg2.so:multimedia/libmpeg2 \
23
		libtheoradec.so:multimedia/libtheora
19
		libtheoradec.so:multimedia/libtheora
24
20
Lines 38-49 Link Here
38
34
39
LDFLAGS+=	-lpthread
35
LDFLAGS+=	-lpthread
40
36
41
OPTIONS_DEFINE=		DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO VORBIS
37
OPTIONS_DEFINE=		A52 CURL DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO VORBIS
42
OPTIONS_DEFAULT=	MP3 MT32EMU PNG VORBIS
38
OPTIONS_DEFAULT=	A52 MP3 MT32EMU PNG VORBIS
43
OPTIONS_SUB=		yes
39
OPTIONS_SUB=		yes
44
40
41
CURL_DESC=	Enable support for Cloud storage
45
MT32EMU_DESC=	MT-32 emulator
42
MT32EMU_DESC=	MT-32 emulator
46
43
44
A52_LIB_DEPENDS=	liba52.so:audio/liba52
45
A52_CONFIGURE_ON=	--with-a52-prefix=${LOCALBASE}
46
A52_CONFIGURE_OFF=	--disable-a52
47
48
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
49
CURL_CONFIGURE_ON=	--with-libcurl-prefix=${LOCALBASE}
50
CURL_CONFIGURE_OFF=	--disable-libcurl
51
47
VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
52
VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
48
			libvorbis.so:audio/libvorbis
53
			libvorbis.so:audio/libvorbis
49
VORBIS_CONFIGURE_ON=	--with-ogg-prefix=${LOCALBASE} \
54
VORBIS_CONFIGURE_ON=	--with-ogg-prefix=${LOCALBASE} \
Lines 80-86 Link Here
80
.endif
85
.endif
81
86
82
post-patch:
87
post-patch:
83
	@${REINPLACE_CMD} -e '/^mandir=/s/datarootdir/prefix/' \
88
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
84
		${WRKSRC}/configure
89
		${WRKSRC}/configure
85
90
86
post-install:
91
post-install:
(-)games/scummvm/distinfo (-7 / +3 lines)
Lines 1-7 Link Here
1
TIMESTAMP = 1581614684
1
TIMESTAMP = 1608146920
2
SHA256 (scummvm-2.1.1.tar.xz) = 5753769356f3396fde1e614b40496c61392a2903c53ca436b721dde58353dca8
2
SHA256 (scummvm-2.2.0.tar.xz) = 1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387
3
SIZE (scummvm-2.1.1.tar.xz) = 27291080
3
SIZE (scummvm-2.2.0.tar.xz) = 63652348
4
SHA256 (8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch) = dc625481aa58fb87a659d33e10c11a86f085b72bf754b43f4c538ceab72f02a9
5
SIZE (8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch) = 977
6
SHA256 (68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch) = 847caba0fd2fedc3bd365a6306539a9665b84f3b0653b771a294415f5450d25b
7
SIZE (68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch) = 1889
(-)games/scummvm/files/patch-configure (-9 / +40 lines)
Lines 1-16 Link Here
1
--- configure.orig	2016-04-28 17:55:03 UTC
1
--- configure.orig	2020-09-13 21:05:37 UTC
2
+++ configure
2
+++ configure
3
@@ -2380,7 +2380,7 @@ case $_host_os in
3
@@ -2947,9 +2947,9 @@ EOF
4
 		append_var LDFLAGS "-L$DEVKITPRO/libnds/lib"
4
 		append_var LIBS "-specs=ds_arm9.specs"
5
 		append_var LIBS "-lnds9"
5
 		append_var LIBS "-lnds9"
6
 		;;
6
 		;;
7
-	freebsd*)
7
-	freebsd* | openbsd*)
8
+	dragonfly*|freebsd*)
8
-		append_var LDFLAGS "-L/usr/local/lib"
9
 		append_var LDFLAGS "-L/usr/local/lib"
9
-		append_var CXXFLAGS "-I/usr/local/include"
10
 		append_var CXXFLAGS "-I/usr/local/include"
10
+	dragonfly* | freebsd* | openbsd*)
11
+		append_var LDFLAGS "-L%%LOCALBASE%%/lib"
12
+		append_var CXXFLAGS "-I%%LOCALBASE%%/include"
11
 		;;
13
 		;;
12
@@ -3259,6 +3259,9 @@ case $_host_os in
14
 	gamecube)
13
 	android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
15
 		_optimization_level=-Os
16
@@ -3920,6 +3920,9 @@ case $_host_os in
17
 	3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | switch | uclinux*)
14
 		_posix=yes
18
 		_posix=yes
15
 		;;
19
 		;;
16
+	dragonfly*)
20
+	dragonfly*)
Lines 19-21 Link Here
19
 	os2-emx*)
23
 	os2-emx*)
20
 		_posix=yes	# FIXME: Really???
24
 		_posix=yes	# FIXME: Really???
21
 		;;
25
 		;;
26
@@ -4059,7 +4062,7 @@ _mak_plugins='
27
 PLUGIN_LDFLAGS		+= -Wl,-T$(srcdir)/backends/plugins/ds/plugin.ld -mthumb-interwork -mfloat-abi=soft
28
 '
29
 		;;
30
-	freebsd* | openbsd*)
31
+	dragonfly* | freebsd* | openbsd*)
32
 		_plugin_prefix="lib"
33
 		_plugin_suffix=".so"
34
 		append_var CXXFLAGS "-fPIC"
35
@@ -4248,7 +4251,7 @@ int main(void) { return 0; }
36
 EOF
37
 			cc_check -lsapi -lole32 && _tts=yes
38
 			;;
39
-		linux* | freebsd* | openbsd*)
40
+		linux* | dragonfly* | freebsd* | openbsd*)
41
 			cat > $TMPC << EOF
42
 #include <speech-dispatcher/libspeechd.h>
43
 int main(void) { return 0; }
44
@@ -5593,7 +5596,7 @@ if test "$_tts" = "no"; then
45
 	echo "no"
46
 else
47
 	case $_host_os in
48
-	linux* | freebsd* | openbsd*)
49
+	linux* | dragonfly* | freebsd* | openbsd*)
50
 		echo "speech dispatcher"
51
 		_tts=yes
52
 		define_in_config_if_yes $_tts 'USE_SPEECH_DISPATCHER'
(-)games/scummvm/pkg-plist (-3 / +5 lines)
Lines 1-7 Link Here
1
bin/scummvm
1
bin/scummvm
2
man/man6/scummvm.6.gz
3
share/applications/scummvm.desktop
2
share/applications/scummvm.desktop
4
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
3
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
4
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
5
%%PORTDOCS%%%%DOCSDIR%%/COPYING
5
%%PORTDOCS%%%%DOCSDIR%%/COPYING
6
%%PORTDOCS%%%%DOCSDIR%%/COPYING.BSD
6
%%PORTDOCS%%%%DOCSDIR%%/COPYING.BSD
7
%%PORTDOCS%%%%DOCSDIR%%/COPYING.FREEFONT
7
%%PORTDOCS%%%%DOCSDIR%%/COPYING.FREEFONT
Lines 10-17 Link Here
10
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
10
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
11
%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
11
%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
12
%%PORTDOCS%%%%DOCSDIR%%/README.md
12
%%PORTDOCS%%%%DOCSDIR%%/README.md
13
share/appdata/scummvm.appdata.xml
14
share/icons/hicolor/scalable/apps/scummvm.svg
13
share/icons/hicolor/scalable/apps/scummvm.svg
14
share/man/man6/scummvm.6.gz
15
share/metainfo/scummvm.appdata.xml
15
share/pixmaps/scummvm.xpm
16
share/pixmaps/scummvm.xpm
16
%%DATADIR%%/access.dat
17
%%DATADIR%%/access.dat
17
%%DATADIR%%/cryomni3d.dat
18
%%DATADIR%%/cryomni3d.dat
Lines 34-38 Link Here
34
%%DATADIR%%/tony.dat
35
%%DATADIR%%/tony.dat
35
%%DATADIR%%/toon.dat
36
%%DATADIR%%/toon.dat
36
%%DATADIR%%/translations.dat
37
%%DATADIR%%/translations.dat
37
%%DATADIR%%/wintermute.zip
38
%%DATADIR%%/ultima.dat
39
%%PNG%%%%DATADIR%%/wintermute.zip
38
%%DATADIR%%/xeen.ccs
40
%%DATADIR%%/xeen.ccs

Return to bug 245741