- Clean up Makefile

- Respect PREFIX
- Don't use PORTDATA macro since the data is required
- Use the build system provided by the software

PR:		ports/171364
Submitted by:	nemysis <nemysis at gmx dot ch> (maintainer)
Approved by:	makc (mentor)

2 files changed, 52 insertions, 26 deletions

diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
index a5cdbb50a423..d585d5a722fb 100644
--- a/games/tanglet/Makefile
+++ b/games/tanglet/Makefile
@@ -7,55 +7,37 @@
 
 PORTNAME=	tanglet
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/${PORTNAME}/
 EXTRACT_SUFX=	-src.tar.bz2
 
 MAINTAINER=	nemysis@gmx.ch
-COMMENT=	Tanglet is a single player word finding game based on Boggle
+COMMENT=	Single player word finding game based on Boggle
 
 LICENSE=	GPLv3
 
 USE_BZIP2=	yes
-USE_QT4=	moc_build qmake_build rcc_build corelib gui iconengines imageformats
+USE_QT4=	moc_build qmake_build rcc_build gui
 INSTALLS_ICONS=	yes
-
 MAKE_JOBS_SAFE=	yes
 
-PORTDATA=	*
 PORTDOCS=	CREDITS ChangeLog
 
 .include <bsd.port.options.mk>
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS}
-
-do-install:
-# Executable
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-# Data
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "data translations" ${DATADIR})
-
-# Icons
-	cd ${WRKSRC}/icons && ${FIND} hicolor -type d -name apps -exec \
-		${MKDIR} ${PREFIX}/share/icons/{} \;
-	cd ${WRKSRC}/icons && ${FIND} hicolor -type f -exec \
-		${INSTALL_DATA} {} ${PREFIX}/share/icons/{} \;
+		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
 
-# Pixmaps and Desktop
-	${INSTALL_DATA} ${WRKSRC}/icons/${PORTNAME}_32.xpm ${PREFIX}/share/pixmaps/
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/icons/${PORTNAME}.desktop ${PREFIX}/share/applications/
+post-install:
+# Pixmaps
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
 # Documentation
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.  endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/tanglet/pkg-plist b/games/tanglet/pkg-plist
index dd4d736c699c..8c29c14f57ae 100644
--- a/games/tanglet/pkg-plist
+++ b/games/tanglet/pkg-plist
@@ -9,7 +9,51 @@ share/icons/hicolor/32x32/apps/tanglet.png
 share/icons/hicolor/48x48/apps/tanglet.png
 share/icons/hicolor/64x64/apps/tanglet.png
 share/icons/hicolor/scalable/apps/tanglet.svg
+share/pixmaps/tanglet.png
 share/pixmaps/tanglet_32.xpm
+share/tanglet/data/cs/dice
+share/tanglet/data/cs/dictionary
+share/tanglet/data/cs/name
+share/tanglet/data/cs/words
+share/tanglet/data/de/README
+share/tanglet/data/de/dice
+share/tanglet/data/de/dictionary
+share/tanglet/data/de/name
+share/tanglet/data/de/words
+share/tanglet/data/en/README
+share/tanglet/data/en/dice
+share/tanglet/data/en/dictionary
+share/tanglet/data/en/name
+share/tanglet/data/en/scowl-word-lists-used
+share/tanglet/data/en/words
+share/tanglet/data/fr/dice
+share/tanglet/data/fr/dictionary
+share/tanglet/data/fr/name
+share/tanglet/data/fr/words
+share/tanglet/data/he/README
+share/tanglet/data/he/dice
+share/tanglet/data/he/dictionary
+share/tanglet/data/he/name
+share/tanglet/data/he/words
+share/tanglet/data/nl/dice
+share/tanglet/data/nl/dictionary
+share/tanglet/data/nl/name
+share/tanglet/data/nl/words
+share/tanglet/translations/tanglet_cs.qm
+share/tanglet/translations/tanglet_de.qm
+share/tanglet/translations/tanglet_en.qm
+share/tanglet/translations/tanglet_fr.qm
+share/tanglet/translations/tanglet_he.qm
+share/tanglet/translations/tanglet_nl.qm
+@dirrm share/tanglet/translations
+@dirrm share/tanglet/data/nl
+@dirrm share/tanglet/data/he
+@dirrm share/tanglet/data/fr
+@dirrm share/tanglet/data/en
+@dirrm share/tanglet/data/de
+@dirrm share/tanglet/data/cs
+@dirrm share/tanglet/data
+@dirrm share/tanglet
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/64x64/apps