Index: head/x11-toolkits/scintilla/Makefile
===================================================================
--- head/x11-toolkits/scintilla/Makefile	(revision 491443)
+++ head/x11-toolkits/scintilla/Makefile	(revision 491444)
@@ -1,56 +1,56 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scintilla
-DISTVERSION=	4.0.2
-PORTREVISION=	1
+DISTVERSION=	4.1.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Full-featured free source code editing component for GTK+
 
 LICENSE=	SCINTILLA
 LICENSE_NAME=	License for Scintilla and SciTE
 LICENSE_FILE=	${WRKSRC}/../License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
+USES=		compiler:c++17-lang gmake iconv pkgconfig tar:tgz
 
-USES=		compiler:c++14-lang gmake iconv pkgconfig tar:tgz
+WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
+CXXSTD=		gnu++17
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk20
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-DPIC ${PICFLAG}
 
 MAJOR=		2
 AGE=		0
 REVISION=	0
 MAKE_ARGS=	MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
 PLIST_SUB=	MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla
 .for f in libscintilla.so libscintilla_lexers.so
 	${INSTALL_LIB} ${WRKSRC}/${f}.${MAJOR}.${AGE}.${REVISION} \
 		${STAGEDIR}${PREFIX}/lib
 	(cd ${STAGEDIR}${PREFIX}/lib && \
 		${LN} -sf ${f}.${MAJOR}.${AGE}.${REVISION} ${f}.${MAJOR} && \
 		${LN} -sf ${f}.${MAJOR} ${f})
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/x11-toolkits/scintilla/distinfo
===================================================================
--- head/x11-toolkits/scintilla/distinfo	(revision 491443)
+++ head/x11-toolkits/scintilla/distinfo	(revision 491444)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516053463
-SHA256 (scite402.tgz) = 1f9bb8eccbaed77c110c30c0e6dbaac04b3f62b751a930192b133a7b6f0f29fb
-SIZE (scite402.tgz) = 2424648
+TIMESTAMP = 1529613442
+SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7
+SIZE (scite410.tgz) = 2493701
Index: head/x11-toolkits/scintilla/files/patch-makefile
===================================================================
--- head/x11-toolkits/scintilla/files/patch-makefile	(revision 491443)
+++ head/x11-toolkits/scintilla/files/patch-makefile	(revision 491444)
@@ -1,58 +1,50 @@
---- makefile.orig	2017-08-16 07:34:01 UTC
+--- makefile.orig	2018-04-10 01:38:39 UTC
 +++ makefile
-@@ -9,17 +9,7 @@
+@@ -11,9 +11,7 @@
  srcdir ?= .
  
- .SUFFIXES: .cxx .c .o .h .a .list
--ifdef CLANG
+ ifdef CLANG
 -CXX = clang++
  CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
 -CC = clang
--# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
--# thread also need to create Position Independent Executable -> search online documentation
--SANITIZE = address
--#SANITIZE = undefined
--else
--CXXWARNFLAGS = -Wall -pedantic
--endif
- ARFLAGS = rc
- RANLIB = touch
- 
-@@ -48,7 +38,12 @@ DEL = del /q
+ # Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
+ # thread also need to create Position Independent Executable -> search online documentation
+ SANITIZE = address
+@@ -49,7 +47,12 @@ DEL = del /q
  COMPLIB=$(srcdir)\..\bin\scintilla.a
  else
  DEL = rm -f
 -COMPLIB=$(srcdir)/../bin/scintilla.a
 +COMPLIB_NAME=libscintilla.so
 +COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR)
 +COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION)
 +LEXRLIB_NAME=libscintilla_lexers.so
 +LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR)
 +LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION)
  endif
  
  vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
-@@ -101,7 +96,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
+@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(RE
+ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+ MARSHALLER=scintilla-marshal.o
  
- LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
- 
 -all: $(COMPLIB)
 +all: $(COMPLIB) $(LEXRLIB)
  
  clean:
  	$(DEL) *.o $(COMPLIB) *.plist
-@@ -122,9 +117,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De
+@@ -123,9 +126,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De
  	PropSetSimple.o PlatGTK.o \
  	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
  	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
 -	$(MARSHALLER) $(LEXOBJS)
 -	$(AR) $(ARFLAGS) $@ $^
 -	$(RANLIB) $@
 +	$(MARSHALLER)
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
 +
 +$(LEXRLIB): $(LEXOBJS)
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak