Changes 2.9.1:

- Added the .api file for Python v3.5.
- Bug fixes.

Changes 2.9:
- Based on Scintilla v3.5.4.
- Added UserLiteral, InactiveUserLiteral, TaskMarker, InactiveTaskMarker,
  EscapeSequence, InactiveEscapeSequence, setHighlightBackQuotedStrings(),
  highlightBackQuotedStrings(), setHighlightEscapeSequences(),
  highlightEscapeSequences(), setVerbatimStringEscapeSequencesAllowed() and
  verbatimStringEscapeSequencesAllowed() to QsciLexerCPP.
- Added CommentKeyword, DeclareInputPort, DeclareOutputPort,
  DeclareInputOutputPort, PortConnection and the inactive versions of all
  styles to QsciLexerVerilog.
- Added CommentBlock to QsciLexerVHDL.
- Added AnnotationIndented to QsciScintilla::AnnotationDisplay.
- Added FullBoxIndicator, ThickCompositionIndicator, ThinCompositionIndicator
  and TextColorIndicator to QsciScintilla::IndicatorStyle.
- Added setIndicatorHoverForegroundColor() and setIndicatorHoverStyle() to
  QsciScintilla.
- Added Bookmark to QsciScintilla::MarkerSymbol.
- Added WrapWhitespace to QsciScintilla::WrapMode.
- Added SCLEX_AS, SCLEX_BIBTEX, SCLEX_DMAP, SCLEX_DMIS, SCLEX_IHEX,
  SCLEX_REGISTRY, SCLEX_SREC and SCLEX_TEHEX to QsciScintillaBase.
- Added SCI_CHANGEINSERTION to QsciScintillaBase.
- Added SCI_CLEARTABSTOPS, SCI_ADDTABSTOP and SCI_GETNEXTTABSTOP to
  QsciScintillaBase.
- Added SCI_GETIMEINTERACTION, SCI_SETIMEINTERACTION, SC_IME_WINDOWED and
  SC_IME_INLINE to QsciScintillaBase.
- Added SC_MARK_BOOKMARK to QsciScintillaBase.
- Added INDIC_COMPOSITIONTHIN, INDIC_FULLBOX, INDIC_TEXTFORE, INDIC_IME,
  INDIC_IME_MAX, SC_INDICVALUEBIT, SC_INDICVALUEMASK,
  SC_INDICFLAG_VALUEBEFORE, SCI_INDICSETHOVERSTYLE, SCI_INDICGETHOVERSTYLE,
  SCI_INDICSETHOVERFORE, SCI_INDICGETHOVERFORE, SCI_INDICSETFLAGS and
  SCI_INDICGETFLAGS to QsciScintillaBase.
- Added SCI_SETTARGETRANGE and SCI_GETTARGETRANGE to QsciScintillaBase.
- Added SCFIND_CXX11REGEX to QsciScintillaBase.
- Added SCI_CALLTIPSETPOSSTART to QsciScintillaBase.
- Added SC_FOLDFLAG_LINESTATE to QsciScintillaBase.
- Added SC_WRAP_WHITESPACE to QsciScintillaBase.
- Added SC_PHASES_ONE, SC_PHASES_TWO, SC_PHASES_MULTIPLE, SCI_GETPHASESDRAW
  and SCI_SETPHASESDRAW to QsciScintillaBase.
- Added SC_STATUS_OK, SC_STATUS_FAILURE, SC_STATUS_BADALLOC,
  SC_STATUS_WARN_START and SC_STATUS_WARNREGEX to QsciScintillaBase.
- Added SC_MULTIAUTOC_ONCE, SC_MULTIAUTOC_EACH, SCI_AUTOCSETMULTI and
  SCI_AUTOCGETMULTI to QsciScintillaBase.
- Added ANNOTATION_INDENTED to QsciScintillaBase.
- Added SCI_DROPSELECTIONN to QsciScintillaBase.
- Added SC_TECHNOLOGY_DIRECTWRITERETAIN and SC_TECHNOLOGY_DIRECTWRITEDC to
  QsciScintillaBase.
- Added SC_LINE_END_TYPE_DEFAULT, SC_LINE_END_TYPE_UNICODE,
  SCI_GETLINEENDTYPESSUPPORTED, SCI_SETLINEENDTYPESALLOWED,
  SCI_GETLINEENDTYPESALLOWED and SCI_GETLINEENDTYPESACTIVE to
  QsciScintillaBase.
- Added SCI_ALLOCATESUBSTYLES, SCI_GETSUBSTYLESSTART, SCI_GETSUBSTYLESLENGTH,
  SCI_GETSTYLEFROMSUBSTYLE, SCI_GETPRIMARYSTYLEFROMSTYLE, SCI_FREESUBSTYLES,
  SCI_SETIDENTIFIERS, SCI_DISTANCETOSECONDARYSTYLES and SCI_GETSUBSTYLEBASES
  to QsciScintillaBase.
- Added SC_MOD_INSERTCHECK and SC_MOD_CHANGETABSTOPS to QsciScintillaBase.
- Qt v3 and PyQt v3 are no longer supported.

5 files changed, 12 insertions, 16 deletions

diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile
index 0e19c32bb68..356046cbe3f 100644
--- a/x11/py-qt4-qscintilla/Makefile
+++ b/x11/py-qt4-qscintilla/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.41 2015/04/25 14:25:15 tnn Exp $
+# $NetBSD: Makefile,v 1.42 2015/11/27 17:04:18 adam Exp $
 
