svn commit: r312762 - in head/games/whichwayisup: . files

Max Brazhnikov makc at issp.ac.ru
Fri Feb 22 12:09:15 UTC 2013 

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 at 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 <infofarmer at FreeBSD.org>
> -#
> +# Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
>  # $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 at FreeBSD.org
> +MAINTAINER=	nemysis at 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 <bsd.port.options.mk>
>  
>  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 <bsd.port.mk>
> 
> 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 <admin[at]hectigo.net>
> -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%%
> + at exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
> + at unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true

More information about the svn-ports-head mailing list