games/armagetronad: Fix .desktop and icon locations

Also add -f to some mv commands because they cause interactive prompts.

Reported by:	makc

4 files changed, 49 insertions, 5 deletions

diff --git a/games/armagetronad/Makefile b/games/armagetronad/Makefile
index cd5195abaa67..6378c69abc68 100644
--- a/games/armagetronad/Makefile
+++ b/games/armagetronad/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	armagetronad
 DISTVERSION=	0.2.8.3.4
 DISTVERSIONSUFFIX=	.src
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/stable/${DISTVERSION}/
 
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libpng16.so:graphics/png
 
-USES=		autoreconf gl gmake gnome jpeg sdl
+USES=		autoreconf desktop-file-utils gl gmake gnome jpeg sdl
 GNU_CONFIGURE=	yes
 USE_SDL=	image mixer sdl
 USE_GL=		gl glu
@@ -25,10 +26,22 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 CONFIGURE_ARGS=	--disable-etc --disable-games --enable-music
 
+INSTALLS_ICONS=	yes
+
 BINARY_ALIAS=	sdl11-config=sdl-config
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
+post-install:
+	@${MV} ${STAGEDIR}${DATADIR}/desktop/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}.desktop
+.for SZ in 16 32 48
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps
+.endfor
+	@${MV} ${STAGEDIR}${DATADIR}/desktop/icons/small/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/${PORTNAME}.png
+	@${MV} ${STAGEDIR}${DATADIR}/desktop/icons/medium/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
+	@${MV} ${STAGEDIR}${DATADIR}/desktop/icons/large/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png
+	@${RM} -r ${STAGEDIR}${DATADIR}/desktop
+
 .include <bsd.port.mk>
diff --git a/games/armagetronad/files/patch-Makefile.am b/games/armagetronad/files/patch-Makefile.am
new file mode 100644
index 000000000000..2aa51e4446ad
--- /dev/null
+++ b/games/armagetronad/files/patch-Makefile.am
@@ -0,0 +1,20 @@
+--- Makefile.am.orig	2019-07-23 16:38:02 UTC
++++ Makefile.am
+@@ -23,7 +23,7 @@ SUBDIRS = src resource batch config desktop
+ 
+ # special tasks to do if we're building the master server
+ if BUILDMASTER
+-masterInstallTasks=	cd  $(DESTDIR)$(bindir); mv armagetronad_main_master$(EXEEXT) @prognamebase@-master$(executable_suffix)
++masterInstallTasks=	cd  $(DESTDIR)$(bindir); mv -f armagetronad_main_master$(EXEEXT) @prognamebase@-master$(executable_suffix)
+ masterUninstallTasks=rm -f $(DESTDIR)$(bindir)/@prognamebase@-master$(executable_suffix)
+ else
+ masterInstallTasks=echo 'No tasks for the master server'
+@@ -107,7 +107,7 @@ endif
+ install-exec-hook: install-uninstall
+ #	rename executable to armagetronad-VERSION and link to armagetronad
+ if BUILDMAIN
+-	cd  $(DESTDIR)${bindir}; mv armagetronad_main$(EXEEXT) @progname@$(executable_suffix)
++	cd  $(DESTDIR)${bindir}; mv -f armagetronad_main$(EXEEXT) @progname@$(executable_suffix)
+ endif
+ 
+ #	delegate to special tasks
diff --git a/games/armagetronad/files/patch-desktop_armagetronad.desktop.in b/games/armagetronad/files/patch-desktop_armagetronad.desktop.in
new file mode 100644
index 000000000000..6895b237c92a
--- /dev/null
+++ b/games/armagetronad/files/patch-desktop_armagetronad.desktop.in
@@ -0,0 +1,11 @@
+--- desktop/armagetronad.desktop.in.orig	2019-07-23 16:43:09 UTC
++++ desktop/armagetronad.desktop.in
+@@ -3,7 +3,7 @@ Type=Application
+ Name=@progtitle@@progtitle_server@
+ Exec=@progname@
+ Comment=3d light cycle game
+-Icon=@progname@.png
++Icon=@progname@
+ Terminal=@build_dedicated@
+ Path=@prefix@/bin
+ Categories=Game;ActionGame;
diff --git a/games/armagetronad/pkg-plist b/games/armagetronad/pkg-plist
index 7a77ec6519be..d1d12a1a270a 100644
--- a/games/armagetronad/pkg-plist
+++ b/games/armagetronad/pkg-plist
@@ -18,10 +18,7 @@ bin/armagetronad
 %%ETCDIR%%/settings_dedicated.cfg
 %%ETCDIR%%/settings_visual.cfg
 %%ETCDIR%%/subcultures.srv
-%%DATADIR%%/desktop/armagetronad.desktop
-%%DATADIR%%/desktop/icons/large/armagetronad.png
-%%DATADIR%%/desktop/icons/medium/armagetronad.png
-%%DATADIR%%/desktop/icons/small/armagetronad.png
+share/applications/armagetronad.desktop
 %%DATADIR%%/language/american.txt
 %%DATADIR%%/language/british.txt
 %%DATADIR%%/language/deutsch.txt
@@ -74,3 +71,6 @@ bin/armagetronad
 %%DATADIR%%/textures/shadow.png
 %%DATADIR%%/textures/sky.png
 %%DATADIR%%/textures/title.jpg
+share/icons/hicolor/16x16/apps/armagetronad.png
+share/icons/hicolor/32x32/apps/armagetronad.png
+share/icons/hicolor/48x48/apps/armagetronad.png