From owner-svn-ports-head@freebsd.org Tue Jul 23 17:05:21 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DA4E9AE662; Tue, 23 Jul 2019 17:05:21 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BD9F36B84B; Tue, 23 Jul 2019 17:05:21 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 97E12D4F; Tue, 23 Jul 2019 17:05:21 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6NH5LuJ070117; Tue, 23 Jul 2019 17:05:21 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6NH5KP5070113; Tue, 23 Jul 2019 17:05:20 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201907231705.x6NH5KP5070113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 23 Jul 2019 17:05:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507237 - in head/games/armagetronad: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/games/armagetronad: . files X-SVN-Commit-Revision: 507237 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BD9F36B84B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jul 2019 17:05:21 -0000 Author: yuri Date: Tue Jul 23 17:05:20 2019 New Revision: 507237 URL: https://svnweb.freebsd.org/changeset/ports/507237 Log: games/armagetronad: Fix .desktop and icon locations Also add -f to some mv commands because they cause interactive prompts. Reported by: makc Added: head/games/armagetronad/files/patch-Makefile.am (contents, props changed) head/games/armagetronad/files/patch-desktop_armagetronad.desktop.in (contents, props changed) Modified: head/games/armagetronad/Makefile head/games/armagetronad/pkg-plist Modified: head/games/armagetronad/Makefile ============================================================================== --- head/games/armagetronad/Makefile Tue Jul 23 16:55:50 2019 (r507236) +++ head/games/armagetronad/Makefile Tue Jul 23 17:05:20 2019 (r507237) @@ -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 Added: head/games/armagetronad/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/armagetronad/files/patch-Makefile.am Tue Jul 23 17:05:20 2019 (r507237) @@ -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 Added: head/games/armagetronad/files/patch-desktop_armagetronad.desktop.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/armagetronad/files/patch-desktop_armagetronad.desktop.in Tue Jul 23 17:05:20 2019 (r507237) @@ -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; Modified: head/games/armagetronad/pkg-plist ============================================================================== --- head/games/armagetronad/pkg-plist Tue Jul 23 16:55:50 2019 (r507236) +++ head/games/armagetronad/pkg-plist Tue Jul 23 17:05:20 2019 (r507237) @@ -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