Index: head/graphics/milton/Makefile
===================================================================
--- head/graphics/milton/Makefile	(revision 505021)
+++ head/graphics/milton/Makefile	(revision 505022)
@@ -1,51 +1,53 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	milton
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Infinite-canvas paint program
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	icotool:graphics/icoutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	serge-rgb
 
-USES=		cmake gl gnome
-USE_GL=		gl
-USE_GNOME=	gtk20
+USES=		cmake compiler:c++11-lang gl gnome sdl
+USE_GL=		gl glu
+USE_GNOME=	cairo gtk20
 USE_SDL=	sdl2 image2
+USE_XORG=	ice sm x11 xext xi
 INSTALLS_ICONS=	yes
 
 PLIST_FILES=	bin/milton ${DATADIR_REL}/Carlito.ttf
 .for n in 16 32 48 64 128 256
 PLIST_FILES+=	share/icons/hicolor/${n}x${n}/apps/milton.png
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:__linux__:__${OPSYS}__:' \
 		${WRKSRC}/src/easytab.h
 	@${REINPLACE_CMD} -e 's:Carlito\.ttf:${DATADIR}/&:' \
 		${WRKSRC}/src/sdl_milton.cc
 	@${REINPLACE_CMD} -e 's:milton\.png:${PREFIX}/share/icons/hicolor/256x256/apps/&:' \
 		${WRKSRC}/src/platform_linux.cc
+	@${REINPLACE_CMD} -E '/case (ENODATA|ENOST?R|ETIME):/d' \
+		${WRKSRC}/src/shadergen.cc
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/Milton \
 		${STAGEDIR}${PREFIX}/bin/milton
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/third_party/Carlito.ttf \
 		${STAGEDIR}${DATADIR}
 .for n in 16 32 48 64 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/milton_icon_?_${n}x${n}x32.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/milton.png
 .endfor
 
 .include <bsd.port.mk>
Index: head/graphics/milton/distinfo
===================================================================
--- head/graphics/milton/distinfo	(revision 505021)
+++ head/graphics/milton/distinfo	(revision 505022)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552623103
-SHA256 (serge-rgb-milton-v1.6.0_GH0.tar.gz) = 0c3b6e1774678af1efa7c4018d2a2281838c0e748c6e594d059d49eae57c3638
-SIZE (serge-rgb-milton-v1.6.0_GH0.tar.gz) = 12056633
+TIMESTAMP = 1559748893
+SHA256 (serge-rgb-milton-v1.6.2_GH0.tar.gz) = 2f8dc4dd912eda2afe16b741def1eb0136dbd7da910d8715a5406169a342ac87
+SIZE (serge-rgb-milton-v1.6.2_GH0.tar.gz) = 12062781
Index: head/graphics/milton/files/patch-src_system__includes.h
===================================================================
--- head/graphics/milton/files/patch-src_system__includes.h	(revision 505021)
+++ head/graphics/milton/files/patch-src_system__includes.h	(revision 505022)
@@ -1,11 +1,18 @@
---- src/system_includes.h.orig	2019-03-15 04:11:43 UTC
+--- src/system_includes.h.orig	2019-06-05 15:34:53 UTC
 +++ src/system_includes.h
-@@ -48,7 +48,7 @@
+@@ -41,14 +41,12 @@
+ #include <string.h>
+ #include <inttypes.h>
+ 
+-#include <xmmintrin.h>
+-#include <emmintrin.h>
+ 
+ #if defined(_WIN32)
  
  #include "gl.h"
  
 -#elif defined(__linux__)
 +#elif defined(__linux__) || defined(__FreeBSD__)
  
  #include "gl.h"