Update to 1.8.0

7 files changed, 22 insertions, 18 deletions

diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 2429f5f1c1ed..686257f66209 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scummvm-tools
-DISTVERSION=	1.7.0
-PORTREVISION=	3
+DISTVERSION=	1.8.0
 CATEGORIES=	games emulators
 MASTER_SITES=	SF/scummvm/${PORTNAME}/${DISTVERSION}
 
@@ -25,8 +24,8 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_TARGET=
 
-STRIP_FILES=	construct_mohawk create_sjisfnt decine degob dekyra \
-		deriven descumm desword2 extract_mohawk gob_loadcalc \
+STRIP_FILES=	construct_mohawk create_sjisfnt decine decompile degob \
+		dekyra deriven descumm desword2 extract_mohawk gob_loadcalc \
 		scummvm-tools-cli
 
 OPTIONS_DEFINE=	WXGTK DOCS
diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo
index 66a97a2ff41d..ec76bc5dbe94 100644
--- a/games/scummvm-tools/distinfo
+++ b/games/scummvm-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scummvm-tools-1.7.0.tar.bz2) = b4005c3d68e4c5bda4fa9e31f3998fc5b45b7c9381890ed3d5f0b57f77a62589
-SIZE (scummvm-tools-1.7.0.tar.bz2) = 956801
+SHA256 (scummvm-tools-1.8.0.tar.bz2) = f99369e4bcf61e3fa82abff542d8ca93502725f248e62b3799dd342878ccaf73
+SIZE (scummvm-tools-1.8.0.tar.bz2) = 966187
diff --git a/games/scummvm-tools/pkg-plist b/games/scummvm-tools/pkg-plist
index b43801397141..d644550f61d3 100644
--- a/games/scummvm-tools/pkg-plist
+++ b/games/scummvm-tools/pkg-plist
@@ -1,6 +1,7 @@
 bin/construct_mohawk
 bin/create_sjisfnt
 bin/decine
+bin/decompile
 bin/degob
 bin/dekyra
 bin/deriven
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 8bd4a960e429..d541eb0ce4a5 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -2,17 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	scummvm
-DISTVERSION=	1.7.0
-PORTREVISION=	4
+DISTVERSION=	1.8.0
 CATEGORIES=	games emulators
 MASTER_SITES=	SF
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Interpreter for several adventure games
 
+LICENSE= 	GPLv2
+
 USES=		gmake jpeg tar:bzip2
 HAS_CONFIGURE=	yes
 USE_SDL=	sdl
+INSTALLS_ICONS= 	yes
 
 CONFIGURE_ARGS=	--with-sdl-prefix=${LOCALBASE} \
 		--with-jpeg-prefix=${LOCALBASE} \
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 2caab6c5e0d4..7469b8781dda 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scummvm-1.7.0.tar.bz2) = d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66
-SIZE (scummvm-1.7.0.tar.bz2) = 20018016
+SHA256 (scummvm-1.8.0.tar.bz2) = 01ec715e2972b3aedc23e141643acdcff44d0e56638c0df44d931a84fe7e7f38
+SIZE (scummvm-1.8.0.tar.bz2) = 22025706
diff --git a/games/scummvm/files/patch-configure b/games/scummvm/files/patch-configure
index 7c47603d0952..171c04b85ddf 100644
--- a/games/scummvm/files/patch-configure
+++ b/games/scummvm/files/patch-configure
@@ -1,16 +1,16 @@
---- configure.orig	2014-07-11 21:10:26 UTC
+--- configure.orig	2016-04-28 17:55:03 UTC
 +++ configure
-@@ -2300,7 +2300,7 @@ case $_host_os in
- 		LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib"
- 		LIBS="$LIBS -lnds9"
+@@ -2380,7 +2380,7 @@ case $_host_os in
+ 		append_var LDFLAGS "-L$DEVKITPRO/libnds/lib"
+ 		append_var LIBS "-lnds9"
  		;;
 -	freebsd*)
 +	dragonfly*|freebsd*)
- 		LDFLAGS="$LDFLAGS -L/usr/local/lib"
- 		CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+ 		append_var LDFLAGS "-L/usr/local/lib"
+ 		append_var CXXFLAGS "-I/usr/local/include"
  		;;
-@@ -3106,6 +3106,9 @@ case $_host_os in
- 	android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
+@@ -3259,6 +3259,9 @@ case $_host_os in
+ 	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)
  		_posix=yes
  		;;
 +	dragonfly*)
diff --git a/games/scummvm/pkg-plist b/games/scummvm/pkg-plist
index 2cdaaa45dacf..146c4eb20ce1 100644
--- a/games/scummvm/pkg-plist
+++ b/games/scummvm/pkg-plist
@@ -9,7 +9,9 @@ share/applications/scummvm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+share/icons/hicolor/scalable/apps/scummvm.svg
 share/pixmaps/scummvm.xpm
+%%DATADIR%%/access.dat
 %%DATADIR%%/drascula.dat
 %%DATADIR%%/hugo.dat
 %%DATADIR%%/kyra.dat