Index: head/x11-toolkits/scintilla/Makefile
===================================================================
--- head/x11-toolkits/scintilla/Makefile	(revision 374011)
+++ head/x11-toolkits/scintilla/Makefile	(revision 374012)
@@ -1,38 +1,46 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scintilla
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 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=		gmake iconv pkgconfig tar:tgz
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk20
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-DPIC ${PICFLAG}
 
 .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
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${STAGEDIR}${PREFIX}/lib
 	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla.so.2 libscintilla.so)
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${STAGEDIR}${PREFIX}/lib
 	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla_lexers.so.2 libscintilla_lexers.so)
 
 .include <bsd.port.post.mk>
Index: head/x11-toolkits/scintilla/distinfo
===================================================================
--- head/x11-toolkits/scintilla/distinfo	(revision 374011)
+++ head/x11-toolkits/scintilla/distinfo	(revision 374012)
@@ -1,2 +1,2 @@
-SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581
-SIZE (scite351.tgz) = 2272014
+SHA256 (scite352.tgz) = d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836
+SIZE (scite352.tgz) = 2277393
Index: head/x11-toolkits/scintilla/files/patch-makefile
===================================================================
--- head/x11-toolkits/scintilla/files/patch-makefile	(revision 374011)
+++ head/x11-toolkits/scintilla/files/patch-makefile	(revision 374012)
@@ -1,66 +1,66 @@
---- makefile.orig	2014-08-09 23:52:02 UTC
-+++ makefile
+--- makefile.orig	2014-11-28 00:47:24.000000000 +0400
++++ makefile	2014-12-04 14:28:51.000000000 +0400
 @@ -7,14 +7,6 @@
  # Also works with ming32-make on Windows.
  
  .SUFFIXES: .cxx .c .o .h .a
 -ifdef CLANG
 -CXX = clang++ -Wno-deprecated-register
 -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
 -endif
  RANLIB = touch
  
  ifdef GTK3
 @@ -36,7 +28,8 @@
  COMPLIB=..\bin\scintilla.a
  else
  DEL = rm -f
 -COMPLIB=../bin/scintilla.a
 +COMPLIB=../bin/libscintilla.so.2
 +LEXRLIB=../bin/libscintilla_lexers.so.2
  endif
  
  vpath %.h ../src ../include ../lexlib
-@@ -64,8 +57,7 @@
+@@ -68,8 +61,7 @@
  CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
  endif
  
 -CFLAGS:=$(CTFLAGS)
--CXXTFLAGS:=--std=c++0x $(CTFLAGS)
-+CXXTFLAGS:=$(CTFLAGS)
+-CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
++CXXTFLAGS:=$(CTFLAGS) $(REFLAGS)
  
  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
  MARSHALLER=scintilla-marshal.o
-@@ -73,11 +65,11 @@
+@@ -77,11 +69,11 @@
  .cxx.o:
  	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
  .c.o:
 -	$(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
 +	$(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
  
  LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
  
 -all: $(COMPLIB)
 +all: $(COMPLIB) $(LEXRLIB)
  
  clean:
  	$(DEL) *.o $(COMPLIB) *.plist
-@@ -94,9 +86,11 @@
+@@ -98,9 +90,11 @@
  	PropSetSimple.o PlatGTK.o \
  	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.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) rc $@ $^
 -	$(RANLIB) $@
 +	$(MARSHALLER)
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
 +
 +$(LEXRLIB): $(LEXOBJS)
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak