From owner-svn-ports-head@FreeBSD.ORG Fri Feb 22 12:09:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9CA558B3; Fri, 22 Feb 2013 12:09:15 +0000 (UTC) (envelope-from makc@issp.ac.ru) Received: from mail.issp.ac.ru (mail.issp.ac.ru [77.236.34.3]) by mx1.freebsd.org (Postfix) with ESMTP id C26CDA93; Fri, 22 Feb 2013 12:09:12 +0000 (UTC) Received: from mercury.ph.man.ac.uk [130.88.75.175:32452] (HELO/EHLO mercury.ph.man.ac.uk, authenticated with PLAIN) by mail.issp.ac.ru with ESMTP/inet id r1MC9Bmu098029 (using TLSv1/SSLv3, with cipher DHE-RSA-AES256-SHA (256 bits), verified NO) Fri, 22 Feb 2013 16:09:11 +0400 (MSK) From: Max Brazhnikov To: Rene Ladan Subject: Re: svn commit: r312762 - in head/games/whichwayisup: . files Date: Fri, 22 Feb 2013 12:09:55 +0000 Message-ID: <3721488.3U2r0mz0lE@mercury.ph.man.ac.uk> User-Agent: KMail/4.9.5 (FreeBSD/9.1-STABLE; KDE/4.9.5; amd64; ; ) In-Reply-To: <201302221144.r1MBiKi6043715@svn.freebsd.org> References: <201302221144.r1MBiKi6043715@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7Bit X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, nemysis@gmx.ch, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 22 Feb 2013 12:09:15 -0000 Hi, Since this port generates .desktop file via DESKTOP_ENTRIES it definitely doesn't need desktopfileutils. If .deskop file is shipped with the sources the criterion for using desktopfileutils is MimeType key in .deskop file. Configure script usually looks for it in this case. The same applies to games/nuclearchess. Cheers, Max On Fri, 22 Feb 2013 11:44:20 +0000Fri Feb 22 11:44:20 2013 Rene Ladan wrote: > Author: rene > Date: Fri Feb 22 11:44:20 2013 > New Revision: 312762 > URL: http://svnweb.freebsd.org/changeset/ports/312762 > > Log: > - Convert Makefile header > - Update pkg-descr > - Update MASTER_SITES > - Add license > - Add desktop entry and install icon > - Some cleanups > - Bump PORTREVISION > - Pass maintainership to submitter > > PR: ports/172934 > Submitted by: nemysis@gmx.ch > > Added: > head/games/whichwayisup/files/ > head/games/whichwayisup/files/patch-lib-game.py (contents, props changed) > Modified: > head/games/whichwayisup/Makefile (contents, props changed) > head/games/whichwayisup/distinfo (contents, props changed) > head/games/whichwayisup/pkg-descr (contents, props changed) > head/games/whichwayisup/pkg-plist (contents, props changed) > > Modified: head/games/whichwayisup/Makefile > ============================================================================== > --- head/games/whichwayisup/Makefile Fri Feb 22 10:58:15 2013 (r312761) > +++ head/games/whichwayisup/Makefile Fri Feb 22 11:44:20 2013 (r312762) > @@ -1,48 +1,64 @@ > -# New ports collection makefile for: whichwayisup > -# Date created: 14 August 2007 > -# Whom: Andrew Pantyukhin > -# > +# Created by: Andrew Pantyukhin > # $FreeBSD$ > -# > > PORTNAME= whichwayisup > PORTVERSION= 0.7.9 > -PORTREVISION= 3 > -DISTVERSION= ${PORTVERSION:S/.//g} > -CATEGORIES= games > -MASTER_SITES= http://www.hectigo.net/games/whichwayisup/ > -DISTNAME= ${PORTNAME}_b${DISTVERSION} > +PORTREVISION= 4 > +CATEGORIES= games python > +MASTER_SITES= http://www.oletus.fi/static/whichwayisup/ \ > + SF/nemysisfreebsdp/:icons > +DISTFILES= ${PORTNAME}_b${DISTVERSION:S/.//g}${EXTRACT_SUFX} \ > + ${PORTNAME}.png:icons > +DIST_SUBDIR= python > +EXTRACT_ONLY= ${PORTNAME}_b${DISTVERSION:S/.//g}${EXTRACT_SUFX} > > -MAINTAINER= ports@FreeBSD.org > +MAINTAINER= nemysis@gmx.ch > COMMENT= Platformer game with rotational twist > > -RUN_DEPENDS= py*-game>=1.7.1:${PORTSDIR}/devel/py-game > +LICENSE= GPLv2 > + > +RUN_DEPENDS= ${PYGAME} > + > +WRKSRC= ${WRKDIR}/${PORTNAME} > > USE_PYTHON= yes > USE_ZIP= yes > +USE_GNOME= desktopfileutils > +INSTALLS_ICONS= yes > +USE_DOS2UNIX= *.py *.txt > + > PORTDOCS= README.txt changelog.txt > > -WRKSRC= ${WRKDIR}/${PORTNAME} > +DESKTOP_ENTRIES="Which Way Is Up" "${COMMENT}" \ > + "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ > + "${PORTNAME}" "Game;ArcadeGame;" false > + > +.include > > post-patch: > @${REINPLACE_CMD} -e '/libdir =/s|=.*|= "${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}"|'\ > ${WRKSRC}/run_game.py > @${REINPLACE_CMD} -e '/data_dir =/s|data_py.*data.|"${DATADIR}"|'\ > ${WRKSRC}/lib/data.py > - @${RM} ${WRKSRC}/lib/data.py.bak > + @${FIND} ${WRKSRC} -name "*.bak" -delete -or -name "*.orig" -delete > > do-build: > - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/lib/ > - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/lib/ > + @${PYTHON_CMD} -m compileall ${WRKSRC} > + @${PYTHON_CMD} -O -m compileall ${WRKSRC} > @${TOUCH} ${WRKSRC}/data/music/.keep_me > > do-install: > - @cd ${WRKSRC}/data/&&${COPYTREE_SHARE} . ${DATADIR}/ > - @cd ${WRKSRC}/lib/&&${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/ > - @${INSTALL_SCRIPT} ${WRKSRC}/run_game.py ${PREFIX}/bin/${PORTNAME} > -.ifndef NOPORTDOCS > - @${INSTALL} -d ${DOCSDIR}/ > - @cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ > + ${INSTALL_SCRIPT} ${WRKSRC}/run_game.py ${PREFIX}/bin/${PORTNAME} > + @(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}) > + @(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}) > + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/ > + > +.if ${PORT_OPTIONS:MDOCS} > + ${MKDIR} ${DOCSDIR} > + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} > .endif > > +post-install: > + @-update-desktop-database > + > .include > > Modified: head/games/whichwayisup/distinfo > ============================================================================== > --- head/games/whichwayisup/distinfo Fri Feb 22 10:58:15 2013 (r312761) > +++ head/games/whichwayisup/distinfo Fri Feb 22 11:44:20 2013 (r312762) > @@ -1,2 +1,4 @@ > -SHA256 (whichwayisup_b079.zip) = bcc2b7fc8719a8e055969c8eac099b7c40b9d68f36ba1f83d690216bdcdd51f6 > -SIZE (whichwayisup_b079.zip) = 1001890 > +SHA256 (python/whichwayisup_b079.zip) = bcc2b7fc8719a8e055969c8eac099b7c40b9d68f36ba1f83d690216bdcdd51f6 > +SIZE (python/whichwayisup_b079.zip) = 1001890 > +SHA256 (python/whichwayisup.png) = 1e4853723f76ed6cbbb8726508d64322b8887b7211bf98de03fc0ff589f73161 > +SIZE (python/whichwayisup.png) = 984 > > Added: head/games/whichwayisup/files/patch-lib-game.py > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/games/whichwayisup/files/patch-lib-game.py Fri Feb 22 11:44:20 2013 (r312762) > @@ -0,0 +1,52 @@ > +--- lib/game.py.orig 2012-10-21 13:48:24.000000000 +0200 > ++++ lib/game.py 2012-10-21 14:20:03.000000000 +0200 > +@@ -140,15 +140,15 @@ > + > + if joystick != None: # Parse joystick input > + > +- axis0 = joystick.get_axis(0) > ++# axis0 = joystick.get_axis(0) > + > +- if axis0 < -0.1: > +- inputs["LEFT"] = True > +- inputs["ANALOG"] = -axis0 > +- > +- if axis0 > 0.1: > +- inputs["RIGHT"] = True > +- inputs["ANALOG"] = axis0 > ++# if axis0 < -0.1: > ++# inputs["LEFT"] = True > ++# inputs["ANALOG"] = -axis0 > ++ > ++# if axis0 > 0.1: > ++# inputs["RIGHT"] = True > ++# inputs["ANALOG"] = axis0 > + > + if joystick.get_numbuttons() > 1: > + if joystick.get_button(0): > +@@ -165,16 +165,16 @@ > + keys_released["J_B1"] = False > + else: > + keys_released["J_B1"] = True > +- else: > +- axis1 = joystick.get_axis(1) > ++# else: > ++# axis1 = joystick.get_axis(1) > + > +- if axis1 < -0.1: > +- inputs["UP"] = True > +- if keys_released["J_A1U"]: > +- inputs["JUMP"] = True > +- keys_released["J_A1U"] = False > +- else: > +- keys_released["J_A1U"] = True > ++# if axis1 < -0.1: > ++# inputs["UP"] = True > ++# if keys_released["J_A1U"]: > ++# inputs["JUMP"] = True > ++# keys_released["J_A1U"] = False > ++# else: > ++# keys_released["J_A1U"] = True > + > + if axis1 > 0.1: > + if keys_released["J_A1D"]: > > Modified: head/games/whichwayisup/pkg-descr > ============================================================================== > --- head/games/whichwayisup/pkg-descr Fri Feb 22 10:58:15 2013 (r312761) > +++ head/games/whichwayisup/pkg-descr Fri Feb 22 11:44:20 2013 (r312762) > @@ -3,4 +3,4 @@ with a slight rotational twist. Help a m > named Guy find his keys in a labyrinth of dangers and bad dialogue. > > Author: Olli "Hectigo" Etuaho > -WWW: http://www.hectigo.net/games/whichwayisup/ > +WWW: http://www.oletus.fi/static/whichwayisup/ > > Modified: head/games/whichwayisup/pkg-plist > ============================================================================== > --- head/games/whichwayisup/pkg-plist Fri Feb 22 10:58:15 2013 (r312761) > +++ head/games/whichwayisup/pkg-plist Fri Feb 22 11:44:20 2013 (r312762) > @@ -196,6 +196,7 @@ bin/whichwayisup > %%DATADIR%%/sounds/kling.ogg > %%DATADIR%%/sounds/nextlevel.ogg > %%DATADIR%%/sounds/woosh.ogg > +share/pixmaps/whichwayisup.png > @dirrm %%PYTHON_SITELIBDIR%%/whichwayisup > @dirrm %%DATADIR%%/levels > @dirrm %%DATADIR%%/misc > @@ -203,3 +204,5 @@ bin/whichwayisup > @dirrm %%DATADIR%%/pictures > @dirrm %%DATADIR%%/sounds > @dirrm %%DATADIR%% > +@exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true > +@unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true From owner-svn-ports-head@FreeBSD.ORG Fri Feb 22 12:21:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id BF7E1A1D; Fri, 22 Feb 2013 12:21:30 +0000 (UTC) Date: Fri, 22 Feb 2013 12:21:30 +0000 From: Alexey Dokuchaev To: Max Brazhnikov Subject: Re: svn commit: r312762 - in head/games/whichwayisup: . files Message-ID: <20130222122130.GA7583@FreeBSD.org> References: <201302221144.r1MBiKi6043715@svn.freebsd.org> <3721488.3U2r0mz0lE@mercury.ph.man.ac.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <3721488.3U2r0mz0lE@mercury.ph.man.ac.uk> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, Rene Ladan , svn-ports-all@freebsd.org, nemysis@gmx.ch, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 22 Feb 2013 12:21:30 -0000 On Fri, Feb 22, 2013 at 12:09:55PM +0000, Max Brazhnikov wrote: > Since this port generates .desktop file via DESKTOP_ENTRIES it definitely > doesn't need desktopfileutils. If .deskop file is shipped with the sources > the criterion for using desktopfileutils is MimeType key in .deskop file. > Configure script usually looks for it in this case. This is (by far) not the first time I see people blindly depending on desktopfileutils in cases when it is not really needed. Someone(tm) should grep the collection for incorrect usages thereof, and fix them. ./danfe