missing scintilla update to version 3.6.6

[Daniel Oelschlegel <amoibos%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Sun Aug 28 18:59:52 2016 +0000
Changeset:	1eab25bc8266fc7681fae7ad31ef6920d8ea24b1

Modified Files:
	scintilla/Makefile
	scintilla/PLIST
	scintilla/distinfo
Added Files:
	scintilla/patches/patch-aa

Log Message:
missing scintilla update to version 3.6.6

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1eab25bc8266fc7681fae7ad31ef6920d8ea24b1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 scintilla/Makefile         | 13 +++++++----
 scintilla/PLIST            |  6 +++++-
 scintilla/distinfo         | 10 +++++----
 scintilla/patches/patch-aa | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 9 deletions(-)

diffs:
diff --git a/scintilla/Makefile b/scintilla/Makefile
index 3bfa3df..df22f92 100644
--- a/scintilla/Makefile
+++ b/scintilla/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.23 2015/04/25 14:20:40 tnn Exp $
 #
 
-DISTNAME=	scintilla339
-PKGNAME=	scintilla-3.3.9
-PKGREVISION=	2
+DISTNAME=	scintilla366
+PKGNAME=	scintilla-3.6.6
+PKGREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
 EXTRACT_SUFX=	.tgz
@@ -24,9 +24,14 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/Scintilla.h \
 		${WRKSRC}/include/ScintillaWidget.h \
 		${WRKSRC}/include/SciLexer.h \
+		${WRKSRC}/include/Platform.h \
+		${WRKSRC}/include/Sci_Position.h \
+		${WRKSRC}/include/Scintilla.iface \
 		${WRKSRC}/include/ILexer.h \
 		${DESTDIR}${PREFIX}/include/scintilla
-	${INSTALL_LIB} ${WRKSRC}/bin/scintilla.a ${DESTDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/bin/libscintilla.a ${DESTDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/bin/libscintilla_lexers.a ${DESTDIR}${PREFIX}/lib
+	
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/scintilla/PLIST b/scintilla/PLIST
index d3acfb4..55da66f 100644
--- a/scintilla/PLIST
+++ b/scintilla/PLIST
@@ -1,6 +1,10 @@
 @comment $NetBSD: PLIST,v 1.2 2013/04/10 11:20:38 drochner Exp $
 include/scintilla/ILexer.h
+include/scintilla/Platform.h
 include/scintilla/SciLexer.h
+include/scintilla/Sci_Position.h
 include/scintilla/Scintilla.h
+include/scintilla/Scintilla.iface
 include/scintilla/ScintillaWidget.h
-lib/scintilla.a
+lib/libscintilla.a
+lib/libscintilla_lexers.a
diff --git a/scintilla/distinfo b/scintilla/distinfo
index 9e6e917..8c684a7 100644
--- a/scintilla/distinfo
+++ b/scintilla/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2014/02/06 17:25:49 drochner Exp $
+$NetBSD: distinfo,v 1.6 2015/11/03 03:29:32 agc Exp $
 
-SHA1 (scintilla339.tgz) = 9e1937a9e6a41659c7fd0f1e460bf476573a652b
-RMD160 (scintilla339.tgz) = 22ef0452ffb58d4861255d27a7f2f7bd436f1e1e
-Size (scintilla339.tgz) = 1313246 bytes
+SHA1 (scintilla366.tgz) = 582efe82287c110fbee1d0877363ec73bf6393ea
+RMD160 (scintilla366.tgz) = c4d2c567119c2339d935102a6d61d0586a455dd7
+SHA512 (scintilla366.tgz) = e759f075b8f47faeaca8e22f73d420732f0fc00ffd261fc2134276d0356f0eec214e0924e93cd7c7446124be8775c24d71c7a54c4875a9ca16035860c2875f8a
+Size (scintilla366.tgz) = 1314970 bytes
+SHA1 (patch-aa) = ec46d9083643f121915152200dfa0d227bac0290
diff --git a/scintilla/patches/patch-aa b/scintilla/patches/patch-aa
new file mode 100644
index 0000000..879399d
--- /dev/null
+++ b/scintilla/patches/patch-aa
@@ -0,0 +1,54 @@
+--- gtk/makefile.orig	2016-05-17 23:50:39.000000000 +0000
++++ gtk/makefile	2016-08-21 23:04:04.169401815 +0000
+@@ -15,6 +15,7 @@
+ SANITIZE = address
+ #SANITIZE = undefined
+ endif
++AR= ar
+ RANLIB = touch
+ 
+ ifdef GTK3
+@@ -42,7 +43,8 @@
+ COMPLIB=..\bin\scintilla.a
+ else
+ DEL = rm -f
+-COMPLIB=../bin/scintilla.a
++COMPLIB=../bin/libscintilla.a
++LEXERLIB=../bin/libscintilla_lexers.a
+ endif
+ 
+ vpath %.h ../src ../include ../lexlib
+@@ -95,7 +97,7 @@
+ 
+ LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
+ 
+-all: $(COMPLIB)
++all: $(COMPLIB) $(LEXERLIB)
+ 
+ clean:
+ 	$(DEL) *.o $(COMPLIB) *.plist
+@@ -105,16 +107,22 @@
+ 
+ deps:
+ 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+-
+-$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
++LIBOBJS= Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
+ 	CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \
+ 	ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o ExternalLexer.o MarginView.o \
+ 	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)
++	
++$(COMPLIB): $(LIBOBJS)
++	$(AR) rc $@ $^
++	$(RANLIB) $@
++
++$(LEXERLIB): $(LEXOBJS)
+ 	$(AR) rc $@ $^
+ 	$(RANLIB) $@
++	
+ 
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak