Index: head/games/jigzo/Makefile
===================================================================
--- head/games/jigzo/Makefile	(revision 382420)
+++ head/games/jigzo/Makefile	(revision 382421)
@@ -1,53 +1,54 @@
 # Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
 
 PORTNAME=	jigzo
 PORTVERSION=	0.6.1
 PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	http://www.iua.upf.es/~mdeboer/resorama/jigzo/ \
 		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	OpenGL jigsaw puzzle game
 
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/GPL.txt
+
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 USES=		gmake tar:tgz
 USE_SDL=	sdl mixer
 USE_GL=		gl
 MAKE_ARGS=	CXX=${CXX}
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 PORTDOCS=	*
 
 DESKTOP_ENTRIES="Jigzo" \
 		"An OpenGL jigsaw puzzle game" \
 		"" \
 		"jigzo" \
 		"Game;LogicGame;KidsGame;" \
 		false
 
 OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|int_p_NULL|NULL|g" \
 		${WRKSRC}/src/Loader.cxx
 .for i in font image puzzles sound
 	@${REINPLACE_CMD} -e "s|${i}/|${DATADIR}/${i}/|g" \
 	    ${WRKSRC}/src/main.cxx
 .endfor
 	@${FIND} ${WRKSRC} -name .thumbnails | ${XARGS} ${RM} -rf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "font image puzzles sound" \
 		${STAGEDIR}${DATADIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/jigzo/files/patch-src-main.cxx
===================================================================
--- head/games/jigzo/files/patch-src-main.cxx	(revision 382420)
+++ head/games/jigzo/files/patch-src-main.cxx	(revision 382421)
@@ -1,37 +1,45 @@
---- src/main.cxx.orig	2013-09-14 02:26:08.857226185 +0400
-+++ src/main.cxx	2013-09-14 02:28:44.311226803 +0400
-@@ -56,6 +56,7 @@
+--- src/main.cxx.orig	2008-05-09 02:39:02.000000000 +0400
++++ src/main.cxx	2015-03-27 17:21:48.934373000 +0300
+@@ -47,6 +47,7 @@
+ #include <fstream>
+ #include <string>
+ #include <sstream>
++#include <algorithm>
+ 
+ #ifdef WIN32
+ #include <io.h>
+@@ -56,6 +57,7 @@
  #include <sys/types.h>
  #endif
  #include <dirent.h>
 +#include <unistd.h> // for getpid()
  
  #include "Screen.hxx"
  #include "Sprite.hxx"
-@@ -1540,7 +1541,7 @@
+@@ -1540,7 +1542,7 @@
  		int i;
  		Uint8 *keys = SDL_GetKeyState(&i);
  		SDL_Event event;
 -		while (mode!=end) {
 +		while (mode!=::end) {
  			//static Uint32 mark = 0;
  			SDL_Delay(10);
  			while (SDL_PollEvent(&event)) {
-@@ -1579,7 +1580,7 @@
+@@ -1579,7 +1581,7 @@
  				if (clickLeave)
  				{
  					if (mode == intro)
 -						FadeOutTo(end_intro,end);
 +						FadeOutTo(end_intro,::end);
  					else if (mode == browse) {
  						FadeOutTo(end_browse,start_intro);
  					} else {
-@@ -1587,7 +1588,7 @@
+@@ -1587,7 +1589,7 @@
  					}
  				}
  				if (event.type == SDL_QUIT) {
 -					mode = end;
 +					mode = ::end;
  					break;
  				}
  			}