From owner-svn-ports-head@FreeBSD.ORG Thu Mar 14 21:08:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9227590A; Thu, 14 Mar 2013 21:08:07 +0000 (UTC) (envelope-from beech@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 84170B56; Thu, 14 Mar 2013 21:08:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2EL879f019827; Thu, 14 Mar 2013 21:08:07 GMT (envelope-from beech@svn.freebsd.org) Received: (from beech@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2EL861s019816; Thu, 14 Mar 2013 21:08:06 GMT (envelope-from beech@svn.freebsd.org) Message-Id: <201303142108.r2EL861s019816@svn.freebsd.org> From: Beech Rintoul Date: Thu, 14 Mar 2013 21:08:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314185 - in head/games/blockrage: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Thu, 14 Mar 2013 21:08:07 -0000 Author: beech Date: Thu Mar 14 21:08:06 2013 New Revision: 314185 URL: http://svnweb.freebsd.org/changeset/ports/314185 Log: - Add Desktop entries - Add icons - Add pkg-plist - Bump portrevision PR: ports/173356 Submitted by: nemysis (maintainer) Added: head/games/blockrage/pkg-plist (contents, props changed) Modified: head/games/blockrage/Makefile head/games/blockrage/distinfo (contents, props changed) head/games/blockrage/files/blockrage.in head/games/blockrage/files/patch-configure (contents, props changed) Modified: head/games/blockrage/Makefile ============================================================================== --- head/games/blockrage/Makefile Thu Mar 14 20:28:08 2013 (r314184) +++ head/games/blockrage/Makefile Thu Mar 14 21:08:06 2013 (r314185) @@ -1,15 +1,14 @@ -# New Ports collection makefile for: blockrage -# Date created: 2012-04-28 -# Whom: nemysis@gmx.ch -# +# Created by: nemysis # $FreeBSD$ -# 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 +20,55 @@ ALL_TARGET= ${PORTNAME} USE_SDL= sdl image mixer MAKE_JOBS_SAFE= yes -PLIST_FILES= bin/${PORTNAME} - MAN6= ${PORTNAME}.6 -PORTDATA= * PORTDOCS= ChangeLog KNOWN_BUGS README TODO +OPTIONS_DEFINE= DOCS + +INSTALLS_ICONS= yes +ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 + SUB_FILES= ${PORTNAME} +DESKTOP_ENTRIES="Block Rage" "${COMMENT}" \ + "share/pixmaps/${PORTNAME}.png" \ + "${PORTNAME}" "Game;ArcadeGame;" false + .include -do-install: -# Scripts - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin +.if ${PORT_OPTIONS:MDOCS} +PLIST_SUB+= PORTDOCS="" +.else +PLIST_SUB+= PORTDOCS="@comment " +.endif -# Executable +post-patch: + @${REINPLACE_CMD} -e 's|MYCC=gcc|MYCC=|' \ + -e 's| -O2 -Wall||' \ + ${WRKSRC}/configure + +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 Modified: head/games/blockrage/distinfo ============================================================================== --- head/games/blockrage/distinfo Thu Mar 14 20:28:08 2013 (r314184) +++ head/games/blockrage/distinfo Thu Mar 14 21:08:06 2013 (r314185) @@ -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 Modified: head/games/blockrage/files/blockrage.in ============================================================================== --- head/games/blockrage/files/blockrage.in Thu Mar 14 20:28:08 2013 (r314184) +++ head/games/blockrage/files/blockrage.in Thu Mar 14 21:08:06 2013 (r314185) @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# -echo "Block Rage: Starting up..." cd "%%DATADIR%%" -./blockrage +exec ./blockrage Modified: head/games/blockrage/files/patch-configure ============================================================================== --- head/games/blockrage/files/patch-configure Thu Mar 14 20:28:08 2013 (r314184) +++ head/games/blockrage/files/patch-configure Thu Mar 14 21:08:06 2013 (r314185) @@ -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"; Added: head/games/blockrage/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/blockrage/pkg-plist Thu Mar 14 21:08:06 2013 (r314185) @@ -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%%