3 files changed, 86 insertions, 99 deletions

diff --git a/games/tali/Makefile b/games/tali/Makefile
index 55d636e4d1ca..5ed9dfdf9148 100644
--- a/games/tali/Makefile
+++ b/games/tali/Makefile
@@ -1,9 +1,8 @@
 # Created by: FreeBSD GNOME Team <gnome@freebsd.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/games/tali/Makefile 19989 2014-10-18 09:53:56Z gusi $
 
 PORTNAME=	tali
-PORTVERSION=	3.14.0
+PORTVERSION=	3.16.1
 CATEGORIES=	games gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,6 +12,8 @@ COMMENT=	Gnome tali
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
+PORTSCOUT=	limitw:1,even
+
 USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_GNOME=	gtk30 intlhack librsvg2 libxml2:build
 INSTALLS_ICONS=	yes
diff --git a/games/tali/distinfo b/games/tali/distinfo
index b06af2bd0537..269233161708 100644
--- a/games/tali/distinfo
+++ b/games/tali/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/tali-3.14.0.tar.xz) = 81f15fcab820d384d02cd39033f2931cd15926f5a39d8c02766584d3b1b2f939
-SIZE (gnome3/tali-3.14.0.tar.xz) = 2835264
+SHA256 (gnome3/tali-3.16.1.tar.xz) = af99dc362bd1031625948b70b76515a584fa64a7cffe389f2d1f8d87637f8e81
+SIZE (gnome3/tali-3.16.1.tar.xz) = 1503552
diff --git a/games/tali/pkg-plist b/games/tali/pkg-plist
index ba908d8151fa..35e1d98a69d5 100644
--- a/games/tali/pkg-plist
+++ b/games/tali/pkg-plist
@@ -2,99 +2,84 @@ bin/tali
 man/man6/tali.6.gz
 share/appdata/tali.appdata.xml
 share/applications/tali.desktop
-@unexec [ -s %D/share/games/gtali.Colors.scores ] || rm -f %D/share/games/gtali.Colors.scores
-@unexec [ -s %D/share/games/gtali.Regular.scores ] || rm -f %D/share/games/gtali.Regular.scores
-share/help/C/tali/index.docbook
+share/help/C/tali/game-settings.page
+share/help/C/tali/index.page
+share/help/C/tali/keyboard-shortcuts.page
 share/help/C/tali/legal.xml
-share/help/C/tali/figures/mainwindow.png
-share/help/C/tali/figures/preferences.png
-share/help/ca/tali/index.docbook
-share/help/ca/tali/legal.xml
-share/help/ca/tali/figures/mainwindow.png
-share/help/ca/tali/figures/preferences.png
-share/help/cs/tali/index.docbook
+share/help/C/tali/media/logo.png
+share/help/C/tali/media/logo32.png
+share/help/C/tali/scores.page
+share/help/C/tali/settings.page
+share/help/C/tali/start-game.page
+share/help/cs/tali/game-settings.page
+share/help/cs/tali/index.page
+share/help/cs/tali/keyboard-shortcuts.page
 share/help/cs/tali/legal.xml
-share/help/cs/tali/figures/mainwindow.png
-share/help/cs/tali/figures/preferences.png
-share/help/da/tali/index.docbook
-share/help/da/tali/legal.xml
-share/help/da/tali/figures/mainwindow.png
-share/help/da/tali/figures/preferences.png
-share/help/de/tali/index.docbook
+share/help/cs/tali/media/logo.png
+share/help/cs/tali/media/logo32.png
+share/help/cs/tali/scores.page
+share/help/cs/tali/settings.page
+share/help/cs/tali/start-game.page
+share/help/de/tali/game-settings.page
+share/help/de/tali/index.page
+share/help/de/tali/keyboard-shortcuts.page
 share/help/de/tali/legal.xml
-share/help/de/tali/figures/mainwindow.png
-share/help/de/tali/figures/preferences.png
-share/help/el/tali/index.docbook
+share/help/de/tali/media/logo.png
+share/help/de/tali/media/logo32.png
+share/help/de/tali/scores.page
+share/help/de/tali/settings.page
+share/help/de/tali/start-game.page
+share/help/el/tali/game-settings.page
+share/help/el/tali/index.page
+share/help/el/tali/keyboard-shortcuts.page
 share/help/el/tali/legal.xml
-share/help/el/tali/figures/mainwindow.png
-share/help/el/tali/figures/preferences.png
-share/help/en_GB/tali/index.docbook
-share/help/en_GB/tali/legal.xml
-share/help/en_GB/tali/figures/mainwindow.png
-share/help/en_GB/tali/figures/preferences.png
-share/help/es/tali/index.docbook
+share/help/el/tali/media/logo.png
+share/help/el/tali/media/logo32.png
+share/help/el/tali/scores.page
+share/help/el/tali/settings.page
+share/help/el/tali/start-game.page
+share/help/es/tali/game-settings.page
+share/help/es/tali/index.page
+share/help/es/tali/keyboard-shortcuts.page
 share/help/es/tali/legal.xml
-share/help/es/tali/figures/mainwindow.png
-share/help/es/tali/figures/preferences.png
-share/help/eu/tali/index.docbook
-share/help/eu/tali/legal.xml
-share/help/eu/tali/figures/mainwindow.png
-share/help/eu/tali/figures/preferences.png
-share/help/fr/tali/index.docbook
+share/help/es/tali/media/logo.png
+share/help/es/tali/media/logo32.png
+share/help/es/tali/scores.page
+share/help/es/tali/settings.page
+share/help/es/tali/start-game.page
+share/help/fr/tali/game-settings.page
+share/help/fr/tali/index.page
+share/help/fr/tali/keyboard-shortcuts.page
 share/help/fr/tali/legal.xml
-share/help/fr/tali/figures/mainwindow.png
-share/help/fr/tali/figures/preferences.png
-share/help/gl/tali/index.docbook
-share/help/gl/tali/legal.xml
-share/help/gl/tali/figures/mainwindow.png
-share/help/gl/tali/figures/preferences.png
-share/help/it/tali/index.docbook
-share/help/it/tali/legal.xml
-share/help/it/tali/figures/mainwindow.png
-share/help/it/tali/figures/preferences.png
-share/help/oc/tali/index.docbook
-share/help/oc/tali/legal.xml
-share/help/oc/tali/figures/mainwindow.png
-share/help/oc/tali/figures/preferences.png
-share/help/pt_BR/tali/index.docbook
-share/help/pt_BR/tali/legal.xml
-share/help/pt_BR/tali/figures/mainwindow.png
-share/help/pt_BR/tali/figures/preferences.png
-share/help/ru/tali/figures/mainwindow.png
-share/help/ru/tali/figures/preferences.png
-share/help/ru/tali/index.docbook
+share/help/fr/tali/media/logo.png
+share/help/fr/tali/media/logo32.png
+share/help/fr/tali/scores.page
+share/help/fr/tali/settings.page
+share/help/fr/tali/start-game.page
+share/help/hu/tali/game-settings.page
+share/help/hu/tali/index.page
+share/help/hu/tali/keyboard-shortcuts.page
+share/help/hu/tali/legal.xml
+share/help/hu/tali/media/logo.png
+share/help/hu/tali/media/logo32.png
+share/help/hu/tali/scores.page
+share/help/hu/tali/settings.page
+share/help/hu/tali/start-game.page
+share/help/ru/tali/game-settings.page
+share/help/ru/tali/index.page
+share/help/ru/tali/keyboard-shortcuts.page
 share/help/ru/tali/legal.xml
