From owner-svn-ports-all@FreeBSD.ORG Thu Oct 11 13:43:45 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E6A6582E; Thu, 11 Oct 2012 13:43:44 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CF7C98FC17; Thu, 11 Oct 2012 13:43:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9BDhi36031668; Thu, 11 Oct 2012 13:43:44 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9BDhiTh031665; Thu, 11 Oct 2012 13:43:44 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201210111343.q9BDhiTh031665@svn.freebsd.org> From: Alex Kozlov Date: Thu, 11 Oct 2012 13:43:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305724 - 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.14 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: Thu, 11 Oct 2012 13:43:45 -0000 Author: ak Date: Thu Oct 11 13:43:44 2012 New Revision: 305724 URL: http://svn.freebsd.org/changeset/ports/305724 Log: - Convert Makefile headers to new style - Convert to new options framework - Remove redundant comments - Improve COMMENT - Add DESKTOP_ENTRIES - Fix typo in sed regexp - Bump PORTREVISION Submitted by: nemysis (maintainer) Feature safe: yes Modified: head/games/sdl_jewels/Makefile (contents, props changed) head/games/sdl_jewels/distinfo (contents, props changed) Modified: head/games/sdl_jewels/Makefile ============================================================================== --- head/games/sdl_jewels/Makefile Thu Oct 11 13:36:47 2012 (r305723) +++ head/games/sdl_jewels/Makefile Thu Oct 11 13:43:44 2012 (r305724) @@ -1,56 +1,63 @@ -# New Ports collection makefile for: SDL_jewels -# Date created: 2012-04-25 -# Whom: nemysis@gmx.ch -# # $FreeBSD$ -# PORTNAME= sdl_jewels PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= http://www.linuxmotors.com/gljewel/downloads/ -DISTNAME= ${PORTNAME:S/sdl/SDL/}-${PORTVERSION} -EXTRACT_SUFX= .tgz +MASTER_SITES= http://www.linuxmotors.com/gljewel/downloads/ \ + http://www.linuxmotors.com/gljewel/:icons +DISTFILES= ${PORTNAME:S/sdl/SDL/}-${DISTVERSION}.tgz \ + gljewel.gif:icons +DIST_SUBDIR= ${PORTNAME} +EXTRACT_ONLY= ${PORTNAME:S/sdl/SDL/}-${DISTVERSION}.tgz MAINTAINER= nemysis@gmx.ch -COMMENT= SDL Jewels is a tile-matching 8x8 puzzle game +COMMENT= Tile-matching 8x8 puzzle game LICENSE= GPLv2 +BUILD_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm + +WRKSRC= ${WRKDIR}/${PORTNAME:S/sdl/SDL/}-${PORTVERSION} + USE_SDL= sdl image mixer USE_GMAKE= yes MAKE_JOBS_SAFE= yes +ALL_TARGET= -PLIST_FILES= bin/sdljewels +PLIST_FILES= bin/sdljewels \ + share/pixmaps/sdljewels.png PORTDATA= * PORTDOCS= ChangeLog README -ALL_TARGET= +DESKTOP_ENTRIES="SDL Jewels" "${COMMENT}" "sdljewels" \ + "sdljewels" "Game;ArcadeGame;" ${FALSE} + +.include post-patch: @${RM} -rf ${WRKSRC}/data/CVS -# Fix data location - @${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],!' \ - ${WRKSRC}/gljewel.c ${WRKSRC}/sound.c -# Fix CFLAGS/LDFLAGS - @${REINPLACE_CMD} -e 's!CFLAGS = -O2 -Wall!CFLAGS+=!' \ - -e 's!LDFLAGS =!LDFLAGS+=!' ${WRKSRC}/Makefile + @${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],|' \ + ${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) do-install: -# Executable ${INSTALL_PROGRAM} ${WRKSRC}/gljewel ${PREFIX}/bin/sdljewels -# Data - (cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR}) + ${INSTALL_DATA} ${WRKSRC}/sdljewels.png ${PREFIX}/share/pixmaps -# Documentation -.if !defined(NOPORTDOCS) +.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/sdl_jewels/distinfo ============================================================================== --- head/games/sdl_jewels/distinfo Thu Oct 11 13:36:47 2012 (r305723) +++ head/games/sdl_jewels/distinfo Thu Oct 11 13:43:44 2012 (r305724) @@ -1,2 +1,4 @@ -SHA256 (SDL_jewels-1.1.1.tgz) = c9a40b7e18fabb03e4065e656bc2c30f595103bf20dc74a10847c3f3aa138ee7 -SIZE (SDL_jewels-1.1.1.tgz) = 195366 +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