From owner-svn-ports-all@FreeBSD.ORG Tue Dec 24 22:58:43 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A99EBAD5; Tue, 24 Dec 2013 22:58:43 +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 893101757; Tue, 24 Dec 2013 22:58:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOMwhAc013807; Tue, 24 Dec 2013 22:58:43 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOMwgBF013804; Tue, 24 Dec 2013 22:58:42 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312242258.rBOMwgBF013804@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 24 Dec 2013 22:58:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337394 - head/games/sdl_jewels 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: Tue, 24 Dec 2013 22:58:43 -0000 Author: nemysis Date: Tue Dec 24 22:58:42 2013 New Revision: 337394 URL: http://svnweb.freebsd.org/changeset/ports/337394 Log: - Change Makefile header - Bump PORTREVISION - Change master sites and icon - Remove dependency for graphics/netpbm - USES gmake instead of USE_GMAKE - Use pkg-plist instead of PLIST_FILES and PORTDATA - Add DOCS Option - Support STAGEDIR - Change Desktop entry file Approved by: pawel / wg (mentors, implicit) Added: head/games/sdl_jewels/pkg-plist (contents, props changed) Modified: head/games/sdl_jewels/Makefile head/games/sdl_jewels/distinfo Modified: head/games/sdl_jewels/Makefile ============================================================================== --- head/games/sdl_jewels/Makefile Tue Dec 24 22:36:46 2013 (r337393) +++ head/games/sdl_jewels/Makefile Tue Dec 24 22:58:42 2013 (r337394) @@ -1,13 +1,14 @@ +# Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= sdl_jewels PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.linuxmotors.com/gljewel/downloads/ \ - http://www.linuxmotors.com/gljewel/:icons + SF/nemysisfreebsdp/${CATEGORIES}/:icons DISTFILES= ${PORTNAME:S/sdl/SDL/}-${DISTVERSION}.tgz \ - gljewel.gif:icons + ${PORTNAME}.png:icons DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${PORTNAME:S/sdl/SDL/}-${DISTVERSION}.tgz @@ -16,48 +17,35 @@ COMMENT= Tile-matching 8x8 puzzle game LICENSE= GPLv2 -BUILD_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm - WRKSRC= ${WRKDIR}/${PORTNAME:S/sdl/SDL/}-${PORTVERSION} +USES= gmake USE_SDL= sdl image mixer -USE_GMAKE= yes ALL_TARGET= -PLIST_FILES= bin/sdljewels \ - share/pixmaps/sdljewels.png - -PORTDATA= * PORTDOCS= ChangeLog README -DESKTOP_ENTRIES="SDL Jewels" "${COMMENT}" "sdljewels" \ - "sdljewels" "Game;ArcadeGame;" ${FALSE} +OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include +DESKTOP_ENTRIES="SDL Jewels" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;BoardGame;" "" post-patch: @${RM} -rf ${WRKSRC}/data/CVS - @${REINPLACE_CMD} -e 's|data/bigfont.ppm|${DATADIR}/data/bigfont.ppm|' \ - -e 's|dirlist\[\]="data";|dirlist[]="${DATADIR}/data";|' \ - -e 's|char name[256],|char name[512],|' \ + @${REINPLACE_CMD} -e 's|data/bigfont.ppm|${DATADIR}/data/bigfont.ppm| ; \ + s|dirlist\[\]="data";|dirlist[]="${DATADIR}/data";| ; \ + s|char name[256],|char name[512],|' \ ${WRKSRC}/gljewel.c ${WRKSRC}/sound.c - @${REINPLACE_CMD} -e 's|CFLAGS = -O2 -Wall|CFLAGS+=|' \ - -e 's|LDFLAGS =|LDFLAGS+=|' ${WRKSRC}/Makefile - -post-build: - @(cd ${WRKSRC} && \ - ${LOCALBASE}/bin/giftopnm ${DISTDIR}/${DIST_SUBDIR}/gljewel.gif | \ - ${LOCALBASE}/bin/pamscale .1 | ${LOCALBASE}/bin/pnmtopng > sdljewels.png) + @${REINPLACE_CMD} -e 's|CFLAGS = -O2 -Wall|CFLAGS+=| ; \ + s|LDFLAGS =|LDFLAGS+=|' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gljewel ${PREFIX}/bin/sdljewels - @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR}) - ${INSTALL_DATA} ${WRKSRC}/sdljewels.png ${PREFIX}/share/pixmaps - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/gljewel ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}) + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/games/sdl_jewels/distinfo ============================================================================== --- head/games/sdl_jewels/distinfo Tue Dec 24 22:36:46 2013 (r337393) +++ head/games/sdl_jewels/distinfo Tue Dec 24 22:58:42 2013 (r337394) @@ -1,4 +1,4 @@ SHA256 (sdl_jewels/SDL_jewels-1.1.1.tgz) = c9a40b7e18fabb03e4065e656bc2c30f595103bf20dc74a10847c3f3aa138ee7 SIZE (sdl_jewels/SDL_jewels-1.1.1.tgz) = 195366 -SHA256 (sdl_jewels/gljewel.gif) = 73e5cf488e9a7c399b30d72f9920412834386b6eb6c66fdd0e941300e220683d -SIZE (sdl_jewels/gljewel.gif) = 57312 +SHA256 (sdl_jewels/sdl_jewels.png) = 0d84c2b23e7a8aee7d485e63d3222bd9188149829ecdea848302bde1f5e7083d +SIZE (sdl_jewels/sdl_jewels.png) = 5043 Added: head/games/sdl_jewels/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/sdl_jewels/pkg-plist Tue Dec 24 22:58:42 2013 (r337394) @@ -0,0 +1,12 @@ +bin/sdl_jewels +share/pixmaps/sdl_jewels.png +%%DATADIR%%/data/alert.raw +%%DATADIR%%/data/bigdrop.raw +%%DATADIR%%/data/bigfont.ppm +%%DATADIR%%/data/drop.raw +%%DATADIR%%/data/gameover.raw +%%DATADIR%%/data/illegal.raw +%%DATADIR%%/data/row.raw +%%DATADIR%%/data/swap.raw +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%%