svn commit: r374012 - in head/x11-toolkits/scintilla: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Dec  5 12:36:04 2014
New Revision: 374012
URL: https://svnweb.freebsd.org/changeset/ports/374012
QAT: https://qat.redports.org/buildarchive/r374012/

Log:
  - Update to 3.5.2
  - Add license information
  
  PR:		195675
  Submitted by:	lightside at gmx.com
  Approved by:	cyberbotx at cyberbotx.com (maintainer)

Modified:
  head/x11-toolkits/scintilla/Makefile
  head/x11-toolkits/scintilla/distinfo
  head/x11-toolkits/scintilla/files/patch-makefile

Modified: head/x11-toolkits/scintilla/Makefile
==============================================================================
--- head/x11-toolkits/scintilla/Makefile	Fri Dec  5 12:36:04 2014	(r374011)
+++ head/x11-toolkits/scintilla/Makefile	Fri Dec  5 12:36:04 2014	(r374012)
@@ -2,7 +2,7 @@
 # $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}
@@ -10,6 +10,11 @@ DISTNAME=	scite${PORTVERSION:S/.//g}
 MAINTAINER=	cyberbotx at 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
@@ -27,6 +32,9 @@ PICFLAG?=	-fPIC
 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

Modified: head/x11-toolkits/scintilla/distinfo
==============================================================================
--- head/x11-toolkits/scintilla/distinfo	Fri Dec  5 12:36:04 2014	(r374011)
+++ head/x11-toolkits/scintilla/distinfo	Fri Dec  5 12:36:04 2014	(r374012)
@@ -1,2 +1,2 @@
-SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581
-SIZE (scite351.tgz) = 2272014
+SHA256 (scite352.tgz) = d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836
+SIZE (scite352.tgz) = 2277393

Modified: head/x11-toolkits/scintilla/files/patch-makefile
==============================================================================
--- head/x11-toolkits/scintilla/files/patch-makefile	Fri Dec  5 12:36:04 2014	(r374011)
+++ head/x11-toolkits/scintilla/files/patch-makefile	Fri Dec  5 12:36:04 2014	(r374012)
@@ -1,5 +1,5 @@
---- 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.
  
@@ -25,17 +25,17 @@
  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:
@@ -49,7 +49,7 @@
  
  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 \