3 files changed, 112 insertions, 92 deletions

diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index c14df226ae71..3da8e3a0b9b4 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -6,68 +6,56 @@
 
 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
-
 MASTER_SITES=	${MASTER_SITES_QSCI2}
 DISTNAME=	${QSCI2_DISTNAME}
 
-MAINTAINER=	${PYQT_MAINTAINER}
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 port of the Scintilla C++ editor class
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc gui xml designer
+QT_COMPONENTS=	qmake_build moc_build gui xml designer
 HAS_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-OPTIONS=	HEADERS		"Install Qsci headers" on \
-		TRANSLATIONS	"Install translations (de, fr, pt_br, ru)" off
+BUILD_WRKSRC=		${WRKSRC}/Qt4
+INSTALL_WRKSRC=		${BUILD_WRKSRC}
 
-PLIST_SUB+=	QT_LIBDIR_REL=${QT_LIBDIR_REL}
+QMAKE_ARGS=	-unix PREFIX=${PREFIX}
 
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_HEADERS)
-PLIST_SUB+=	HEADERS="@comment "
-.else
-PLIST_SUB+=	HEADERS=""
-PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_REL}
-.endif
-.if defined(WITH_TRANSLATIONS)
-PLIST_SUB+=	TRANSLATIONS=""
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
 .else
-PLIST_SUB+=	TRANSLATIONS="@comment "
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	cd ${WRKSRC}/Qt4 && ${REINPLACE_CMD} -e \
-		's|$$$$\[QT_INSTALL_LIBS\]|${WRKSRC}/lib|' qscintilla.pro
-.if defined(WITHOUT_HEADERS)
-	cd ${WRKSRC}/Qt4 && ${REINPLACE_CMD} -e \
-		's|header trans qsci|trans qsci|' qscintilla.pro
-.endif
-.if !defined(WITH_TRANSLATIONS)
-	cd ${WRKSRC}/Qt4 && ${REINPLACE_CMD} -e \
+	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
+		's|$$$$\[QT_INSTALL_HEADERS\]|${PREFIX}/${QT_INCDIR_REL}|; \
+		s|$$$$\[QT_INSTALL_LIBS\]|${PREFIX}/${QT_LIBDIR_REL}|; \
+		s|$$$$\[QT_INSTALL_TRANSLATIONS\]|${PREFIX}/share/qt4/translations|; \
+		s|$$$$\[QT_INSTALL_DATA\]|${PREFIX}/share/qt4|' \
+		qscintilla.pro
+
+.if defined(WITHOUT_NLS)
+	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
 		's|trans qsci|qsci|' qscintilla.pro
 .endif
 
 do-configure:
-	cd ${WRKSRC}/Qt4 && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix PREFIX=${PREFIX} qscintilla.pro
-
-do-build:
-	cd ${WRKSRC}/Qt4 && ${MAKE}
+	cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} ${QMAKE_ARGS} qscintilla.pro
 
-do-install:
-	cd ${WRKSRC}/Qt4 && ${MAKE} install
-	cd ${WRKSRC}/lib &&\
-		${MV} libqscintilla2.so.3.0.0 libqscintilla2.so.3 &&\
-		${INSTALL_DATA} libqscintilla2.so.3 ${PREFIX}/${QT_LIBDIR_REL} &&\
-		cd ${PREFIX}/${QT_LIBDIR_REL} &&\
-		${LN} -sf libqscintilla2.so.3 libqscintilla2.so &&\
-		${RM} ${PREFIX}/share/qt4/qsci/api/python/Python-2.4.api
+post-configure:
+	${REINPLACE_CMD} -e \
+		's|^CC .*|CC=${CC}|; \
+		s|^CXX .*|CXX=${CXX}|; \
+		s|^LINK .*|LINK=${CXX}|' \
+		${BUILD_WRKSRC}/Makefile
 
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC} &&\
diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo
index 08d8cdb3e0d0..c8b01acb0103 100644
--- a/devel/qscintilla2/distinfo
+++ b/devel/qscintilla2/distinfo
@@ -1,3 +1,3 @@
-MD5 (QScintilla-gpl-2.2.tar.gz) = a6056c444494f3f849020d241f86c286
-SHA256 (QScintilla-gpl-2.2.tar.gz) = 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
-SIZE (QScintilla-gpl-2.2.tar.gz) = 1873664
+MD5 (QScintilla-gpl-2.3.2.tar.gz) = 2e112d01988f2e044c43a1e7f5e1dd87
+SHA256 (QScintilla-gpl-2.3.2.tar.gz) = 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
+SIZE (QScintilla-gpl-2.3.2.tar.gz) = 2146902
diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist
index e1870692eac8..8b25f052d08e 100644
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@@ -1,6 +1,47 @@
+%%QT_INCDIR_REL%%/Qsci/qsciabstractapis.h
+%%QT_INCDIR_REL%%/Qsci/qsciapis.h
+%%QT_INCDIR_REL%%/Qsci/qscicommand.h
+%%QT_INCDIR_REL%%/Qsci/qscicommandset.h
+%%QT_INCDIR_REL%%/Qsci/qscidocument.h
+%%QT_INCDIR_REL%%/Qsci/qsciglobal.h
+%%QT_INCDIR_REL%%/Qsci/qscilexer.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerbash.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerbatch.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercmake.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercpp.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercsharp.h
+%%QT_INCDIR_REL%%/Qsci/qscilexercss.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerd.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerdiff.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerfortran.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerfortran77.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerhtml.h
+%%QT_INCDIR_REL%%/Qsci/qscilexeridl.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerjava.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerjavascript.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerlua.h
+%%QT_INCDIR_REL%%/Qsci/qscilexermakefile.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerpascal.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerperl.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerpostscript.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerpov.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerproperties.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerpython.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerruby.h
+%%QT_INCDIR_REL%%/Qsci/qscilexersql.h
+%%QT_INCDIR_REL%%/Qsci/qscilexertcl.h
+%%QT_INCDIR_REL%%/Qsci/qscilexertex.h
+%%QT_INCDIR_REL%%/Qsci/qscilexervhdl.h
+%%QT_INCDIR_REL%%/Qsci/qscilexerxml.h
+%%QT_INCDIR_REL%%/Qsci/qscilexeryaml.h
+%%QT_INCDIR_REL%%/Qsci/qscimacro.h
+%%QT_INCDIR_REL%%/Qsci/qsciprinter.h
+%%QT_INCDIR_REL%%/Qsci/qsciscintilla.h
+%%QT_INCDIR_REL%%/Qsci/qsciscintillabase.h
 %%QT_LIBDIR_REL%%/libqscintilla2.so
