From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 9 17:00:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6079589E for ; Fri, 9 Nov 2012 17:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 31E458FC0A for ; Fri, 9 Nov 2012 17:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9H00dm067394 for ; Fri, 9 Nov 2012 17:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qA9H00mY067393; Fri, 9 Nov 2012 17:00:00 GMT (envelope-from gnats) Resent-Date: Fri, 9 Nov 2012 17:00:00 GMT Resent-Message-Id: <201211091700.qA9H00mY067393@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 32D5E848 for ; Fri, 9 Nov 2012 16:55:40 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id 9E8988FC0C for ; Fri, 9 Nov 2012 16:55:39 +0000 (UTC) Received: (qmail invoked by alias); 09 Nov 2012 16:55:36 -0000 Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201] by mail.gmx.net (mp033) with SMTP; 09 Nov 2012 17:55:36 +0100 Received: by something.email.com (sSMTP sendmail emulation); Fri, 09 Nov 2012 17:55:35 +0100 Message-Id: <20121109165540.32D5E848@hub.freebsd.org> Date: Fri, 09 Nov 2012 17:55:35 +0100 From: nemysis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/173504: [PATCH] games/xye: update to 0.12.1, take maintainership, OptionsNG, added Desktop entries, changed pkg-plist Cc: gogo@cs.uni-sb.de X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2012 17:00:01 -0000 >Number: 173504 >Category: ports >Synopsis: [PATCH] games/xye: update to 0.12.1, take maintainership, OptionsNG, added Desktop entries, changed pkg-plist >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Nov 09 17:00:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC >Description: - Update to 0.12.1 - Take maintainership Added file(s): - files/pkg-message.in Makefile changed: +MASTER_SITES= +DISTFILES= +DIST_SUBDIR= ${PORTNAME} +EXTRACT_ONLY= +LICENSE= ZLIB +EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip +LEVELS= +LEVELS_XYE= +DESKTOP_ENTRIES= +SUB_FILES= pkg-message +OPTIONS_DEFINE= DOCS +.include +post-extract-script: post-patch: +post-install: Port maintainer (gogo@cs.uni-sb.de) is cc'd. Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports) >How-To-Repeat: portlint -A WARN: Makefile: [65]: use ${VARIABLE}, instead of $(VARIABLE). WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy. 0 fatal errors and 2 warnings found. WARN: Makefile: [65] because is used @${REINPLACE_CMD} -e 's|docedir = $$(datadir)|docedir = ${PREFIX}/share/doc|' ${WRKSRC}/Makefile.in port test: clean Can't give build log, because RedPorts not works at the time. >Fix: --- xye-0.12.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/games/xye/Makefile ./Makefile --- /usr/ports/games/xye/Makefile 2012-06-01 07:19:32.000000000 +0200 +++ ./Makefile 2012-11-09 17:47:15.000000000 +0100 @@ -6,13 +6,29 @@ # PORTNAME= xye -PORTVERSION= 0.9.1 -PORTREVISION= 6 +PORTVERSION= 0.12.1 CATEGORIES= games -MASTER_SITES= SF +MASTER_SITES= SF:game \ + http://xye.sourceforge.net/levels/ \ + http://xye.sourceforge.net/:xmas \ + SF/nemysisfreebsdp/:nemysis +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:game \ + ${LEVELS:S/$/.zip/} \ + ${LEVELS_XYE:S/$/.xye/} \ + xmas-xye-2009.zip:xmas \ + xye_extra_levels.20121109.zip:nemysis +DIST_SUBDIR= ${PORTNAME} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${LEVELS:S/$/.zip/} \ + xmas-xye-2009.zip \ + xye_extra_levels.20121109.zip -MAINTAINER= gogo@cs.uni-sb.de -COMMENT= A puzzle game for X +MAINTAINER= nemysis@gmx.ch +COMMENT= Puzzle games like sokoban or boulderdash + +LICENSE= ZLIB + +EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip USE_SDL= sdl image ttf GNU_CONFIGURE= yes @@ -20,10 +36,43 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes -.ifdef NOPORTDOCS +LEVELS= Xye%20level%20-%20Open%20Ended Xye%20level%20-%20Sorting \ + Xye%20level%20-%20The%20insider Xye%20level%20-%20The%20slow%20speedrun \ + Xye%20level%20-%20disturbingarrows Xye%20level%20-%20Duels%20of%20fate \ + nuffmagnets Xye%20levels%20-%20Pyramid%20treasure afirflood \ + Xye%20level%20-%20Blob%20prison Xye%20levels%20-%20ActionReplay \ + Xye%20level%20-%20gravity Xye%20level%20-%20pluzze + +LEVELS_XYE= dungeon turnaround chekhov + +DESKTOP_ENTRIES="Xye" "${COMMENT}" "${PORTNAME}" \ + "${PORTNAME}" "Game;LogicGame;" ${FALSE} + +SUB_FILES= pkg-message + +OPTIONS_DEFINE= DOCS + +.include + +post-extract-script: +.for f in ${LEVELS:S/$/.zip/} xmas-xye-2009.zip xye_extra_levels.20121109.zip + @${UNZIP_CMD} -qoj -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${f} +.endfor + @cd ${WRKDIR} && ${COPYTREE_SHARE} "*.xye *.txt" ${DATADIR}/levels + post-patch: + @${REINPLACE_CMD} -e 's|docedir = $$(datadir)|docedir = ${PREFIX}/share/doc|' ${WRKSRC}/Makefile.in + +.if !${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} '/install-data-am:/s/install-doceDATA//' \ ${WRKSRC}/Makefile.in .endif +post-install: + ${LN} -sf ${DATADIR}/res/detailed_icon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png + + @${ECHO_CMD} + @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} + .include diff -ruN --exclude=CVS /usr/ports/games/xye/distinfo ./distinfo --- /usr/ports/games/xye/distinfo 2011-07-03 16:25:34.000000000 +0200 +++ ./distinfo 2012-11-09 17:16:11.000000000 +0100 @@ -1,2 +1,38 @@ -SHA256 (xye-0.9.1.tar.gz) = 950851420c9b5d4ed4c993552092852b8261441a609150043c7fc20883299b30 -SIZE (xye-0.9.1.tar.gz) = 1217636 +SHA256 (xye/xye-0.12.1.tar.gz) = bbeb3265b0795f14deb2851b4a3bda7dde9b07d624a7ca5fb88cd7acabcf3967 +SIZE (xye/xye-0.12.1.tar.gz) = 2850776 +SHA256 (xye/Xye%20level%20-%20Open%20Ended.zip) = ef3076a0f7b77ce1195195788da7e62939513fac7a7bdd883618d115f3712348 +SIZE (xye/Xye%20level%20-%20Open%20Ended.zip) = 3244 +SHA256 (xye/Xye%20level%20-%20Sorting.zip) = f74894d02a99523f3b2f74d93613ea2bd0202cabd0c3467f57daabae20594457 +SIZE (xye/Xye%20level%20-%20Sorting.zip) = 2750 +SHA256 (xye/Xye%20level%20-%20The%20insider.zip) = d4f11e82727732012268178e824c4c725dc11b722a9e1d8761c699361bbe8973 +SIZE (xye/Xye%20level%20-%20The%20insider.zip) = 2658 +SHA256 (xye/Xye%20level%20-%20The%20slow%20speedrun.zip) = 266e3c72c0584c4f0c77339321827957e753d4611a248dd8bf4b4778fd847536 +SIZE (xye/Xye%20level%20-%20The%20slow%20speedrun.zip) = 2871 +SHA256 (xye/Xye%20level%20-%20disturbingarrows.zip) = d11a31cdfa015cc4a452363e10938eaa006811043b98308c077919f7e8464e8c +SIZE (xye/Xye%20level%20-%20disturbingarrows.zip) = 2784 +SHA256 (xye/Xye%20level%20-%20Duels%20of%20fate.zip) = 64c5002e0fe9128277ff7798baf03af6d0c4bc174a79a20513e2a8900fac9cb2 +SIZE (xye/Xye%20level%20-%20Duels%20of%20fate.zip) = 2050 +SHA256 (xye/nuffmagnets.zip) = 03882bec5af7cfbfadcec39f0fe2ae5661c7268d7a62df90a8a41c8761d5c450 +SIZE (xye/nuffmagnets.zip) = 4117 +SHA256 (xye/Xye%20levels%20-%20Pyramid%20treasure.zip) = a85b535b94c30108036b8d2da4d042aa5602f3b2121b1b47a6c351a4cb3fee1d +SIZE (xye/Xye%20levels%20-%20Pyramid%20treasure.zip) = 7660 +SHA256 (xye/afirflood.zip) = fc41dd6b290a5e2540d6f0bc9ce9f2bb3fc4adcf4b8b456bab9ff146ea3bce9b +SIZE (xye/afirflood.zip) = 2217 +SHA256 (xye/Xye%20level%20-%20Blob%20prison.zip) = b4994086cf2ffbde695c537a003ba7f04e7e5e6ca7b33d787fb1d73be629e446 +SIZE (xye/Xye%20level%20-%20Blob%20prison.zip) = 2105 +SHA256 (xye/Xye%20levels%20-%20ActionReplay.zip) = ff3330abe2b13c23cc052442ccb7effb5efee0173ce815366d95331832e6e8a9 +SIZE (xye/Xye%20levels%20-%20ActionReplay.zip) = 37395 +SHA256 (xye/Xye%20level%20-%20gravity.zip) = d7c47493d09584209a7027ae5bcc3d5807764996178840ab86e25f4784728a1d +SIZE (xye/Xye%20level%20-%20gravity.zip) = 2551 +SHA256 (xye/Xye%20level%20-%20pluzze.zip) = d62057824b8de3e83f39cdf9fa1bcd6c421d2a357cebf0644e171d7fbf623f16 +SIZE (xye/Xye%20level%20-%20pluzze.zip) = 1853 +SHA256 (xye/dungeon.xye) = 7615339919a3ae8991e5cee46d07e8e7e5fcf2c4456cad6c60b02cb85c1891bb +SIZE (xye/dungeon.xye) = 11341 +SHA256 (xye/turnaround.xye) = 2038203c290bafe0b67605dbe3c209aa3f49a73dde5ea9a0d96df0c771c85c70 +SIZE (xye/turnaround.xye) = 11356 +SHA256 (xye/chekhov.xye) = 20f6ca6850d17fdd06e32370e5018940ccc8a2f231627aeec064d8ab4e53cb5b +SIZE (xye/chekhov.xye) = 10247 +SHA256 (xye/xmas-xye-2009.zip) = 2db90f4155a16ad9a8edb343747b37adba82f1138b253b8a5aa531a451aec261 +SIZE (xye/xmas-xye-2009.zip) = 9763 +SHA256 (xye/xye_extra_levels.20121109.zip) = 3912f4b9b6849cc197733a38792ca623569e4e82428a910341cadea66579ef87 +SIZE (xye/xye_extra_levels.20121109.zip) = 47941 diff -ruN --exclude=CVS /usr/ports/games/xye/files/pkg-message.in ./files/pkg-message.in --- /usr/ports/games/xye/files/pkg-message.in 1970-01-01 01:00:00.000000000 +0100 +++ ./files/pkg-message.in 2012-11-09 17:37:03.000000000 +0100 @@ -0,0 +1,22 @@ +=============================================================================== + +Xye has been installed. + +Xye can use Kye and Sokoban levels. + +In addition, you can search for additional extra Levels here: + + http://xye.sourceforge.net/levels.php + + http://xyegame.blogspot.com/ + +and other Sites and put it in: + + ~/.xye/levels + + +You could manually change Permissions these Levels with: + + /bin/chmod 444 ~/.xye/levels + +=============================================================================== diff -ruN --exclude=CVS /usr/ports/games/xye/pkg-descr ./pkg-descr --- /usr/ports/games/xye/pkg-descr 2006-06-10 17:07:36.000000000 +0200 +++ ./pkg-descr 2012-11-09 17:26:55.000000000 +0100 @@ -1,6 +1,6 @@ -In this game you have to get/eat all the diamonds in the level, -but it is not as easy as it sounds, many dangers are present, -traps made out of those arrow blocks, for example. -Also beasts that try to eat you. +Xye is a puzzle game in which the objective is to help a character that looks +like a green circle to get all the gems in the room. This is, of course, +not as easy as it sounds, Xye must solve all sorts of puzzles while +at the same time avoiding all sorts of traps and beasts. WWW: http://xye.sourceforge.net/ diff -ruN --exclude=CVS /usr/ports/games/xye/pkg-plist ./pkg-plist --- /usr/ports/games/xye/pkg-plist 2009-09-16 00:23:39.000000000 +0200 +++ ./pkg-plist 2012-11-09 17:18:07.000000000 +0100 @@ -1,33 +1,77 @@ bin/xye -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/GAMEINTRO.txt -%%PORTDOCS%%%%DOCSDIR%%/xye.svg -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/ReadMe.html +%%PORTDOCS%%%%DOCSDIR%%/xye.svg +share/pixmaps/xye.png %%DATADIR%%/levels/5levels.xye +%%DATADIR%%/levels/ActionReplay v.1.xye +%%DATADIR%%/levels/ActionReplay v.2.xye +%%DATADIR%%/levels/ActionReplay v.3.xye +%%DATADIR%%/levels/Cracked Puzzle.xye +%%DATADIR%%/levels/Grassy.xye %%DATADIR%%/levels/Mic4.xye +%%DATADIR%%/levels/Phipps.xye +%%DATADIR%%/levels/Puzzle of Pyramid.txt +%%DATADIR%%/levels/Pyramid Treasure.xye +%%DATADIR%%/levels/SuperJustin.xye +%%DATADIR%%/levels/afirflood.xye +%%DATADIR%%/levels/blobprison.xye +%%DATADIR%%/levels/complexity.xye %%DATADIR%%/levels/cracked.xye -%%DATADIR%%/levels/kye.xye +%%DATADIR%%/levels/decision.xye +%%DATADIR%%/levels/disturbingarrows.xye +%%DATADIR%%/levels/duelsfate.xye +%%DATADIR%%/levels/fast.xye +%%DATADIR%%/levels/find1.xye +%%DATADIR%%/levels/gravity.xye +%%DATADIR%%/levels/insider.xye %%DATADIR%%/levels/levels.xye %%DATADIR%%/levels/logo.xye %%DATADIR%%/levels/microban.xsb +%%DATADIR%%/levels/need2.xye +%%DATADIR%%/levels/nuffmagnets.xye %%DATADIR%%/levels/oldtutorials.xye +%%DATADIR%%/levels/openended.xye +%%DATADIR%%/levels/pluzze.xye +%%DATADIR%%/levels/prison.xye %%DATADIR%%/levels/pxlevels.xye +%%DATADIR%%/levels/releasethem.xye +%%DATADIR%%/levels/savage.xye +%%DATADIR%%/levels/slowspeed.xye +%%DATADIR%%/levels/snowforts.xye +%%DATADIR%%/levels/sorting.xye %%DATADIR%%/levels/sphinx.xye %%DATADIR%%/levels/tutorials.xye +%%DATADIR%%/levels/twoinone.xye +%%DATADIR%%/levels/xmas2009.xye +%%DATADIR%%/levels/xmas_xye_readme.txt %%DATADIR%%/levels/xyester.xye +%%DATADIR%%/levels/xyester2.xye %%DATADIR%%/res/DejaVuSans-Bold.ttf %%DATADIR%%/res/DejaVuSans.ttf -%%DATADIR%%/res/classic.xml +%%DATADIR%%/res/clean40.png +%%DATADIR%%/res/clean40.xml +%%DATADIR%%/res/clean40_luminosity.png %%DATADIR%%/res/default.xml +%%DATADIR%%/res/default_icon.png +%%DATADIR%%/res/detailed.png +%%DATADIR%%/res/detailed.xml +%%DATADIR%%/res/detailed20.png +%%DATADIR%%/res/detailed20.xml +%%DATADIR%%/res/detailed30.png +%%DATADIR%%/res/detailed30.xml +%%DATADIR%%/res/detailed_COPYING +%%DATADIR%%/res/detailed_L.png +%%DATADIR%%/res/detailed_L20.png +%%DATADIR%%/res/detailed_L30.png +%%DATADIR%%/res/detailed_icon.png %%DATADIR%%/res/fon.bmp %%DATADIR%%/res/fon_bold.bmp -%%DATADIR%%/res/kye.png %%DATADIR%%/res/xye.png %%DATADIR%%/res/xye_luminosity.png -@dirrm %%DATADIR%%/levels @dirrm %%DATADIR%%/res +@dirrm %%DATADIR%%/levels @dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% --- xye-0.12.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: