Update to 1.2.2

Fix LICENSE
Fix stage-qa warning about USE_GL
Move USES upward
Remove INSTALLS_ICONS (unneeded for Qt)
Don't install oxygen icons. They are built into the binary as Qt resources.

4 files changed, 13 insertions, 68 deletions

diff --git a/games/cutemaze/Makefile b/games/cutemaze/Makefile
index 96daca0c8fec..b09384860eba 100644
--- a/games/cutemaze/Makefile
+++ b/games/cutemaze/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cutemaze
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/${PORTNAME}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
@@ -10,34 +10,28 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple, top-down game in which mazes are randomly generated
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USES=		qmake tar:bzip2
+USE_GL=		gl
 USE_QT5=	core gui svg imageformats_run widgets \
 		linguisttools_build buildtools_build
-INSTALLS_ICONS=	yes
 
 PORTDOCS=	ChangeLog NEWS README
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|share/man|man|' \
+		${WRKSRC}/cutemaze.pro
+
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -i '' '/qm.files/,/qm.path/s/^/#/' \
 		${WRKSRC}/cutemaze.pro
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-.for d in 16x16 22x22 scalable
-	@(cd ${WRKSRC}/icons/oxygen && ${COPYTREE_SHARE} ${d} \
-		${STAGEDIR}${PREFIX}/share/icons/oxygen)
-.endfor
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/games/cutemaze/distinfo b/games/cutemaze/distinfo
index 8f191135f4ff..673ef60cc4a5 100644
--- a/games/cutemaze/distinfo
+++ b/games/cutemaze/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501493373
-SHA256 (cutemaze-1.2.1-src.tar.bz2) = 841f2a208770c9de6009fed64e24a059a878686c444c4b572c56b564e4cfa66e
-SIZE (cutemaze-1.2.1-src.tar.bz2) = 803354
+TIMESTAMP = 1519227164
+SHA256 (cutemaze-1.2.2-src.tar.bz2) = 1e9464d0be6eacae20a8fa29e699e3776f3081c00eaffdfeceed4b77eaac52a8
+SIZE (cutemaze-1.2.2-src.tar.bz2) = 805648
diff --git a/games/cutemaze/files/patch-cutemaze.pro b/games/cutemaze/files/patch-cutemaze.pro
deleted file mode 100644
index 557f51947786..000000000000
--- a/games/cutemaze/files/patch-cutemaze.pro
+++ /dev/null
@@ -1,19 +0,0 @@
---- cutemaze.pro.orig	2017-07-30 17:16:25 UTC
-+++ cutemaze.pro
-@@ -91,14 +91,14 @@ macx {
- 	desktop.path = $$PREFIX/share/applications/
- 
- 	appdata.files = icons/cutemaze.appdata.xml
--	appdata.path = $$PREFIX/share/metainfo/
-+	appdata.path = $$PREFIX/share/appdata/
- 
- 	qm.files = $$replace(TRANSLATIONS, .ts, .qm)
- 	qm.path = $$PREFIX/share/cutemaze/translations
- 	qm.CONFIG += no_check_exist
- 
- 	man.files = doc/cutemaze.6
--	man.path = $$PREFIX/share/man/man6
-+	man.path = $$PREFIX/man/man6
- 
- 	INSTALLS += target pixmap icon desktop appdata qm man
- }
diff --git a/games/cutemaze/pkg-plist b/games/cutemaze/pkg-plist
index 2deb81866d93..21b51b5cc925 100644
--- a/games/cutemaze/pkg-plist
+++ b/games/cutemaze/pkg-plist
@@ -1,9 +1,9 @@
 bin/cutemaze
 man/man6/cutemaze.6.gz
-share/appdata/cutemaze.appdata.xml
 share/applications/cutemaze.desktop
 %%NLS%%%%DATADIR%%/translations/cutemaze_cs.qm
 %%NLS%%%%DATADIR%%/translations/cutemaze_de.qm
+%%NLS%%%%DATADIR%%/translations/cutemaze_el.qm
 %%NLS%%%%DATADIR%%/translations/cutemaze_en.qm
 %%NLS%%%%DATADIR%%/translations/cutemaze_eo.qm
 %%NLS%%%%DATADIR%%/translations/cutemaze_es.qm
@@ -29,35 +29,5 @@ share/icons/hicolor/48x48/apps/cutemaze.png
 share/icons/hicolor/512x512/apps/cutemaze.png
 share/icons/hicolor/64x64/apps/cutemaze.png
 share/icons/hicolor/scalable/apps/cutemaze.svg
-share/icons/oxygen/16x16/application-exit.png
-share/icons/oxygen/16x16/document-new.png
-share/icons/oxygen/16x16/games-config-options.png
-share/icons/oxygen/16x16/games-highscores.png
-share/icons/oxygen/16x16/games-hint.png
-share/icons/oxygen/16x16/help-about.png
-share/icons/oxygen/16x16/media-playback-pause.png
-share/icons/oxygen/16x16/preferences-desktop-locale.png
-share/icons/oxygen/16x16/zoom-in.png
-share/icons/oxygen/16x16/zoom-out.png
-share/icons/oxygen/22x22/application-exit.png
-share/icons/oxygen/22x22/document-new.png
-share/icons/oxygen/22x22/games-config-options.png
-share/icons/oxygen/22x22/games-highscores.png
-share/icons/oxygen/22x22/games-hint.png
-share/icons/oxygen/22x22/help-about.png
-share/icons/oxygen/22x22/media-playback-pause.png
-share/icons/oxygen/22x22/preferences-desktop-locale.png
-share/icons/oxygen/22x22/zoom-in.png
-share/icons/oxygen/22x22/zoom-out.png
-share/icons/oxygen/scalable/application-exit.svgz
-share/icons/oxygen/scalable/document-new.svgz
-share/icons/oxygen/scalable/games-config-options.svgz
-share/icons/oxygen/scalable/games-highscores.svgz
-share/icons/oxygen/scalable/games-hint.svgz
-share/icons/oxygen/scalable/help-about.svgz
-share/icons/oxygen/scalable/media-playback-pause.svgz
-share/icons/oxygen/scalable/preferences-desktop-locale.svgz
-share/icons/oxygen/scalable/zoom-in.svgz
-share/icons/oxygen/scalable/zoom-out.svgz
-share/pixmaps/cutemaze.png
+share/metainfo/cutemaze.appdata.xml
 share/pixmaps/cutemaze.xpm