Date: Sat, 23 Feb 2013 01:40:01 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/173356: [MAINTAINER] games/blockrage: Changed Makefile, added Desktop entries, icons, removed all Notes Message-ID: <201302230140.r1N1e1st063249@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/173356; it has been noted by GNATS. From: nemysis <nemysis@gmx.ch> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/173356: [MAINTAINER] games/blockrage: Changed Makefile, added Desktop entries, icons, removed all Notes Date: Sat, 23 Feb 2013 02:38:59 +0100 --MP_/3bgyRyXYir4qR3kcT+zBHKU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Removed because are unique names DIST_SUBDIR= ${PORTNAME} Added + SF/nemysisfreebsdp/:icons +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}_icons${EXTRACT_SUFX}:icons +INSTALLS_ICONS= yes +ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 ... --MP_/3bgyRyXYir4qR3kcT+zBHKU Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=blockrage.diff ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/games/blockrage/Makefile ./Makefile --- /usr/ports/games/blockrage/Makefile 2013-01-14 17:55:30.000000000 +0100 +++ ./Makefile 2013-02-23 02:34:48.000000000 +0100 @@ -7,9 +7,12 @@ PORTNAME= blockrage PORTVERSION= 0.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ + SF/nemysisfreebsdp/:icons +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}_icons${EXTRACT_SUFX}:icons MAINTAINER= nemysis@gmx.ch COMMENT= Falling blocks game with 2-player hotseat mode @@ -21,39 +24,46 @@ USE_SDL= sdl image mixer MAKE_JOBS_SAFE= yes -PLIST_FILES= bin/${PORTNAME} - MAN6= ${PORTNAME}.6 -PORTDATA= * PORTDOCS= ChangeLog KNOWN_BUGS README TODO +INSTALLS_ICONS= yes +ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 + SUB_FILES= ${PORTNAME} +DESKTOP_ENTRIES="Block Rage" "${COMMENT}" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" false + .include <bsd.port.options.mk> -do-install: -# Scripts - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin +post-patch: + @${REINPLACE_CMD} -e 's|MYCC=gcc|MYCC=|' \ + -e 's| -O2 -Wall||' \ + ${WRKSRC}/configure -# Executable +do-install: + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/ ${MKDIR} ${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR} -post-install: - ${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6 - -# Data -. for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc +.for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}) -. endfor +.endfor + +post-install: +.for s in ${ICON_SIZES} + ${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ + ${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png +.endfor + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ + ${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6/ -# 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 -ruN --exclude=CVS /usr/ports/games/blockrage/distinfo ./distinfo --- /usr/ports/games/blockrage/distinfo 2013-01-14 17:55:30.000000000 +0100 +++ ./distinfo 2013-02-23 02:30:26.000000000 +0100 @@ -1,2 +1,4 @@ SHA256 (blockrage-0.2.3.tar.gz) = f9722e519fb74be2ecb9377fd2470c94382088a67df33acea215fd0a5a0b4cb6 SIZE (blockrage-0.2.3.tar.gz) = 75620 +SHA256 (blockrage_icons.tar.gz) = 8a634d710d3e5c251a9a5facc9b7911d125520524918dc6b681d4df255784438 +SIZE (blockrage_icons.tar.gz) = 11264 diff -ruN --exclude=CVS /usr/ports/games/blockrage/files/blockrage.in ./files/blockrage.in --- /usr/ports/games/blockrage/files/blockrage.in 2013-02-02 20:13:10.000000000 +0100 +++ ./files/blockrage.in 2013-02-23 02:20:21.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD: head/games/blockrage/files/blockrage.in 311381 2013-02-01 15:04:00Z ak $ +# -echo "Block Rage: Starting up..." cd "%%DATADIR%%" -./blockrage +exec ./blockrage diff -ruN --exclude=CVS /usr/ports/games/blockrage/files/patch-configure ./files/patch-configure --- /usr/ports/games/blockrage/files/patch-configure 2013-01-14 17:55:30.000000000 +0100 +++ ./files/patch-configure 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- configure.orig 2005-10-24 21:47:16.000000000 +0200 -+++ configure 2012-05-03 01:41:10.000000000 +0200 -@@ -39,8 +39,8 @@ - #SOUND_OPT=-DNOSOUND - SOUND_OPT= - --MYCC=gcc --MYCFLAGS='-s -O2 -Wall `sdl-config --cflags`'" $SOUND_OPT -DSYSCONFDIR=\\\"\${sysconfdir}/\${progname}\\\"" -+MYCC= -+MYCFLAGS='-s `sdl-config --cflags`'" $SOUND_OPT -DSYSCONFDIR=\\\"\${sysconfdir}/\${progname}\\\"" - - if test -z "$CC" ; then - CC="$MYCC"; diff -ruN --exclude=CVS /usr/ports/games/blockrage/pkg-plist ./pkg-plist --- /usr/ports/games/blockrage/pkg-plist 1970-01-01 01:00:00.000000000 +0100 +++ ./pkg-plist 2012-11-04 14:12:49.000000000 +0100 @@ -0,0 +1,56 @@ +bin/blockrage +%%DATADIR%%/blockrage +%%DATADIR%%/blockrage-fhs.rc +%%DATADIR%%/blockrage.cfg +%%DATADIR%%/blockrage.rc +%%DATADIR%%/data/test/dataset.cfg +%%DATADIR%%/data/test/fonth.pcx +%%DATADIR%%/data/test/fonth.txt +%%DATADIR%%/data/test/fontn.pcx +%%DATADIR%%/data/test/fontn.txt +%%DATADIR%%/data/test/g1p.pcx +%%DATADIR%%/data/test/g2p.pcx +%%DATADIR%%/data/test/game.col +%%DATADIR%%/data/test/logo.pcx +%%DATADIR%%/data/test/menu.pcx +%%DATADIR%%/data/test/pa0.pcx +%%DATADIR%%/data/test/pa1.pcx +%%DATADIR%%/data/test/pa2.pcx +%%DATADIR%%/data/test/pa3.pcx +%%DATADIR%%/data/test/pmenu.pcx +%%DATADIR%%/data/test/s00p1.pcx +%%DATADIR%%/data/test/s00p1.txt +%%DATADIR%%/data/test/s00p2.pcx +%%DATADIR%%/data/test/s00p2.txt +%%DATADIR%%/data/test/s00p3.pcx +%%DATADIR%%/data/test/s00p3.txt +%%DATADIR%%/data/test/s00p4.pcx +%%DATADIR%%/data/test/s00p4.txt +%%DATADIR%%/data/test/s00p5.pcx +%%DATADIR%%/data/test/s00p5.txt +%%DATADIR%%/data/test/s00p6.pcx +%%DATADIR%%/data/test/s00p6.txt +%%DATADIR%%/data/test/sfx0.snd +%%DATADIR%%/data/test/sfx1.snd +%%DATADIR%%/data/test/sfx2.snd +share/icons/hicolor/32x32/apps/blockrage.png +share/icons/hicolor/48x48/apps/blockrage.png +share/icons/hicolor/64x64/apps/blockrage.png +share/icons/hicolor/72x72/apps/blockrage.png +share/icons/hicolor/96x96/apps/blockrage.png +share/pixmaps/blockrage.png +@dirrmtry share/icons/hicolor/96x96/apps +@dirrmtry share/icons/hicolor/96x96 +@dirrmtry share/icons/hicolor/72x72/apps +@dirrmtry share/icons/hicolor/72x72 +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrm %%DATADIR%%/data/test +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%% ===> Done --MP_/3bgyRyXYir4qR3kcT+zBHKU--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302230140.r1N1e1st063249>