From owner-svn-ports-all@FreeBSD.ORG Fri Jan 10 12:13:57 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E77342C9; Fri, 10 Jan 2014 12:13:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C7BE1165F; Fri, 10 Jan 2014 12:13:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0ACDuOr085411; Fri, 10 Jan 2014 12:13:56 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ACDucr085408; Fri, 10 Jan 2014 12:13:56 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401101213.s0ACDucr085408@svn.freebsd.org> From: Rusmir Dusko Date: Fri, 10 Jan 2014 12:13:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339345 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2014 12:13:57 -0000 Author: nemysis Date: Fri Jan 10 12:13:56 2014 New Revision: 339345 URL: http://svnweb.freebsd.org/changeset/ports/339345 Log: - Change Desktop entry file - Support STAGEDIR - Simplify REINPLACE_CMD - Change files/blockrage.in Modified: head/games/blockrage/Makefile head/games/blockrage/files/blockrage.in Modified: head/games/blockrage/Makefile ============================================================================== --- head/games/blockrage/Makefile Fri Jan 10 11:45:11 2014 (r339344) +++ head/games/blockrage/Makefile Fri Jan 10 12:13:56 2014 (r339345) @@ -18,7 +18,6 @@ LICENSE= GPLv2 USE_SDL= sdl image mixer GNU_CONFIGURE= yes ALL_TARGET= ${PORTNAME} -MAN6= ${PORTNAME}.6 PORTDOCS= ChangeLog KNOWN_BUGS README TODO @@ -27,43 +26,39 @@ ICON_SIZES= 32x32 48x48 64x64 72x72 96x9 SUB_FILES= ${PORTNAME} -DESKTOP_ENTRIES="Block Rage" "${COMMENT}" ${PORTNAME} \ - "${PORTNAME}" "Game;ArcadeGame;" false +DESKTOP_ENTRIES="Block Rage" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" "" OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include - post-patch: @${REINPLACE_CMD} \ - -e 's|prefix=/usr/local|prefix=${PREFIX}|' \ - -e 's|MYCC=gcc|MYCC?=${CC}|' \ - -e 's|-s -O2 -Wall||' \ - -e 's|sdl-config|$(SDL_CONFIG)|' \ - -e 's|MAKE=make|MAKE=${MAKE}|' \ + -e 's|prefix=/usr/local|prefix=${PREFIX}| ; \ + s|MYCC=gcc|MYCC?=${CC}| ; \ + s|-s -O2 -Wall|| ; \ + s|sdl-config|$(SDL_CONFIG)| ; \ + s|MAKE=make|MAKE=${MAKE}|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gcc -s|${CC}|' \ ${WRKSRC}/src/Makefile.in do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR} .for s in ${ICON_SIZES} - @${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps/ + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ - ${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png + ${STAGEDIR}${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/ + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/ -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/games/blockrage/files/blockrage.in ============================================================================== --- head/games/blockrage/files/blockrage.in Fri Jan 10 11:45:11 2014 (r339344) +++ head/games/blockrage/files/blockrage.in Fri Jan 10 12:13:56 2014 (r339345) @@ -4,4 +4,4 @@ # cd "%%DATADIR%%" -exec ./blockrage +exec ./blockrage "${@}"