diff -urN /usr/ports/games/polypuzzle/Makefile games/polypuzzle/Makefile
--- /usr/ports/games/polypuzzle/Makefile	2015-11-09 22:25:24.735436000 +0900
+++ games/polypuzzle/Makefile	2016-03-02 00:00:00.000000000 +0900
@@ -2,41 +2,32 @@
 # $FreeBSD: head/games/polypuzzle/Makefile 401096 2015-11-09 12:59:03Z antoine $
 
 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
+NO_ARCH=	yes
+NO_BUILD=	yes
 
-USES= 		tk:84,run tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_BUILD=	yes
 
-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
+USES= 		tar:tgz tk:84,run
 
-OPTIONS_DEFINE=	DOCS
+DESKTOP_ENTRIES="PolyPuzzle" "" "" "polypuzzle" "" ""
 
-pre-install:
-	 @${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:g" ${WRKSRC}/polypuzzle
+post-patch:
+	 @${REINPLACE_CMD} -e \
+		's|%%WISH%%|${WISH:T}| ; \
+		 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
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} polypuzzle \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} colours menus pieces.* *.gif *.xbm \
+		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/polypuzzle/distinfo games/polypuzzle/distinfo
--- /usr/ports/games/polypuzzle/distinfo	2015-08-24 04:04:05.339329000 +0900
+++ games/polypuzzle/distinfo	2016-03-02 00:00:00.000000000 +0900
@@ -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
diff -urN /usr/ports/games/polypuzzle/files/patch-polypuzzle games/polypuzzle/files/patch-polypuzzle
--- /usr/ports/games/polypuzzle/files/patch-polypuzzle	2015-08-24 04:04:05.354886000 +0900
+++ games/polypuzzle/files/patch-polypuzzle	2016-03-02 00:00:00.000000000 +0900
@@ -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
+ 
diff -urN /usr/ports/games/polypuzzle/pkg-descr games/polypuzzle/pkg-descr
--- /usr/ports/games/polypuzzle/pkg-descr	2015-08-24 04:04:05.351187000 +0900
+++ games/polypuzzle/pkg-descr	2016-03-02 00:00:00.000000000 +0900
@@ -1,5 +1,4 @@
-Tessellation puzzle inspired by Beat The Computer.
-Puzzles implemented include several based on
-squares, hexagons and equilateral triangles.
+Tessellation puzzle inspired by Beat The Computer. Puzzles implemented
+include several based on squares, hexagons and equilateral triangles.
 
-WWW: ftp://ibiblio.org/pub/Linux/games/
+WWW: http://tkgames.sourceforge.net/
diff -urN /usr/ports/games/polypuzzle/pkg-plist games/polypuzzle/pkg-plist
--- /usr/ports/games/polypuzzle/pkg-plist	2015-08-24 04:04:05.360306000 +0900
+++ games/polypuzzle/pkg-plist	2016-03-02 00:00:00.000000000 +0900
@@ -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