Date: Thu, 01 Nov 2012 21:47:04 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jgh@FreeBSD.org Subject: ports/173271: [MAINTAINER] games/kye: Fixed distfiles for Distilator, merged kye and kye-data, Removed all Notes Message-ID: <20121101204707.99CC58DC@hub.freebsd.org> Resent-Message-ID: <201211012050.qA1Ko1WW007483@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173271 >Category: ports >Synopsis: [MAINTAINER] games/kye: Fixed distfiles for Distilator, merged kye and kye-data, Removed all Notes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 01 20:50:01 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: Merged games/kye and games/kye-data Please after commit this PR delete Port games/kye-data Because bad distfiles with Distilator have make 3 tarballs with all Levels, all is stored on SF. In tarballs is all fixed what was before manually in kye-data. Makefile changed: +MASTER_SITES= http://games.moria.org.uk/kye/download/ \ + SF/nemysisfreebsdp/kye/:nemysis +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + kye-data_moria_levels.20121101.tar.gz:nemysis \ + kye-data_nuke_levels.20121101.tar.gz:nemysis \ + kye-data_extra_levels.20120818.tar.gz:nemysis +PORTDATA= * +post-extract-script: Changed files: - pkg-descr - pkg-plist Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: portlint -A looks fine. port test: clean Build log https://redports.org/buildarchive/20121101002126-51903/ >Fix: --- py27-kye-1.0_3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/games/kye/Makefile ./Makefile --- /usr/ports/games/kye/Makefile 2012-09-20 01:50:13.000000000 +0200 +++ ./Makefile 2012-11-01 01:09:54.000000000 +0100 @@ -7,10 +7,18 @@ PORTNAME= kye PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games python -MASTER_SITES= http://games.moria.org.uk/kye/download/ +MASTER_SITES= http://games.moria.org.uk/kye/download/ \ + SF/nemysisfreebsdp/kye/:nemysis PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +# Selection of production-ready/well-known Kye Levels +# (ziped Levels already included from games.moria.org.uk are excluded) +# Please contact the MAINTAINER if a Level is missing +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + kye-data_moria_levels.20121101.tar.gz:nemysis \ + kye-data_nuke_levels.20121101.tar.gz:nemysis \ + kye-data_extra_levels.20120818.tar.gz:nemysis DIST_SUBDIR= kye MAINTAINER= nemysis@gmx.ch @@ -23,26 +31,32 @@ USE_PYDISTUTILS= yes NO_BUILD= yes +PORTDATA= * PORTDOCS= NEWS README SUB_FILES= pkg-message +DESKTOP_ENTRIES="Python Kye" "${COMMENT}" "Kye" \ + "Kye" "Game;LogicGame;" ${FALSE} + .include <bsd.port.options.mk> +post-extract-script: + ${MKDIR} ${WRKDIR}/${PORTNAME} +.for l in kye-data_moria_levels.20121101.tar.gz kye-data_nuke_levels.20121101.tar.gz kye-data_extra_levels.20120818.tar.gz + ${TAR} xfjp ${DISTDIR}/${DIST_SUBDIR}/${l} -C ${WRKDIR}/${PORTNAME} +.endfor + post-install: -# Data ${INSTALL_DATA} ${WRKSRC}/kye-icon.png ${PREFIX}/share/pixmaps/Kye.png ${INSTALL_DATA} ${WRKSRC}/kye-edit-icon.png ${PREFIX}/share/pixmaps/Kye-edit.png + @cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} \* ${DATADIR} -# Documentation .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} -. for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -. endfor + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif -# pkg-message @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} diff -ruN --exclude=CVS /usr/ports/games/kye/distinfo ./distinfo --- /usr/ports/games/kye/distinfo 2012-08-04 23:59:15.000000000 +0200 +++ ./distinfo 2012-11-01 01:10:02.000000000 +0100 @@ -1,2 +1,8 @@ SHA256 (kye/kye-1.0.tar.gz) = d58a9e62a0ec736a072a932603cdc5b3f4890b28c32c346639513d4e247ca747 SIZE (kye/kye-1.0.tar.gz) = 55245 +SHA256 (kye/kye-data_moria_levels.20121101.tar.gz) = 2c96f8e4146df5144aa97dd050c248240671df3533619b924c17e21bbc2de5fe +SIZE (kye/kye-data_moria_levels.20121101.tar.gz) = 51200 +SHA256 (kye/kye-data_nuke_levels.20121101.tar.gz) = 9ccd96ded14cc5907fcb417a7219e9a5e11e3dc8f0a9c1fd049e0b4bd5523769 +SIZE (kye/kye-data_nuke_levels.20121101.tar.gz) = 294912 +SHA256 (kye/kye-data_extra_levels.20120818.tar.gz) = 9ddee7e21607c7fe425f24d7aa71e7120c29e885320eb2ed880b0f5a882ea5e4 +SIZE (kye/kye-data_extra_levels.20120818.tar.gz) = 455680 diff -ruN --exclude=CVS /usr/ports/games/kye/files/pkg-message.in ./files/pkg-message.in --- /usr/ports/games/kye/files/pkg-message.in 2012-08-04 23:59:15.000000000 +0200 +++ ./files/pkg-message.in 2012-11-01 01:13:30.000000000 +0100 @@ -4,10 +4,7 @@ This package does not include all Python Kye Levels. -To obtain the original extra Levels use the "games/kye-data" Port. - - -In addition, you can search for additional extra Levels here: +You can search for additional extra Levels here: http://kye.8m.com/gfclevels.html diff -ruN --exclude=CVS /usr/ports/games/kye/pkg-descr ./pkg-descr --- /usr/ports/games/kye/pkg-descr 2012-08-04 23:59:15.000000000 +0200 +++ ./pkg-descr 2012-11-01 00:29:04.000000000 +0100 @@ -9,3 +9,5 @@ for instance. WWW: http://games.moria.org.uk/kye/ +WWW: http://www.nuke.demon.co.uk/kye/levels/ +WWW: https://sourceforge.net/projects/nemysisfreebsdp/files/kye/ diff -ruN --exclude=CVS /usr/ports/games/kye/pkg-plist ./pkg-plist --- /usr/ports/games/kye/pkg-plist 2012-09-20 01:50:13.000000000 +0200 +++ ./pkg-plist 2012-11-01 01:11:29.000000000 +0100 @@ -42,13 +42,8 @@ %%PYTHON_SITELIBDIR%%/kye/stbar.py %%PYTHON_SITELIBDIR%%/kye/stbar.pyc %%PYTHON_SITELIBDIR%%/kye/stbar.pyo -%%DATADIR%%/images.tar.gz -%%DATADIR%%/intro.kye -%%DATADIR%%/quests.kye -%%DATADIR%%/template.kye share/pixmaps/Kye-edit.png share/pixmaps/Kye.png -@dirrmtry %%DATADIR%% -@dirrmtry %%PYTHON_SITELIBDIR%%/kye +@dirrm %%PYTHON_SITELIBDIR%%/kye @dirrmtry %%PYTHON_SITELIBDIR%% -@dirrmtry %%PYTHON_LIBDIR%% +@dirrmtry lib/python2.7 --- py27-kye-1.0_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121101204707.99CC58DC>