-share/help/sl/tali/index.docbook
-share/help/sl/tali/legal.xml
-share/help/sl/tali/figures/mainwindow.png
-share/help/sl/tali/figures/preferences.png
-share/help/sr/tali/index.docbook
-share/help/sr/tali/legal.xml
-share/help/sr/tali/figures/mainwindow.png
-share/help/sr/tali/figures/preferences.png
-share/help/sr@latin/tali/index.docbook
-share/help/sr@latin/tali/legal.xml
-share/help/sr@latin/tali/figures/mainwindow.png
-share/help/sr@latin/tali/figures/preferences.png
-share/help/sv/tali/index.docbook
-share/help/sv/tali/legal.xml
-share/help/sv/tali/figures/mainwindow.png
-share/help/sv/tali/figures/preferences.png
-share/help/zh_CN/tali/index.docbook
-share/help/zh_CN/tali/legal.xml
-share/help/zh_CN/tali/figures/mainwindow.png
-share/help/zh_CN/tali/figures/preferences.png
-share/icons/HighContrast/16x16/apps/tali.png
-share/icons/HighContrast/22x22/apps/tali.png
-share/icons/HighContrast/24x24/apps/tali.png
-share/icons/HighContrast/256x256/apps/tali.png
-share/icons/HighContrast/32x32/apps/tali.png
-share/icons/HighContrast/48x48/apps/tali.png
+share/help/ru/tali/media/logo.png
+share/help/ru/tali/media/logo32.png
+share/help/ru/tali/scores.page
+share/help/ru/tali/settings.page
+share/help/ru/tali/start-game.page
 share/icons/hicolor/16x16/apps/tali.png
 share/icons/hicolor/22x22/apps/tali.png
 share/icons/hicolor/24x24/apps/tali.png
 share/icons/hicolor/32x32/apps/tali.png
 share/icons/hicolor/48x48/apps/tali.png
+share/icons/hicolor/symbolic/apps/tali-symbolic.svg
 share/icons/hicolor/scalable/apps/tali.svg
 share/locale/af/LC_MESSAGES/tali.mo
 share/locale/am/LC_MESSAGES/tali.mo
@@ -107,6 +92,7 @@ share/locale/bg/LC_MESSAGES/tali.mo
 share/locale/bn/LC_MESSAGES/tali.mo
 share/locale/bn_IN/LC_MESSAGES/tali.mo
 share/locale/br/LC_MESSAGES/tali.mo
+share/locale/bs/LC_MESSAGES/tali.mo
 share/locale/ca/LC_MESSAGES/tali.mo
 share/locale/ca@valencia/LC_MESSAGES/tali.mo
 share/locale/cs/LC_MESSAGES/tali.mo
@@ -183,17 +169,17 @@ share/locale/xh/LC_MESSAGES/tali.mo
 share/locale/zh_CN/LC_MESSAGES/tali.mo
 share/locale/zh_HK/LC_MESSAGES/tali.mo
 share/locale/zh_TW/LC_MESSAGES/tali.mo
-share/tali/gnome-dice-1.svg
-share/tali/gnome-dice-2.svg
-share/tali/gnome-dice-3.svg
-share/tali/gnome-dice-4.svg
-share/tali/gnome-dice-5.svg
-share/tali/gnome-dice-6.svg
-share/tali/gnome-dice-none.svg
-share/tali/kismet-none.svg
-share/tali/kismet1.svg
-share/tali/kismet2.svg
-share/tali/kismet3.svg
-share/tali/kismet4.svg
-share/tali/kismet5.svg
-share/tali/kismet6.svg
+%%DATADIR%%/gnome-dice-1.svg
+%%DATADIR%%/gnome-dice-2.svg
+%%DATADIR%%/gnome-dice-3.svg
+%%DATADIR%%/gnome-dice-4.svg
+%%DATADIR%%/gnome-dice-5.svg
+%%DATADIR%%/gnome-dice-6.svg
+%%DATADIR%%/gnome-dice-none.svg
+%%DATADIR%%/kismet-none.svg
+%%DATADIR%%/kismet1.svg
+%%DATADIR%%/kismet2.svg
+%%DATADIR%%/kismet3.svg
+%%DATADIR%%/kismet4.svg
+%%DATADIR%%/kismet5.svg
+%%DATADIR%%/kismet6.svg