games/connectagram: update 1.1.2 -> 1.2.1

- Switch from using QT4 to QT5
- Change description text in pkg-descr

PR:		197429
Submitted by:	Kato Tsuguru <tkato432@yahoo.com>

4 files changed, 49 insertions, 58 deletions

diff --git a/games/connectagram/Makefile b/games/connectagram/Makefile
index 98c46339051e..7ea2d9433024 100644
--- a/games/connectagram/Makefile
+++ b/games/connectagram/Makefile
@@ -2,47 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	connectagram
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.1
+DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
-MASTER_SITES=	http://gottcode.org/${PORTNAME}/
-EXTRACT_SUFX=	-src.tar.bz2
+MASTER_SITES=	http://gottcode.org/connectagram/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Word unscrambling game
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		qmake tar:bzip2
-USE_QT4=	moc_build rcc_build gui network iconengines_run \
-		imageformats_run
-INSTALLS_ICONS=	yes
-
-PORTDOCS=	CREDITS ChangeLog
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
+USES=		compiler:c++11-lib qmake tar:bzip2
+USE_QT5=	buildtools_build network widgets
+INSTALLS_ICONS=	yes
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -i '' '/qm.files/,/qm.path/s/^/#/' \
-		${WRKSRC}/${PORTNAME}.pro
-.endif
+	@${REINPLACE_CMD} -e \
+		's|share/man|man|' ${WRKSRC}/connectagram.pro
+	@${REINPLACE_CMD} -e \
+		's|std::lround|lround|' ${WRKSRC}/src/*.cpp
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR})
-	@(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} patterns ${STAGEDIR}${DATADIR})
-
-	@(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} hicolor \
-		${STAGEDIR}${PREFIX}/share/icons/)
-	${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/connectagram/distinfo b/games/connectagram/distinfo
index 2a1fe778b5df..1350c2eff41b 100644
--- a/games/connectagram/distinfo
+++ b/games/connectagram/distinfo
@@ -1,2 +1,2 @@
-SHA256 (connectagram-1.1.2-src.tar.bz2) = 06e03fed6d7651383cf8d771d0e89e09bb149c0aef431c1374296e62319087c4
-SIZE (connectagram-1.1.2-src.tar.bz2) = 1415066
+SHA256 (connectagram-1.2.1-src.tar.bz2) = 0a559243a8d970bb79c6791214be879269fc073b5eaec6aa55fb60be82f140bb
+SIZE (connectagram-1.2.1-src.tar.bz2) = 1632426
diff --git a/games/connectagram/pkg-descr b/games/connectagram/pkg-descr
index 61ff9db4ef56..1f482feec4cc 100644
--- a/games/connectagram/pkg-descr
+++ b/games/connectagram/pkg-descr
@@ -1,14 +1,15 @@
 Connectagram is a word unscrambling game. The board consists of several
-scrambled words that are joined together. You can choose the length of the
-words, the amount of words, and the pattern that the words are arranged in.
+scrambled words that are joined together. You can choose the length of
+the words, the amount of words, and the pattern that the words are
+arranged in.
 
-The game provides a hint option for times when you are stuck, and features an
-online word lookup that fetches the definitions of each word from www.dict.org.
-Your current progress is automatically saved.
+The game provides a hint option for times when you are stuck, and
+features an online word lookup that fetches the definitions of each word
+from www.wiktionary.org. Your current progress is automatically saved.
 
-Note that this game involves a large and varied word list, some of which may be
-considered inappropriate for children. You can edit the file containing the
-word list if you wish to remove words from your game. The location of this file
-varies by platform.
+Note that this game involves a large and varied word list, some of which
+may be considered inappropriate for children. You can edit the file
+containing the word list if you wish to remove words from your game. The
+location of this file varies by platform.
 
 WWW: http://gottcode.org/connectagram/
diff --git a/games/connectagram/pkg-plist b/games/connectagram/pkg-plist
index ffeb39cf1b52..3d98bb842373 100644
--- a/games/connectagram/pkg-plist
+++ b/games/connectagram/pkg-plist
@@ -1,27 +1,30 @@
 bin/connectagram
+man/man6/connectagram.6.gz
+share/appdata/connectagram.appdata.xml
 share/applications/connectagram.desktop
 %%DATADIR%%/data/en/words
 %%DATADIR%%/data/fr/words
 %%DATADIR%%/data/hu/words
 %%DATADIR%%/data/ru/words
-%%DATADIR%%/patterns/0.png
-%%DATADIR%%/patterns/1.png
-%%DATADIR%%/patterns/2.png
-%%DATADIR%%/patterns/3.png
-%%DATADIR%%/patterns/4.png
-%%DATADIR%%/patterns/5.png
-%%NLS%%%%DATADIR%%/translations/connectagram_cs.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_de.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_el.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_en.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_fr.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_he.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_hr.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_hu.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_pl.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_ro.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_ru.qm
-%%NLS%%%%DATADIR%%/translations/connectagram_tr.qm
+%%DATADIR%%/translations/connectagram_cs.qm
+%%DATADIR%%/translations/connectagram_de.qm
+%%DATADIR%%/translations/connectagram_el.qm
+%%DATADIR%%/translations/connectagram_en.qm
+%%DATADIR%%/translations/connectagram_fr.qm
+%%DATADIR%%/translations/connectagram_he.qm
+%%DATADIR%%/translations/connectagram_hr.qm
+%%DATADIR%%/translations/connectagram_hu.qm
+%%DATADIR%%/translations/connectagram_lt.qm
+%%DATADIR%%/translations/connectagram_nl.qm
+%%DATADIR%%/translations/connectagram_pl.qm
+%%DATADIR%%/translations/connectagram_ro.qm
+%%DATADIR%%/translations/connectagram_ru.qm
+%%DATADIR%%/translations/connectagram_tr.qm
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+share/icons/hicolor/1024x1024/apps/connectagram.png
 share/icons/hicolor/128x128/apps/connectagram.png
 share/icons/hicolor/16x16/apps/connectagram.png
 share/icons/hicolor/22x22/apps/connectagram.png
@@ -29,7 +32,7 @@ share/icons/hicolor/24x24/apps/connectagram.png
 share/icons/hicolor/256x256/apps/connectagram.png
 share/icons/hicolor/32x32/apps/connectagram.png
 share/icons/hicolor/48x48/apps/connectagram.png
+share/icons/hicolor/512x512/apps/connectagram.png
 share/icons/hicolor/64x64/apps/connectagram.png
 share/icons/hicolor/scalable/apps/connectagram.svg
-share/pixmaps/connectagram.png
 share/pixmaps/connectagram.xpm