3 files changed, 46 insertions, 45 deletions

diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
index 268c14e66312..0660aa9ae201 100644
--- a/games/tanglet/Makefile
+++ b/games/tanglet/Makefile
@@ -2,46 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	tanglet
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.1
+DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
-MASTER_SITES=	http://gottcode.org/${PORTNAME}/
-EXTRACT_SUFX=	-src.tar.bz2
+MASTER_SITES=	http://gottcode.org/tanglet/
 
 MAINTAINER=	ports@FreeBSD.org
-
 COMMENT=	Single player word finding game based on Boggle
 
-LICENSE=	GPLv3 # or later
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		qmake tar:bzip2
-USE_QT4=	moc_build rcc_build gui iconengines_run imageformats_run
-LDFLAGS+=	-lz
-INSTALLS_ICONS=	yes
-
-PORTDOCS=	CREDITS ChangeLog NEWS
+LICENSE=	GPLv3 # (or later)
 
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.options.mk>
+USES=		compiler:c++11-lib qmake tar:bzip2
+USE_QT5=	buildtools_build widgets
+INSTALLS_ICONS=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -i '' -e '/PKGCONFIG += zlib/d' \
-		${WRKSRC}/${PORTNAME}.pro
-
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -i '' '/qm.files/,/qm.path/s/^/#/' \
-		${WRKSRC}/${PORTNAME}.pro
-.endif
+	@${REINPLACE_CMD} -e \
+		's|c++0x|c++11| ; \
+		 /link_pkgconfig/d ; \
+		 s|PKGCONFIG|LIBS| ; \
+		 s|zlib|-lz| ; \
+		 s|share/man|man|' ${WRKSRC}/tanglet.pro
+	@${REINPLACE_CMD} -e \
+		's|std::lround|lround|' ${WRKSRC}/src/letter.cpp
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
-
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} CREDITS ChangeLog NEWS README \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/games/tanglet/distinfo b/games/tanglet/distinfo
index fdceeacb8d70..a451cd8c2c47 100644
--- a/games/tanglet/distinfo
+++ b/games/tanglet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tanglet-1.2.2-src.tar.bz2) = c90d5c36b7e6cca54cdc001c7eecfb333795add16e6ae01f100026c61f4a84da
-SIZE (tanglet-1.2.2-src.tar.bz2) = 8102968
+SHA256 (tanglet-1.3.1-src.tar.bz2) = d0eab174eaa8cdd5f3499ae275db4cd720172ef28346273db7f5988f2304e0d8
+SIZE (tanglet-1.3.1-src.tar.bz2) = 8461603
diff --git a/games/tanglet/pkg-plist b/games/tanglet/pkg-plist
index 8f49100ed512..aeddb32268a9 100644
--- a/games/tanglet/pkg-plist
+++ b/games/tanglet/pkg-plist
@@ -1,5 +1,12 @@
 bin/tanglet
+man/man6/tanglet.6.gz
+share/appdata/tanglet.appdata.xml
 share/applications/tanglet.desktop
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+share/icons/hicolor/1024x1024/apps/tanglet.png
 share/icons/hicolor/128x128/apps/tanglet.png
 share/icons/hicolor/16x16/apps/tanglet.png
 share/icons/hicolor/22x22/apps/tanglet.png
@@ -7,9 +14,9 @@ share/icons/hicolor/24x24/apps/tanglet.png
 share/icons/hicolor/256x256/apps/tanglet.png
 share/icons/hicolor/32x32/apps/tanglet.png
 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/pixmaps/tanglet.png
 share/pixmaps/tanglet.xpm
 %%DATADIR%%/data/cs/dice
 %%DATADIR%%/data/cs/dictionary
@@ -44,16 +51,21 @@ share/pixmaps/tanglet.xpm
 %%DATADIR%%/data/nl/dictionary
 %%DATADIR%%/data/nl/name
 %%DATADIR%%/data/nl/words
-%%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_nl.qm
-%%NLS%%%%DATADIR%%/translations/tanglet_ro.qm
-%%NLS%%%%DATADIR%%/translations/tanglet_tr.qm
-%%NLS%%%%DATADIR%%/translations/tanglet_uk.qm
+%%DATADIR%%/translations/tanglet_cs.qm
+%%DATADIR%%/translations/tanglet_csb.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