-PKGREVISION= 1
 .include "../../x11/qt4-qscintilla/Makefile.common"
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${DISTNAME:tl:S/-gpl-/-/}
diff --git a/x11/py-qt4-qscintilla/PLIST b/x11/py-qt4-qscintilla/PLIST
index 24e2e2fa208..514cfed562e 100644
--- a/x11/py-qt4-qscintilla/PLIST
+++ b/x11/py-qt4-qscintilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/12/30 14:40:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/11/27 17:04:18 adam Exp $
 ${PYSITELIB}/PyQt4/Qsci.la
 qt4/qsci/api/python/QScintilla2.api
 share/sip${PYVERSSUFFIX}/Qsci/qsciabstractapis.sip
@@ -45,13 +45,11 @@ share/sip${PYVERSSUFFIX}/Qsci/qscilexervhdl.sip
 share/sip${PYVERSSUFFIX}/Qsci/qscilexerxml.sip
 share/sip${PYVERSSUFFIX}/Qsci/qscilexeryaml.sip
 share/sip${PYVERSSUFFIX}/Qsci/qscimacro.sip
-share/sip${PYVERSSUFFIX}/Qsci/qscimod3.sip
 share/sip${PYVERSSUFFIX}/Qsci/qscimod4.sip
 share/sip${PYVERSSUFFIX}/Qsci/qscimod5.sip
 share/sip${PYVERSSUFFIX}/Qsci/qscimodcommon.sip
 share/sip${PYVERSSUFFIX}/Qsci/qsciprinter.sip
 share/sip${PYVERSSUFFIX}/Qsci/qsciscintilla.sip
-share/sip${PYVERSSUFFIX}/Qsci/qsciscintillabase3.sip
-share/sip${PYVERSSUFFIX}/Qsci/qsciscintillabase4.sip
+share/sip${PYVERSSUFFIX}/Qsci/qsciscintillabase.sip
 share/sip${PYVERSSUFFIX}/Qsci/qscistyle.sip
 share/sip${PYVERSSUFFIX}/Qsci/qscistyledtext.sip
diff --git a/x11/qt4-qscintilla/Makefile b/x11/qt4-qscintilla/Makefile
index a20c61eb84c..d3736483d21 100644
--- a/x11/qt4-qscintilla/Makefile
+++ b/x11/qt4-qscintilla/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.39 2015/07/08 21:39:15 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2015/11/27 17:04:18 adam Exp $
 
-PKGREVISION=	1
 .include "../../x11/qt4-qscintilla/Makefile.common"
 
 PKGNAME=	qt4-${DISTNAME:tl:S/-gpl-/-/}
diff --git a/x11/qt4-qscintilla/Makefile.common b/x11/qt4-qscintilla/Makefile.common
index 80b0f2fab5e..7f0fdc2257d 100644
--- a/x11/qt4-qscintilla/Makefile.common
+++ b/x11/qt4-qscintilla/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2014/12/30 14:40:30 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2015/11/27 17:04:18 adam Exp $
 #
 # used by x11/qt4-qscintilla/Makefile
 # used by x11/py-qt4-qscintilla/Makefile
 
-DISTNAME=	QScintilla-gpl-2.8.4
+DISTNAME=	QScintilla-gpl-2.9.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
 
@@ -11,8 +11,8 @@ MAINTAINER=	helgoman@users.sourceforge.net
 HOMEPAGE=	http://www.riverbankcomputing.co.uk/software/qscintilla/intro
 LICENSE=	gnu-gpl-v3
 
-USE_LIBTOOL=	yes
 USE_LANGUAGES=	c++
+USE_LIBTOOL=	yes
 
 DISTINFO_FILE=	${.CURDIR}/../../x11/qt4-qscintilla/distinfo
 #PATCHDIR=	${.CURDIR}/../../x11/qt4-qscintilla/patches
diff --git a/x11/qt4-qscintilla/distinfo b/x11/qt4-qscintilla/distinfo
index 8a11f643afd..342da13d41e 100644
--- a/x11/qt4-qscintilla/distinfo
+++ b/x11/qt4-qscintilla/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2015/11/04 03:28:52 agc Exp $
+$NetBSD: distinfo,v 1.17 2015/11/27 17:04:18 adam Exp $
 
-SHA1 (QScintilla-gpl-2.8.4.tar.gz) = 7e15c261a7c1842f3a75e4878a880ab667224494
-RMD160 (QScintilla-gpl-2.8.4.tar.gz) = dfe4b96f1bfd549290aeae24a18f2fe99de8e75a
-SHA512 (QScintilla-gpl-2.8.4.tar.gz) = ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907
-Size (QScintilla-gpl-2.8.4.tar.gz) = 3031919 bytes
+SHA1 (QScintilla-gpl-2.9.1.tar.gz) = 63f367af50fd73a8815e4ff4596932c7dad12e41
+RMD160 (QScintilla-gpl-2.9.1.tar.gz) = 690f8384de9aea15bb0a89455c0303d6a2890710
+SHA512 (QScintilla-gpl-2.9.1.tar.gz) = 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e
+Size (QScintilla-gpl-2.9.1.tar.gz) = 2490144 bytes