-%%QT_LIBDIR_REL%%/libqscintilla2.so.3
-share/qt4/qsci/api/python/Python-2.5.api
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.0
+%%QT_LIBDIR_REL%%/libqscintilla2.so.5.0.1
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -23,6 +64,8 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciAPIs-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciAPIs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciAbstractAPIs-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciAbstractAPIs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciCommand-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciCommand.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciCommandSet-members.html
@@ -35,20 +78,22 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBash.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBatch-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerBatch.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCMake.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCMake-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCMake.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCPP-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCPP.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSS-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSS.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSharp-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSharp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerD.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerD-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerD.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerDiff-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerDiff.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerFortran-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerFortran.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerFortran77-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerFortran77.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerHTML-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerHTML.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerIDL-members.html
@@ -63,8 +108,12 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerMakefile.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPOV-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPOV.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPascal-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPascal.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPerl-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPerl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPostScript-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPostScript.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerProperties-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerProperties.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerPython-members.html
@@ -73,8 +122,16 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerRuby.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSQL-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerSQL.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTCL-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTCL.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTeX-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerTeX.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerVHDL.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerXML-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerXML.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerYAML-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerYAML.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciMacro-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciMacro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciPrinter-members.html
@@ -83,8 +140,8 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintilla.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_944256396c06c0295aa2eca7dcfea282.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dir_d32dfe2bcddd0b2d894b9fb13d6bdd4d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_556434f8084a0975d5f9aa83df897544.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_e71f21f8efaf379e3645c15d5d7e326c.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dirs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
@@ -167,60 +224,35 @@ share/qt4/qsci/api/python/Python-2.5.api
 %%PORTDOCS%%%%DOCSDIR%%/html/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tab_r.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciapis.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscicommand.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscicommandset.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscidocument.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciglobal.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexer.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerbash.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerbatch.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercpp.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercsharp.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercmake.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexercss.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerd.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerdiff.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerhtml.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexeridl.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerjava.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerjavascript.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerlua.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexermakefile.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerperl.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerpov.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerproperties.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerpython.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexerruby.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexersql.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexertex.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscilexervhdl.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qscimacro.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciprinter.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciscintilla.h
-%%HEADERS%%%%QT_INCDIR_REL%%/Qsci/qsciscintillabase.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.qrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/copy.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/cut.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/new.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/open.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/paste.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/save.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.qrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindow.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mainwindow.h
-%%TRANSLATIONS%%share/qt4/translations/qscintilla_de.qm
-%%TRANSLATIONS%%share/qt4/translations/qscintilla_fr.qm
-%%TRANSLATIONS%%share/qt4/translations/qscintilla_pt_br.qm
-%%TRANSLATIONS%%share/qt4/translations/qscintilla_ru.qm
+share/qt4/qsci/api/python/Python-2.4.api
+share/qt4/qsci/api/python/Python-2.5.api
+share/qt4/qsci/api/python/Python-2.6.api
+%%NLS%%share/qt4/translations/qscintilla_cs.qm
+%%NLS%%share/qt4/translations/qscintilla_de.qm
+%%NLS%%share/qt4/translations/qscintilla_fr.qm
+%%NLS%%share/qt4/translations/qscintilla_pt_br.qm
+%%NLS%%share/qt4/translations/qscintilla_ru.qm
+%%NLS%%@dirrmtry share/qt4/translations
 @dirrmtry share/qt4/qsci/api/python
 @dirrmtry share/qt4/qsci/api
 @dirrmtry share/qt4/qsci
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Scintilla
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/qt4
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%HEADERS%%@dirrm %%QT_INCDIR_REL%%/Qsci
-%%TRANSLATIONS%%@dirrmtry share/qt4/translations
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Scintilla
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry %%QT_LIBDIR_REL%%
+@dirrm %%QT_INCDIR_REL%%/Qsci
+@dirrmtry %%QT_INCDIR_REL%%