From owner-svn-ports-head@FreeBSD.ORG Thu Dec 26 17:37:16 2013 Return-Path: Delivered-To: svn-ports-head@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 976CA355; Thu, 26 Dec 2013 17:37:16 +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 81CDA1320; Thu, 26 Dec 2013 17:37:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQHbG35094988; Thu, 26 Dec 2013 17:37:16 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQHbEBE094974; Thu, 26 Dec 2013 17:37:14 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312261737.rBQHbEBE094974@svn.freebsd.org> From: Rusmir Dusko Date: Thu, 26 Dec 2013 17:37:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337570 - in head/games/icebreaker: . 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.17 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, 26 Dec 2013 17:37:16 -0000 Author: nemysis Date: Thu Dec 26 17:37:13 2013 New Revision: 337570 URL: http://svnweb.freebsd.org/changeset/ports/337570 Log: - Bump PORTREVISION - Change master sites, 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 REINPLACE_CMD, fix for STAGEDIR - Break lines around 80 characters - Fix Desktop usage, add files/icebreaker.desktop instead of supplied desktop - Change patches and recreate with make makepatch - Add patch patch-transition.c, fix warning with Clang Approved by: pawel / wg (mentors, implicit) Added: head/games/icebreaker/files/icebreaker.desktop (contents, props changed) head/games/icebreaker/files/patch-transition.c (contents, props changed) head/games/icebreaker/pkg-plist (contents, props changed) Modified: head/games/icebreaker/Makefile head/games/icebreaker/distinfo (contents, props changed) head/games/icebreaker/files/patch-dialog.c (contents, props changed) head/games/icebreaker/files/patch-hiscore.c (contents, props changed) head/games/icebreaker/files/patch-line.c (contents, props changed) head/games/icebreaker/files/patch-options.c (contents, props changed) head/games/icebreaker/files/patch-penguin.c (contents, props changed) head/games/icebreaker/files/patch-themes.c (contents, props changed) Modified: head/games/icebreaker/Makefile ============================================================================== --- head/games/icebreaker/Makefile Thu Dec 26 17:36:30 2013 (r337569) +++ head/games/icebreaker/Makefile Thu Dec 26 17:37:13 2013 (r337570) @@ -3,62 +3,51 @@ PORTNAME= icebreaker PORTVERSION= 1.9.8 +PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= http://mattdm.org/icebreaker/1.9.x/ +MASTER_SITES= http://mattdm.org/icebreaker/1.9.x/ \ + SF/nemysisfreebsdp/games/${PORTNAME}/:icons EXTRACT_SUFX= .tgz +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}.png:icons +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= nemysis@FreeBSD.org COMMENT= Game similar to Jezzball or Barrack LICENSE= GPLv2 -BUILD_DEPENDS= pnmtopng:${PORTSDIR}/graphics/netpbm - +USES= gmake USE_SDL= mixer sdl -USE_GMAKE= yes - -PLIST_FILES= bin/${PORTNAME} \ - share/pixmaps/${PORTNAME}.png \ - share/applications/${PORTNAME}.desktop -PORTDATA= * -PORTDOCS= ChangeLog README README.SDL README.ifyoumakechanges README.themes TODO +PORTDOCS= ChangeLog README README.SDL README.ifyoumakechanges \ + README.themes TODO -MAN6= ${PORTNAME}.6 - -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} \ - -e 's|CC=gcc|CC?=g++|' \ - -e 's|sdl-config|$(SDL_CONFIG)|' \ - -e 's|prefix=/usr/local|prefix=${PREFIX}|' \ - -e 's|mandir=$$(prefix)/share/man|mandir=$$(prefix)/man|' \ - -e 's|highscoredir=/var/local/lib/games|highscoredir=/var/games|' \ - -e 's|CFLAGS=|CFLAGS+=|' \ - -e 's|OPTIMIZE=-O3|OPTIMIZE=|' \ - -e 's|$$(CC) $$(CFLAGS) $$^ -o icebreaker $$(SDL_LIB)|$$(CC) $$(LDFLAGS) $$(CFLAGS) $$^ -o icebreaker $$(SDL_LIB)|' \ - -e 's|install -s -g games -m 2755 icebreaker $(bindir)|install -g games -m 2755 icebreaker $(bindir)|' \ - -e 's|install -s -m 755 icebreaker $(bindir)|install -m 755 icebreaker $(bindir)|' \ - -e 's|chown -f games:games|chown -f root:games|' \ + -e 's|CC=gcc|CC?=gcc| ; \ + s|sdl-config|$(SDL_CONFIG)| ; \ + s|prefix=/usr/local|prefix=${STAGEDIR}${PREFIX}| ; \ + s|datadir=$$(prefix)/share|datadir=${STAGEDIR}${PREFIX}/share| ; \ + s|mandir=$$(prefix)/share/man|mandir=${STAGEDIR}${PREFIX}/man| ; \ + s|highscoredir=/var/local/lib/games|highscoredir=/var/games| ; \ + s|CFLAGS=|CFLAGS+=| ; \ + s|OPTIMIZE=-O3|OPTIMIZE=| ; \ + s|$$(CC) $$(CFLAGS)|$$(CC) $$(LDFLAGS) $$(CFLAGS)| ; \ + s|install -s -g games|install -g games| ; \ + s|install -s -m 755|install -m 755| ; \ + s|chown -f games:games|chown -f root:games| ; \ + s|$$(SRC:.c=.d)|$$(SRC:.c)|' \ ${WRKSRC}/Makefile - @${REINPLACE_CMD} \ - -e 's|%{Summary}|Game similar to Jezzball or Barrack|' \ - -e 's|/usr/share/icebreaker/icebreaker_48.bmp|icebreaker|' \ - ${WRKSRC}/icebreaker.desktop - -post-build: - @(cd ${WRKSRC} && ${LOCALBASE}/bin/winicontoppm -bestqual icebreaker_32.ico | \ - ${LOCALBASE}/bin/pnmtopng > icebreaker.png) post-install: - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} -.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/icebreaker/distinfo ============================================================================== --- head/games/icebreaker/distinfo Thu Dec 26 17:36:30 2013 (r337569) +++ head/games/icebreaker/distinfo Thu Dec 26 17:37:13 2013 (r337570) @@ -1,2 +1,4 @@ SHA256 (icebreaker-1.9.8.tgz) = 2e9b1e898c50562c503cb109172c422544d2e5de09e642bb8eb3401a9180adc4 SIZE (icebreaker-1.9.8.tgz) = 177355 +SHA256 (icebreaker.png) = bee29260a7e3fcd858b4286246d82df8747b73f2e5e31bc59b732b4df84efcd5 +SIZE (icebreaker.png) = 838 Added: head/games/icebreaker/files/icebreaker.desktop ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/icebreaker/files/icebreaker.desktop Thu Dec 26 17:37:13 2013 (r337570) @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=IceBreaker +GenericName=IceBreaker game +Comment=Addictive action-puzzle game involving bouncing penguins +Exec=icebreaker +Icon=icebreaker +Categories=Game;ArcadeGame; +Terminal=0 Modified: head/games/icebreaker/files/patch-dialog.c ============================================================================== --- head/games/icebreaker/files/patch-dialog.c Thu Dec 26 17:36:30 2013 (r337569) +++ head/games/icebreaker/files/patch-dialog.c Thu Dec 26 17:37:13 2013 (r337570) @@ -1,5 +1,5 @@ ---- dialog.c.orig 2002-06-02 16:25:51.000000000 +0200 -+++ dialog.c 2013-01-13 19:29:58.000000000 +0100 +--- ./dialog.c.orig 2002-06-02 16:25:51.000000000 +0200 ++++ ./dialog.c 2013-12-24 13:42:35.000000000 +0100 @@ -287,10 +287,10 @@ for (i=0;i