Update to 2.8.3. Split off common parts with py-qt4-qscintilla into

Makefile.common.

v2.8.3 3rd July 2014
  - Added the QsciLexerCoffeeScript class.
  - Font sizes are now handled as floating point values rather than integers.
  - Bug fixes.

v2.8.2 26th May 2014
  - Added the QsciLexerAVS class.
  - Added the QsciLexerPO class.
  - Added the --sysroot, --no-sip-files and --no-qsci-api options to the Python
    bindings' configure.py.
  - Cross-compilation (specifically to iOS and Android) is now supported.
  - configure.py has been refactored and relicensed so that it can be used as a
    template for wrapping other bindings.
  - Bug fixes.

v2.8.1 14th March 2014
  - Added support for iOS and Android.
  - Added support for retina displays.
  - A qscintilla2.prf file is installed so that application .pro files only
    need to add CONFIG += qscintilla2.
  - Updated the keywords recognised by the Octave lexer.
  - Bug fixes.

4 files changed, 31 insertions, 22 deletions

diff --git a/x11/qt4-qscintilla/Makefile b/x11/qt4-qscintilla/Makefile
index 483834db64e..193894e8165 100644
--- a/x11/qt4-qscintilla/Makefile
+++ b/x11/qt4-qscintilla/Makefile
@@ -1,27 +1,14 @@
-# $NetBSD: Makefile,v 1.35 2014/07/22 17:55:16 wiz Exp $
-#
-# when updating this, also update py-qt4-qscintilla
-# XXX: these two should share a Makefile.common
+# $NetBSD: Makefile,v 1.36 2014/08/21 21:35:06 wiz Exp $
 
-DISTNAME=	QScintilla-gpl-2.8
-PKGNAME=	qt4-${DISTNAME:tl:S/-gpl-/-/}
-PKGREVISION=	1
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
+.include "../../x11/qt4-qscintilla/Makefile.common"
 
-MAINTAINER=	helgoman@users.sourceforge.net
-HOMEPAGE=	http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+PKGNAME=	qt4-${DISTNAME:tl:S/-gpl-/-/}
 COMMENT=	Scintilla C++ editor class for Qt
-LICENSE=	gnu-gpl-v3
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Qt4Qt5
 
 USE_TOOLS+=	gmake
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c++
-
 MAKE_ENV+=	QTPREFIX=${QTDIR}
-
 INSTALLATION_DIRS=	${QTDIR}/lib ${QTDIR}/include
 
 do-configure:
@@ -33,6 +20,5 @@ do-install:
 		${WRKSRC}/libqscintilla2.la ${DESTDIR}${QTDIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/Qsci/qsci*.h ${DESTDIR}${QTDIR}/include/Qsci
 
-.include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt4-qscintilla/Makefile.common b/x11/qt4-qscintilla/Makefile.common
new file mode 100644
index 00000000000..481c9f3a456
--- /dev/null
+++ b/x11/qt4-qscintilla/Makefile.common
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.common,v 1.1 2014/08/21 21:35:06 wiz Exp $
+#
+# used by x11/qt4-qscintilla/Makefile
+# used by x11/py-qt4-qscintilla/Makefile
+
+DISTNAME=	QScintilla-gpl-2.8.3
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
+
+MAINTAINER=	helgoman@users.sourceforge.net
+HOMEPAGE=	http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+LICENSE=	gnu-gpl-v3
+
+USE_LIBTOOL=	yes
+USE_LANGUAGES=	c++
+
+DISTINFO_FILE=	${.CURDIR}/../../x11/qt4-qscintilla/distinfo
+#PATCHDIR=	${.CURDIR}/../../x11/qt4-qscintilla/patches
+
+.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qt4-qscintilla/PLIST b/x11/qt4-qscintilla/PLIST
index 4bd8ee533ac..4079cfaf7d3 100644
--- a/x11/qt4-qscintilla/PLIST
+++ b/x11/qt4-qscintilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/07/22 17:52:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/08/21 21:35:06 wiz Exp $
 qt4/include/Qsci/qsciabstractapis.h
 qt4/include/Qsci/qsciapis.h
 qt4/include/Qsci/qscicommand.h
@@ -6,9 +6,11 @@ qt4/include/Qsci/qscicommandset.h
 qt4/include/Qsci/qscidocument.h
 qt4/include/Qsci/qsciglobal.h
 qt4/include/Qsci/qscilexer.h
+qt4/include/Qsci/qscilexeravs.h
 qt4/include/Qsci/qscilexerbash.h
 qt4/include/Qsci/qscilexerbatch.h
 qt4/include/Qsci/qscilexercmake.h
+qt4/include/Qsci/qscilexercoffeescript.h
 qt4/include/Qsci/qscilexercpp.h
 qt4/include/Qsci/qscilexercsharp.h
 qt4/include/Qsci/qscilexercss.h
@@ -27,6 +29,7 @@ qt4/include/Qsci/qscilexermatlab.h
 qt4/include/Qsci/qscilexeroctave.h
 qt4/include/Qsci/qscilexerpascal.h
 qt4/include/Qsci/qscilexerperl.h
+qt4/include/Qsci/qscilexerpo.h
 qt4/include/Qsci/qscilexerpostscript.h
 qt4/include/Qsci/qscilexerpov.h
 qt4/include/Qsci/qscilexerproperties.h
diff --git a/x11/qt4-qscintilla/distinfo b/x11/qt4-qscintilla/distinfo
index 33250bd0759..13cc44d7fab 100644
--- a/x11/qt4-qscintilla/distinfo
+++ b/x11/qt4-qscintilla/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2014/07/22 17:52:11 wiz Exp $
+$NetBSD: distinfo,v 1.14 2014/08/21 21:35:06 wiz Exp $
 
-SHA1 (QScintilla-gpl-2.8.tar.gz) = 3edf9d476d4e6af0706a4d33401667a38e3a697e
-RMD160 (QScintilla-gpl-2.8.tar.gz) = 623d1b956da11a109d418fcf7d816917220ec493
-Size (QScintilla-gpl-2.8.tar.gz) = 2917864 bytes
+SHA1 (QScintilla-gpl-2.8.3.tar.gz) = d3b4f0dc7358591c122518d932f797ae3e3dd9d4
+RMD160 (QScintilla-gpl-2.8.3.tar.gz) = c60b841d8574eae3c318c69f16d43894084551e1
+Size (QScintilla-gpl-2.8.3.tar.gz) = 3028154 bytes