4 files changed, 34 insertions, 58 deletions

diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
index c676fd3b008c..7cae9e82be4b 100644
--- a/games/tanglet/Makefile
+++ b/games/tanglet/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tanglet
-PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTVERSION=	1.5.1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/tanglet/
@@ -12,19 +11,25 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Single player word finding game based on Boggle
 
 LICENSE=	GPLv3+
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lib desktop-file-utils pkgconfig qmake \
 		shared-mime-info tar:bzip2
+USE_GL=		gl
 USE_QT5=	buildtools_build linguisttools_build core gui widgets
-CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
-		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/tanglet.pro
 
-post-install:
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e '/INSTALLS/s|qm||' ${WRKSRC}/tanglet.pro
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} CREDITS ChangeLog NEWS README \
 		${STAGEDIR}${DOCSDIR})
diff --git a/games/tanglet/distinfo b/games/tanglet/distinfo
index 4dfec0f49f72..de18e49ff3f3 100644
--- a/games/tanglet/distinfo
+++ b/games/tanglet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475947616
-SHA256 (tanglet-1.4.0-src.tar.bz2) = b2b211f1576a8a4a1c314294fcae931ca0b62eec43b85308ce44fe5c5725b805
-SIZE (tanglet-1.4.0-src.tar.bz2) = 8437360
+TIMESTAMP = 1519231808
+SHA256 (tanglet-1.5.1-src.tar.bz2) = eec43ea7373dea7817e3ce773aa09fb4e3d5aa01e10a949484a5b6cd4753256b
+SIZE (tanglet-1.5.1-src.tar.bz2) = 8505556
diff --git a/games/tanglet/files/patch-git_252e8f4 b/games/tanglet/files/patch-git_252e8f4
deleted file mode 100644
index 5364e5859861..000000000000
--- a/games/tanglet/files/patch-git_252e8f4
+++ /dev/null
@@ -1,28 +0,0 @@
-Backport (adapted to 1.4.0) that fixes `make install' with Qt 5.9:
-
-    /usr/local/lib/qt5/bin/qmake -install qinstall /wrkdirs/usr/ports/games/tanglet/work/tanglet-1.4.0/translations/*.qm /wrkdirs/usr/ports/games/tanglet/work/stage/usr/local/share/tanglet/translations/*.qm
-    Error: usage: [-exe] source target
-    *** Error code 3 (ignored)
-
-From 252e8f406a709dadcd915459c4137471df64b04a Mon Sep 17 00:00:00 2001
-From: Graeme Gott <graeme@gottcode.org>
-Date: Sat, 1 Jul 2017 04:59:28 -0400
-Subject: [PATCH] FIXED: Did not always install translations in Linux.
-
----
- src/src.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index 5b8c318..3d20cc3 100644
---- tanglet.pro
-+++ tanglet.pro
-@@ -121,7 +121,7 @@ macx {
- 	appdata.files = icons/tanglet.appdata.xml
- 	appdata.path = $$PREFIX/share/appdata/
- 
--	qm.files = translations/*.qm
-+	qm.files = $$replace(TRANSLATIONS, .ts, .qm)
- 	qm.path = $$PREFIX/share/tanglet/translations
- 	qm.CONFIG += no_check_exist
- 
diff --git a/games/tanglet/pkg-plist b/games/tanglet/pkg-plist
index 3fd69452b30a..b93fa9133367 100644
--- a/games/tanglet/pkg-plist
+++ b/games/tanglet/pkg-plist
@@ -1,6 +1,4 @@
 bin/tanglet
-man/man6/tanglet.6.gz
-share/appdata/tanglet.appdata.xml
 share/applications/tanglet.desktop
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -17,13 +15,14 @@ share/icons/hicolor/48x48/apps/tanglet.png
 share/icons/hicolor/512x512/apps/tanglet.png
 share/icons/hicolor/64x64/apps/tanglet.png
 share/icons/hicolor/scalable/apps/tanglet.svg
+share/man/man6/tanglet.6
+share/metainfo/tanglet.appdata.xml
 share/mime/packages/tanglet.xml
 share/pixmaps/tanglet.xpm
 %%DATADIR%%/data/cs/dice
 %%DATADIR%%/data/cs/dictionary
 %%DATADIR%%/data/cs/name
 %%DATADIR%%/data/cs/words
-%%DATADIR%%/data/de/README
 %%DATADIR%%/data/de/dice
 %%DATADIR%%/data/de/dictionary
 %%DATADIR%%/data/de/name
@@ -52,20 +51,20 @@ share/pixmaps/tanglet.xpm
 %%DATADIR%%/data/nl/dictionary
 %%DATADIR%%/data/nl/name
 %%DATADIR%%/data/nl/words
-%%DATADIR%%/translations/tanglet_cs.qm
-%%DATADIR%%/translations/tanglet_de.qm
-%%DATADIR%%/translations/tanglet_en.qm
-%%DATADIR%%/translations/tanglet_es.qm
-%%DATADIR%%/translations/tanglet_es_CL.qm
-%%DATADIR%%/translations/tanglet_fr.qm
-%%DATADIR%%/translations/tanglet_he.qm
-%%DATADIR%%/translations/tanglet_hu.qm
-%%DATADIR%%/translations/tanglet_it.qm
-%%DATADIR%%/translations/tanglet_lt.qm
-%%DATADIR%%/translations/tanglet_ms.qm
-%%DATADIR%%/translations/tanglet_nl.qm
-%%DATADIR%%/translations/tanglet_pl.qm
-%%DATADIR%%/translations/tanglet_ro.qm
-%%DATADIR%%/translations/tanglet_szl.qm
-%%DATADIR%%/translations/tanglet_tr.qm
-%%DATADIR%%/translations/tanglet_uk.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_cs.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_de.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_en.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_es.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_es_CL.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_fr.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_he.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_hu.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_it.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_lt.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_ms.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_nl.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_pl.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_ro.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_szl.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_tr.qm
+%%NLS%%%%DATADIR%%/translations/tanglet_uk.qm