From owner-svn-ports-all@freebsd.org Wed Mar 2 01:13:14 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EDDAABEB9E; Wed, 2 Mar 2016 01:13:14 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B86F1FE2; Wed, 2 Mar 2016 01:13:14 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u221DD62096794; Wed, 2 Mar 2016 01:13:13 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u221DCHG096789; Wed, 2 Mar 2016 01:13:12 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201603020113.u221DCHG096789@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Wed, 2 Mar 2016 01:13:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409905 - in head/games/polypuzzle: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 02 Mar 2016 01:13:14 -0000 Author: madpilot Date: Wed Mar 2 01:13:12 2016 New Revision: 409905 URL: https://svnweb.freebsd.org/changeset/ports/409905 Log: - Update to 1.8.2 - Update MASTER_SITES and unbreak - Remove DOCS option since those files are not included anymore. - Update pkg-descr PR: 205207 Submitted by: Ports fury Modified: head/games/polypuzzle/Makefile head/games/polypuzzle/distinfo head/games/polypuzzle/files/patch-polypuzzle head/games/polypuzzle/pkg-descr head/games/polypuzzle/pkg-plist Modified: head/games/polypuzzle/Makefile ============================================================================== --- head/games/polypuzzle/Makefile Wed Mar 2 00:12:11 2016 (r409904) +++ head/games/polypuzzle/Makefile Wed Mar 2 01:13:12 2016 (r409905) @@ -2,41 +2,28 @@ # $FreeBSD$ PORTNAME= polypuzzle -PORTVERSION= 1.6 -PORTREVISION= 1 +PORTVERSION= 1.8.2 CATEGORIES= games tcl tk -MASTER_SITES= ftp://ibiblio.org/pub/Linux/games/ +MASTER_SITES= SF/tkgames/${PORTNAME}/main MAINTAINER= ports@FreeBSD.org COMMENT= Tessellation puzzle game -BROKEN= unfetchable - -USES= tk:84,run tar:tgz +USES= tar:tgz tk:84,run WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes +NO_ARCH= yes +DESKTOP_ENTRIES="PolyPuzzle" "" "" "polypuzzle" "" "" -DOC_FILES= About Bugs Changelog Install Instructions Links Math Readme \ - Thanks Todo -DATA_FILES= menus pieces.3x20 pieces.783 pieces.bonus pieces.colours \ - pieces.flower pieces.large pieces.medium pieces.monster \ - pieces.round pieces.small pieces.square pieces.star \ - pieces.triangle - -OPTIONS_DEFINE= DOCS - -pre-install: - @${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:g" ${WRKSRC}/polypuzzle +post-patch: + @${REINPLACE_CMD} -e 's|%%WISH%%|${WISH:T}|' \ + -e 's|%%DATADIR%%|${DATADIR}|g' \ + ${WRKSRC}/polypuzzle do-install: ${INSTALL_SCRIPT} ${WRKSRC}/polypuzzle ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DATADIR} -.for f in ${DATA_FILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR} -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} -.endfor + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_DATA} colours menus pieces.* *.gif *.xbm \ + ${STAGEDIR}${DATADIR}) .include Modified: head/games/polypuzzle/distinfo ============================================================================== --- head/games/polypuzzle/distinfo Wed Mar 2 00:12:11 2016 (r409904) +++ head/games/polypuzzle/distinfo Wed Mar 2 01:13:12 2016 (r409905) @@ -1,2 +1,2 @@ -SHA256 (polypuzzle-1.6.tgz) = c8f0ae00b50bedc0cd1ddda21fcf491c0fc1b1e1d4e35d61d3b23e8740fa70a9 -SIZE (polypuzzle-1.6.tgz) = 16814 +SHA256 (polypuzzle-1.8.2.tgz) = ef5c654b38dd1c31649d6805c52afb65ed8d61d0795c1f997607133fc0758425 +SIZE (polypuzzle-1.8.2.tgz) = 33088 Modified: head/games/polypuzzle/files/patch-polypuzzle ============================================================================== --- head/games/polypuzzle/files/patch-polypuzzle Wed Mar 2 00:12:11 2016 (r409904) +++ head/games/polypuzzle/files/patch-polypuzzle Wed Mar 2 01:13:12 2016 (r409905) @@ -1,13 +1,22 @@ ---- polypuzzle.orig Fri Jun 18 11:51:04 2004 -+++ polypuzzle Wed Jun 30 13:46:07 2004 +--- polypuzzle.orig 2008-10-26 00:53:04 UTC ++++ polypuzzle @@ -1,8 +1,8 @@ - #/bin/sh + #!/bin/sh # the next line restarts using tclsh \ -exec wish "$0" "$@" -+exec wish8.4 "$0" "$@" ++exec %%WISH%% "$0" "$@" -if {[file isdirectory /usr/local/lib/polypuzzle]} {cd /usr/local/lib/polypuzzle} +if {[file isdirectory %%DATADIR%%]} {cd %%DATADIR%%} - source pieces.colours - set colour(bg) azure3 ;# background colour + # wish8.5.2 still occasionally has problems for polypuzzle without this hack: + set tcl_precision 12 +@@ -380,7 +380,7 @@ proc DrawPiece {n xpos ypos} { + # Place this piece on top (but underneath text, which is our ceiling) + # in windows tcl 8.2 this generates an error on initiation + # as text is not defined - ooh noo (but is ok in tcl832) +- .c lower piece$n text ++ # .c lower piece$n text + + .c move piece$n $xpos $ypos + Modified: head/games/polypuzzle/pkg-descr ============================================================================== --- head/games/polypuzzle/pkg-descr Wed Mar 2 00:12:11 2016 (r409904) +++ head/games/polypuzzle/pkg-descr Wed Mar 2 01:13:12 2016 (r409905) @@ -2,4 +2,4 @@ Tessellation puzzle inspired by Beat The Puzzles implemented include several based on squares, hexagons and equilateral triangles. -WWW: ftp://ibiblio.org/pub/Linux/games/ +WWW: http://tkgames.sourceforge.net/ Modified: head/games/polypuzzle/pkg-plist ============================================================================== --- head/games/polypuzzle/pkg-plist Wed Mar 2 00:12:11 2016 (r409904) +++ head/games/polypuzzle/pkg-plist Wed Mar 2 01:13:12 2016 (r409905) @@ -1,25 +1,20 @@ bin/polypuzzle +%%DATADIR%%/colours +%%DATADIR%%/icon.xbm +%%DATADIR%%/iconmask.xbm %%DATADIR%%/menus %%DATADIR%%/pieces.3x20 %%DATADIR%%/pieces.783 %%DATADIR%%/pieces.bonus -%%DATADIR%%/pieces.colours +%%DATADIR%%/pieces.chessboard %%DATADIR%%/pieces.flower +%%DATADIR%%/pieces.krazy %%DATADIR%%/pieces.large %%DATADIR%%/pieces.medium %%DATADIR%%/pieces.monster +%%DATADIR%%/pieces.round %%DATADIR%%/pieces.small %%DATADIR%%/pieces.square -%%DATADIR%%/pieces.round %%DATADIR%%/pieces.star %%DATADIR%%/pieces.triangle -%%PORTDOCS%%%%DOCSDIR%%/About -%%PORTDOCS%%%%DOCSDIR%%/Bugs -%%PORTDOCS%%%%DOCSDIR%%/Changelog -%%PORTDOCS%%%%DOCSDIR%%/Install -%%PORTDOCS%%%%DOCSDIR%%/Instructions -%%PORTDOCS%%%%DOCSDIR%%/Links -%%PORTDOCS%%%%DOCSDIR%%/Math -%%PORTDOCS%%%%DOCSDIR%%/Readme -%%PORTDOCS%%%%DOCSDIR%%/Thanks -%%PORTDOCS%%%%DOCSDIR%%/Todo +%%DATADIR%%/polylogo.gif