aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/Uses/pyqt.mk4
-rw-r--r--cad/openscad/Makefile4
-rw-r--r--comms/py-qt5-serialport/Makefile4
-rw-r--r--databases/py-qt4-sql/Makefile3
-rw-r--r--databases/py-qt5-sql/Makefile4
-rw-r--r--databases/sqliteman/Makefile4
-rw-r--r--databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake12
-rw-r--r--databases/tora/Makefile4
-rw-r--r--databases/tora/files/patch-config_m4_qtkde.m421
-rw-r--r--devel/p5-perlqt/Makefile4
-rw-r--r--devel/py-qt4-assistant/Makefile3
-rw-r--r--devel/py-qt4-core/Makefile3
-rw-r--r--devel/py-qt4-dbus/Makefile3
-rw-r--r--devel/py-qt4-declarative/Makefile3
-rw-r--r--devel/py-qt4-designer/Makefile3
-rw-r--r--devel/py-qt4-help/Makefile3
-rw-r--r--devel/py-qt4-qscintilla2/Makefile3
-rw-r--r--devel/py-qt4-qscintilla2/pkg-plist3
-rw-r--r--devel/py-qt4-script/Makefile3
-rw-r--r--devel/py-qt4-scripttools/Makefile3
-rw-r--r--devel/py-qt4-test/Makefile3
-rw-r--r--devel/py-qt5-core/Makefile4
-rw-r--r--devel/py-qt5-dbus/Makefile4
-rw-r--r--devel/py-qt5-designer/Makefile4
-rw-r--r--devel/py-qt5-help/Makefile4
-rw-r--r--devel/py-qt5-qscintilla2/Makefile4
-rw-r--r--devel/py-qt5-qscintilla2/pkg-plist3
-rw-r--r--devel/py-qt5-test/Makefile4
-rw-r--r--devel/qscintilla2-designerplugin-qt5/Makefile3
-rw-r--r--devel/qscintilla2-designerplugin/Makefile2
-rw-r--r--devel/qscintilla2-qt5/Makefile3
-rw-r--r--devel/qscintilla2-qt5/distinfo5
-rw-r--r--devel/qscintilla2-qt5/files/patch-Qt4Qt5_features_qscintilla2.prf24
-rw-r--r--devel/qscintilla2-qt5/files/patch-Qt4Qt5_qscintilla.pro18
-rw-r--r--devel/qscintilla2-qt5/pkg-plist11
-rw-r--r--devel/qscintilla2/Makefile2
-rw-r--r--devel/qscintilla2/distinfo5
-rw-r--r--devel/qscintilla2/pkg-plist11
-rw-r--r--devel/ruby-qtruby/Makefile4
-rw-r--r--devel/smokegen/Makefile1
-rw-r--r--devel/smokegen/files/patch-cmake_FindQScintilla.cmake12
-rw-r--r--devel/smokeqt/Makefile4
-rw-r--r--devel/universalindentgui/Makefile4
-rw-r--r--devel/universalindentgui/files/patch-UniversalIndentGUI.pro11
-rw-r--r--graphics/py-qt4-svg/Makefile3
-rw-r--r--graphics/py-qt5-svg/Makefile4
-rw-r--r--graphics/qgis/Makefile3
-rw-r--r--lang/py-qt5-qml/Makefile4
-rw-r--r--math/octave/Makefile4
-rw-r--r--multimedia/py-qt4-multimedia/Makefile3
-rw-r--r--multimedia/py-qt4-phonon/Makefile3
-rw-r--r--multimedia/py-qt5-multimedia/Makefile4
-rw-r--r--multimedia/py-qt5-multimediawidgets/Makefile4
-rw-r--r--net/py-qt4-network/Makefile3
-rw-r--r--net/py-qt5-network/Makefile4
-rw-r--r--print/py-qt5-printsupport/Makefile4
-rw-r--r--textproc/py-qt4-xml/Makefile3
-rw-r--r--textproc/py-qt4-xmlpatterns/Makefile3
-rw-r--r--textproc/py-qt5-xml/Makefile4
-rw-r--r--textproc/py-qt5-xmlpatterns/Makefile4
-rw-r--r--www/py-qt4-webkit/Makefile3
-rw-r--r--www/py-qt5-webchannel/Makefile4
-rw-r--r--www/py-qt5-webengine/Makefile4
-rw-r--r--www/py-qt5-webkit/Makefile4
-rw-r--r--www/py-qt5-webkitwidgets/Makefile4
-rw-r--r--x11-toolkits/py-qt4-gui/Makefile3
-rw-r--r--x11-toolkits/py-qt5-quick/Makefile4
-rw-r--r--x11-toolkits/py-qt5-widgets/Makefile4
-rw-r--r--x11/leechcraft/Makefile4
-rw-r--r--x11/py-qt4-opengl/Makefile3
-rw-r--r--x11/py-qt5-opengl/Makefile4
71 files changed, 194 insertions, 148 deletions
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 507c6f44cb7e..37b70dd624f3 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -62,7 +62,7 @@ MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
GENTOO
SIP_VERSION= 4.19.6
-QSCI2_VERSION= 2.9.1
+QSCI2_VERSION= 2.10.2
PYQT4_VERSION= 4.12.1
PYQT5_VERSION= 5.9.2
@@ -71,7 +71,7 @@ PYQT4_DISTNAME= PyQt4_gpl_x11-${PYQT4_VERSION}
PYQT4_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
PYQT5_DISTNAME= PyQt5_gpl-${PYQT5_VERSION}
PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
-QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION}
+QSCI2_DISTNAME= QScintilla_gpl-${QSCI2_VERSION}
PYQT4_LICENSE= GPLv3
PYQT5_LICENSE= GPLv3
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 2b14e0bf508d..8ab500193ee5 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openscad
PORTVERSION= 2015.03
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= cad
MASTER_SITES= http://files.openscad.org/
DISTNAME= openscad-${PORTVERSION}.src
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \
LIB_DEPENDS= libgmp.so:math/gmp \
libmpfr.so:math/mpfr \
libCGAL.so:math/cgal \
- libqscintilla2.so:devel/qscintilla2 \
+ libqscintilla2_qt4.so:devel/qscintilla2 \
libharfbuzz.so:print/harfbuzz \
libopencsg.so:graphics/opencsg
diff --git a/comms/py-qt5-serialport/Makefile b/comms/py-qt5-serialport/Makefile
index 1f691009f80d..d83975fd345b 100644
--- a/comms/py-qt5-serialport/Makefile
+++ b/comms/py-qt5-serialport/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= serialport
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= comms devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtSerialPort API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index 62f12f40d634..32fba328cfe1 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= sql
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= databases devel python
@@ -24,7 +25,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtSql API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
index d39a6a28458d..02020ca21628 100644
--- a/databases/py-qt5-sql/Makefile
+++ b/databases/py-qt5-sql/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sql
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtSql API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index 09a8112958d8..4201bd085b2f 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -3,14 +3,14 @@
PORTNAME= sqliteman
PORTVERSION= 1.2.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= databases
MASTER_SITES= SF
MAINTAINER= wen@FreeBSD.org
COMMENT= Admin's GUI tool for Sqlite3
-LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
USES= cmake sqlite
USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql
diff --git a/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake b/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake
new file mode 100644
index 000000000000..8e0adee9f6e9
--- /dev/null
+++ b/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake
@@ -0,0 +1,12 @@
+The library is called libqscintilla_qt4.so since 2.10.2.
+--- cmake/modules/FindQScintilla.cmake.orig 2018-02-16 21:57:36 UTC
++++ cmake/modules/FindQScintilla.cmake
+@@ -21,7 +21,7 @@ IF(QT4_FOUND)
+ "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
+ )
+
+- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
++ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2_qt4 qscintilla2 libqscintilla2)
+ FIND_LIBRARY(QSCINTILLA_LIBRARY
+ NAMES ${QSCINTILLA_NAMES}
+ PATHS ${QT_LIBRARY_DIR}
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index e626ff2ce366..a2b152204144 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tora
PORTVERSION= 2.1.3
-PORTREVISION= 11
+PORTREVISION= 12
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= SF
@@ -14,7 +14,7 @@ COMMENT= Toolkit for Oracle
LICENSE= GPLv2
BUILD_DEPENDS= cppunit-config:devel/cppunit
-LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 \
+LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 \
libpcre.so:devel/pcre
OPTIONS_DEFINE= PGSQL MYSQL DOCS
diff --git a/databases/tora/files/patch-config_m4_qtkde.m4 b/databases/tora/files/patch-config_m4_qtkde.m4
new file mode 100644
index 000000000000..ef2770c79d6e
--- /dev/null
+++ b/databases/tora/files/patch-config_m4_qtkde.m4
@@ -0,0 +1,21 @@
+The library is called libqscintilla2_qt4.so since 2.10.2.
+--- config/m4/qtkde.m4.orig 2018-02-16 21:51:49 UTC
++++ config/m4/qtkde.m4
+@@ -112,7 +112,7 @@ AC_DEFUN([TORA_CHECK_QSCINTILLA],
+ @LIB_DCOP@ \
+ @LIB_KHTML@ \
+ $scin_ldflags"
+- LIBS="-lqscintilla2"
++ LIBS="-lqscintilla2_qt4"
+
+ AC_LANG_PUSH(C++)
+
+@@ -148,7 +148,7 @@ Or alternatively see if your OS offers a QScintilla 2
+
+ AC_DEFINE_UNQUOTED(QSCINTILLA_DLL, 1, [True if on Windows.])
+ AC_SUBST(QSCINTILLA_CXXFLAGS, $scin_cflags)
+- AC_SUBST(QSCINTILLA_LDFLAGS, "$scin_ldflags -lqscintilla2")
++ AC_SUBST(QSCINTILLA_LDFLAGS, "$scin_ldflags -lqscintilla2_qt4")
+ AC_MSG_RESULT(yes)
+ ])
+
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile
index 21629b8abb6a..822c72fa6c05 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt/Makefile
@@ -2,14 +2,14 @@
PORTNAME= perlqt
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel kde kde-kde4 perl5
PKGNAMEPREFIX= p5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Perl bindings for Qt
-LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 \
+LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 \
libqwt.so:x11-toolkits/qwt5
USES= cmake:outsource kde:4 perl5 tar:xz
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 2b427252ce72..b61742a4c083 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= assistant
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
@@ -24,7 +25,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtAssistant API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index c50023de0cdc..d5790bfff260 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= core
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= devel python
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtCore API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.pre.mk>
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index e938e345fd85..9f3dc306b90b 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= dbus
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtDBus API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index 8e742a3067f3..c772b8bef2ff 100644
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= declarative
+PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtDeclarative API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index bd565263ec10..dd2232ffb476 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= designer
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtDesigner API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index bc6f9be9bf00..3cdae085c39c 100644
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= help
+PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
@@ -21,7 +22,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtHelp API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 1a1a5ed8c134..7e8ef17f375e 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}
@@ -12,7 +13,7 @@ DISTNAME= ${QSCI2_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for QScintilla2 (PyQt4), QSci module
-LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo
DESTDIRNAME= INSTALL_ROOT
diff --git a/devel/py-qt4-qscintilla2/pkg-plist b/devel/py-qt4-qscintilla2/pkg-plist
index 774f88502737..975e5a132d95 100644
--- a/devel/py-qt4-qscintilla2/pkg-plist
+++ b/devel/py-qt4-qscintilla2/pkg-plist
@@ -1,3 +1,4 @@
+%%PYTHON_SITELIBDIR%%/PyQt4/Qsci.pyi
%%PYTHON_SITELIBDIR%%/PyQt4/Qsci.so
%%PYQT_SIPDIR%%/Qsci/qsciabstractapis.sip
%%PYQT_SIPDIR%%/Qsci/qsciapis.sip
@@ -22,8 +23,10 @@
%%PYQT_SIPDIR%%/Qsci/qscilexeridl.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerjava.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerjavascript.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerjson.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerlua.sip
%%PYQT_SIPDIR%%/Qsci/qscilexermakefile.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexermarkdown.sip
%%PYQT_SIPDIR%%/Qsci/qscilexermatlab.sip
%%PYQT_SIPDIR%%/Qsci/qscilexeroctave.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerpascal.sip
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index 4ee99032fade..2f0953b64c39 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= script
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtScript API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index 11e6440123c1..135b5df9a179 100644
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= scripttools
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
@@ -22,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtScriptTools API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index 7977dc1ea657..428f840efb36 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= test
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtTest API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile
index c8db96c45b95..87440a5d65eb 100644
--- a/devel/py-qt5-core/Makefile
+++ b/devel/py-qt5-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= core
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
@@ -25,7 +25,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtCore API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile
index 17c521b45423..ba24b51b8e5e 100644
--- a/devel/py-qt5-dbus/Makefile
+++ b/devel/py-qt5-dbus/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= dbus
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +22,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtDBus API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile
index 05a268894ebd..f473a7d930b5 100644
--- a/devel/py-qt5-designer/Makefile
+++ b/devel/py-qt5-designer/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= designer
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
@@ -24,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtDesigner API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt5-help/Makefile b/devel/py-qt5-help/Makefile
index 7e0bd803a18f..1abd7f87d20e 100644
--- a/devel/py-qt5-help/Makefile
+++ b/devel/py-qt5-help/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= help
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtHelp API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index 930c92ae68ae..cbb1f28812cd 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5-
@@ -11,7 +11,7 @@ DISTNAME= ${QSCI2_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for QScintilla2 (PyQt5), QSci module
-LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DISTINFO_FILE= ${.CURDIR:H}/qscintilla2-qt5/distinfo
DESTDIRNAME= INSTALL_ROOT
diff --git a/devel/py-qt5-qscintilla2/pkg-plist b/devel/py-qt5-qscintilla2/pkg-plist
index 88bcd90558d5..de4223671b77 100644
--- a/devel/py-qt5-qscintilla2/pkg-plist
+++ b/devel/py-qt5-qscintilla2/pkg-plist
@@ -1,3 +1,4 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/Qsci.pyi
%%PYTHON_SITELIBDIR%%/PyQt5/Qsci.so
%%PYQT_SIPDIR%%/Qsci/qsciabstractapis.sip
%%PYQT_SIPDIR%%/Qsci/qsciapis.sip
@@ -22,8 +23,10 @@
%%PYQT_SIPDIR%%/Qsci/qscilexeridl.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerjava.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerjavascript.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexerjson.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerlua.sip
%%PYQT_SIPDIR%%/Qsci/qscilexermakefile.sip
+%%PYQT_SIPDIR%%/Qsci/qscilexermarkdown.sip
%%PYQT_SIPDIR%%/Qsci/qscilexermatlab.sip
%%PYQT_SIPDIR%%/Qsci/qscilexeroctave.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerpascal.sip
diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile
index f465a9857960..41a166c945d7 100644
--- a/devel/py-qt5-test/Makefile
+++ b/devel/py-qt5-test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= test
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
@@ -24,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtTest API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/devel/qscintilla2-designerplugin-qt5/Makefile b/devel/qscintilla2-designerplugin-qt5/Makefile
index f654cb2b45c4..cce854d74054 100644
--- a/devel/qscintilla2-designerplugin-qt5/Makefile
+++ b/devel/qscintilla2-designerplugin-qt5/Makefile
@@ -2,7 +2,6 @@
PORTNAME= designerplugin-qt5
PORTVERSION= ${QSCI2_VERSION}
-PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
PKGNAMEPREFIX= qscintilla2-
@@ -11,7 +10,7 @@ DISTNAME= ${QSCI2_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt5 Designer plugin for QScintilla2
-LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DISTINFO_FILE= ${.CURDIR:H}/qscintilla2-qt5/distinfo
USE_GL= gl
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index 208dad58f215..fc3f04bf55df 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${QSCI2_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 Designer plugin for QScintilla2
-LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo
USES= qmake pyqt:4
diff --git a/devel/qscintilla2-qt5/Makefile b/devel/qscintilla2-qt5/Makefile
index e28eab5b59d6..af4ddf36cc14 100644
--- a/devel/qscintilla2-qt5/Makefile
+++ b/devel/qscintilla2-qt5/Makefile
@@ -2,7 +2,6 @@
PORTNAME= qscintilla2-qt5
PORTVERSION= ${QSCI2_VERSION}
-PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
DISTNAME= ${QSCI2_DISTNAME}
@@ -13,7 +12,7 @@ COMMENT= Qt 5 port of the Scintilla C++ editor class
USES= qmake pyqt:5
USE_GL= gl
USE_PYQT= #
-USE_QT5= buildtools_build gui printsupport widgets
+USE_QT5= buildtools_build core gui printsupport widgets
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/Qt4Qt5
diff --git a/devel/qscintilla2-qt5/distinfo b/devel/qscintilla2-qt5/distinfo
index 35ea2ad97749..85bcb157676d 100644
--- a/devel/qscintilla2-qt5/distinfo
+++ b/devel/qscintilla2-qt5/distinfo
@@ -1,2 +1,3 @@
-SHA256 (QScintilla-gpl-2.9.1.tar.gz) = 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
-SIZE (QScintilla-gpl-2.9.1.tar.gz) = 2490144
+TIMESTAMP = 1514673326
+SHA256 (QScintilla_gpl-2.10.2.tar.gz) = 14b31d20717eed95ea9bea4cd16e5e1b72cee7ebac647cba878e0f6db6a65ed0
+SIZE (QScintilla_gpl-2.10.2.tar.gz) = 2665138
diff --git a/devel/qscintilla2-qt5/files/patch-Qt4Qt5_features_qscintilla2.prf b/devel/qscintilla2-qt5/files/patch-Qt4Qt5_features_qscintilla2.prf
deleted file mode 100644
index a286e14b814f..000000000000
--- a/devel/qscintilla2-qt5/files/patch-Qt4Qt5_features_qscintilla2.prf
+++ /dev/null
@@ -1,24 +0,0 @@
-The Qt5 version of QScintilla is called libqscintilla2-qt5.so.
-Make it be referenced this way by Qt's build system.
---- Qt4Qt5/features/qscintilla2.prf.orig 2015-04-20 14:38:24 UTC
-+++ Qt4Qt5/features/qscintilla2.prf
-@@ -17,9 +17,17 @@ CONFIG(debug, debug|release) {
- win32: {
- LIBS += -lqscintilla2d
- } else {
-- LIBS += -lqscintilla2
-+ greaterThan(QT_MAJOR_VERSION, 4) {
-+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
-+ } else {
-+ LIBS += -lqscintilla2
-+ }
- }
- }
- } else {
-- LIBS += -lqscintilla2
-+ greaterThan(QT_MAJOR_VERSION, 4) {
-+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
-+ } else {
-+ LIBS += -lqscintilla2
-+ }
- }
diff --git a/devel/qscintilla2-qt5/files/patch-Qt4Qt5_qscintilla.pro b/devel/qscintilla2-qt5/files/patch-Qt4Qt5_qscintilla.pro
deleted file mode 100644
index 4efb59639ef9..000000000000
--- a/devel/qscintilla2-qt5/files/patch-Qt4Qt5_qscintilla.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-Install the library as libqscintilla2-qt5.so.
-The suffix is used to make it differ from libqscintilla2.so, which is the Qt4
-version.
---- Qt4Qt5/qscintilla.pro.orig 2015-04-20 14:38:24 UTC
-+++ Qt4Qt5/qscintilla.pro
-@@ -23,7 +23,11 @@
- !win32:VERSION = 12.0.0
-
- TEMPLATE = lib
--TARGET = qscintilla2
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+ TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
-+} else {
-+ TARGET = qscintilla2
-+}
- CONFIG += qt warn_off release thread exceptions
- INCLUDEPATH += . ../include ../lexlib ../src
-
diff --git a/devel/qscintilla2-qt5/pkg-plist b/devel/qscintilla2-qt5/pkg-plist
index 903ead92c6c5..19a281f4bb6c 100644
--- a/devel/qscintilla2-qt5/pkg-plist
+++ b/devel/qscintilla2-qt5/pkg-plist
@@ -22,8 +22,10 @@
%%QT_INCDIR%%/Qsci/qscilexeridl.h
%%QT_INCDIR%%/Qsci/qscilexerjava.h
%%QT_INCDIR%%/Qsci/qscilexerjavascript.h
+%%QT_INCDIR%%/Qsci/qscilexerjson.h
%%QT_INCDIR%%/Qsci/qscilexerlua.h
%%QT_INCDIR%%/Qsci/qscilexermakefile.h
+%%QT_INCDIR%%/Qsci/qscilexermarkdown.h
%%QT_INCDIR%%/Qsci/qscilexermatlab.h
%%QT_INCDIR%%/Qsci/qscilexeroctave.h
%%QT_INCDIR%%/Qsci/qscilexerpascal.h
@@ -48,10 +50,10 @@
%%QT_INCDIR%%/Qsci/qsciscintillabase.h
%%QT_INCDIR%%/Qsci/qscistyle.h
%%QT_INCDIR%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR%%/libqscintilla2-qt5.so
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0.1
+%%QT_LIBDIR%%/libqscintilla2_qt5.so
+%%QT_LIBDIR%%/libqscintilla2_qt5.so.13
+%%QT_LIBDIR%%/libqscintilla2_qt5.so.13.1
+%%QT_LIBDIR%%/libqscintilla2_qt5.so.13.1.0
%%QT_MKSPECDIR%%/features/qscintilla2.prf
%%QT_DATADIR%%/qsci/api/python/Python-2.4.api
%%QT_DATADIR%%/qsci/api/python/Python-2.5.api
@@ -62,6 +64,7 @@
%%QT_DATADIR%%/qsci/api/python/Python-3.3.api
%%QT_DATADIR%%/qsci/api/python/Python-3.4.api
%%QT_DATADIR%%/qsci/api/python/Python-3.5.api
+%%QT_DATADIR%%/qsci/api/python/Python-3.6.api
%%NLS%%%%QT_L10NDIR%%/qscintilla_cs.qm
%%NLS%%%%QT_L10NDIR%%/qscintilla_de.qm
%%NLS%%%%QT_L10NDIR%%/qscintilla_es.qm
diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index db13304621e1..8dffcf02fde2 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -13,7 +13,7 @@ COMMENT= Qt 4 port of the Scintilla C++ editor class
USES= qmake pyqt:4
USE_PYQT= #
-USE_QT4= moc_build gui xml designer
+USE_QT4= moc_build corelib gui xml designer
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/Qt4Qt5
diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo
index 35ea2ad97749..ce00aadc9630 100644
--- a/devel/qscintilla2/distinfo
+++ b/devel/qscintilla2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (QScintilla-gpl-2.9.1.tar.gz) = 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
-SIZE (QScintilla-gpl-2.9.1.tar.gz) = 2490144
+TIMESTAMP = 1514672700
+SHA256 (QScintilla_gpl-2.10.2.tar.gz) = 14b31d20717eed95ea9bea4cd16e5e1b72cee7ebac647cba878e0f6db6a65ed0
+SIZE (QScintilla_gpl-2.10.2.tar.gz) = 2665138
diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist
index dc5eb1a07684..2174ad5cd0bd 100644
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@@ -22,8 +22,10 @@
%%QT_INCDIR%%/Qsci/qscilexeridl.h
%%QT_INCDIR%%/Qsci/qscilexerjava.h
%%QT_INCDIR%%/Qsci/qscilexerjavascript.h
+%%QT_INCDIR%%/Qsci/qscilexerjson.h
%%QT_INCDIR%%/Qsci/qscilexerlua.h
%%QT_INCDIR%%/Qsci/qscilexermakefile.h
+%%QT_INCDIR%%/Qsci/qscilexermarkdown.h
%%QT_INCDIR%%/Qsci/qscilexermatlab.h
%%QT_INCDIR%%/Qsci/qscilexeroctave.h
%%QT_INCDIR%%/Qsci/qscilexerpascal.h
@@ -48,10 +50,10 @@
%%QT_INCDIR%%/Qsci/qsciscintillabase.h
%%QT_INCDIR%%/Qsci/qscistyle.h
%%QT_INCDIR%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR%%/libqscintilla2.so
-%%QT_LIBDIR%%/libqscintilla2.so.12
-%%QT_LIBDIR%%/libqscintilla2.so.12.0
-%%QT_LIBDIR%%/libqscintilla2.so.12.0.1
+%%QT_LIBDIR%%/libqscintilla2_qt4.so
+%%QT_LIBDIR%%/libqscintilla2_qt4.so.13
+%%QT_LIBDIR%%/libqscintilla2_qt4.so.13.1
+%%QT_LIBDIR%%/libqscintilla2_qt4.so.13.1.0
%%QT_MKSPECDIR%%/features/qscintilla2.prf
share/qt4/qsci/api/python/Python-2.4.api
share/qt4/qsci/api/python/Python-2.5.api
@@ -62,6 +64,7 @@ share/qt4/qsci/api/python/Python-3.2.api
share/qt4/qsci/api/python/Python-3.3.api
share/qt4/qsci/api/python/Python-3.4.api
share/qt4/qsci/api/python/Python-3.5.api
+share/qt4/qsci/api/python/Python-3.6.api
%%NLS%%share/qt4/translations/qscintilla_cs.qm
%%NLS%%share/qt4/translations/qscintilla_de.qm
%%NLS%%share/qt4/translations/qscintilla_es.qm
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile
index a0c548450a68..c01d2b67b4d8 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby/Makefile
@@ -2,7 +2,7 @@
PORTNAME= qtruby
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel kde kde-kde4 ruby
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -10,7 +10,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Ruby bindings for Qt
LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 \
- libqscintilla2.so:devel/qscintilla2
+ libqscintilla2_qt4.so:devel/qscintilla2
USES= cmake:outsource kde:4 tar:xz
USE_KDE= smokeqt
diff --git a/devel/smokegen/Makefile b/devel/smokegen/Makefile
index 19a4c2ca0328..46d2987e44c0 100644
--- a/devel/smokegen/Makefile
+++ b/devel/smokegen/Makefile
@@ -2,6 +2,7 @@
PORTNAME= smokegen
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= SMOKE bindings for KDE
diff --git a/devel/smokegen/files/patch-cmake_FindQScintilla.cmake b/devel/smokegen/files/patch-cmake_FindQScintilla.cmake
new file mode 100644
index 000000000000..0dca8bea51dc
--- /dev/null
+++ b/devel/smokegen/files/patch-cmake_FindQScintilla.cmake
@@ -0,0 +1,12 @@
+Adapt to QScintilla's new official library name.
+--- cmake/FindQScintilla.cmake.orig 2018-02-16 21:11:51 UTC
++++ cmake/FindQScintilla.cmake
+@@ -21,7 +21,7 @@ IF(QT4_FOUND)
+ "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
+ )
+
+- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
++ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2_qt4 qscintilla2 libqscintilla2)
+ FIND_LIBRARY(QSCINTILLA_LIBRARY
+ NAMES ${QSCINTILLA_NAMES}
+ PATHS ${QT_LIBRARY_DIR}
diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile
index da32e846a321..27dca7ea5d88 100644
--- a/devel/smokeqt/Makefile
+++ b/devel/smokeqt/Makefile
@@ -2,13 +2,13 @@
PORTNAME= smokeqt
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= SMOKE bindings for Qt
-LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 \
+LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 \
libqwt.so:x11-toolkits/qwt5
USES= cmake:outsource kde:4 pkgconfig tar:xz
diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile
index 8ef05a92c69d..c66f9150dc68 100644
--- a/devel/universalindentgui/Makefile
+++ b/devel/universalindentgui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= universalindentgui
PORTVERSION= 1.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MASTER_SITES= SF/universalindent/uigui/UniversalIndentGUI_${PORTVERSION}
@@ -13,7 +13,7 @@ COMMENT= Graphical UI for multiple source code indent/format/beautify tools
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.GPL
-LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
USES= dos2unix qmake python:run shebangfix
SHEBANG_FILES= indenters/*.py indenters/*.rb
diff --git a/devel/universalindentgui/files/patch-UniversalIndentGUI.pro b/devel/universalindentgui/files/patch-UniversalIndentGUI.pro
index 4d71861dff1b..0a31f540130b 100644
--- a/devel/universalindentgui/files/patch-UniversalIndentGUI.pro
+++ b/devel/universalindentgui/files/patch-UniversalIndentGUI.pro
@@ -1,5 +1,14 @@
---- UniversalIndentGUI.pro.orig 2017-01-20 10:40:58 UTC
+--- UniversalIndentGUI.pro.orig 2018-02-16 21:30:56 UTC
+++ UniversalIndentGUI.pro
+@@ -23,7 +23,7 @@ macx {
+ ICON = resources/UniversalIndentGUI.icns
+ }
+ else {
+- LIBS += -lqscintilla2
++ LIBS += -lqscintilla2_qt4
+ }
+
+ CONFIG(release, debug|release) {
@@ -37,10 +37,10 @@ macx:pipe2nul = "&> /dev/null"
##########################
message(Updating language files)
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index 72891b027ff9..395fc56d33af 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= svg
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics devel python
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtSvg API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile
index 036d80c8743e..de2e27924624 100644
--- a/graphics/py-qt5-svg/Makefile
+++ b/graphics/py-qt5-svg/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= svg
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtSvg API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 79fca2224d43..30252acc7bda 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -4,6 +4,7 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
DISTVERSION= 2_18_15
+PORTREVISION= 1
CATEGORIES= graphics geography
MAINTAINER= rhurlin@gwdg.de
@@ -19,7 +20,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libproj.so:graphics/proj \
libqca.so:devel/qca \
libqjson.so:devel/qjson \
- libqscintilla2.so:devel/qscintilla2 \
+ libqscintilla2_qt4.so:devel/qscintilla2 \
libqwt.so:x11-toolkits/qwt5 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \
diff --git a/lang/py-qt5-qml/Makefile b/lang/py-qt5-qml/Makefile
index 164a84a13831..80d714ffc3ed 100644
--- a/lang/py-qt5-qml/Makefile
+++ b/lang/py-qt5-qml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= qml
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtQml API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 2bf60f13ecb1..41414bb47c46 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,7 +3,7 @@
PORTNAME= octave
PORTVERSION= 4.0.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= math
MASTER_SITES= GNU
@@ -33,7 +33,7 @@ LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick \
libumfpack.so:math/suitesparse \
libglpk.so:math/glpk \
libgl2ps.so:print/gl2ps \
- libqscintilla2.so:devel/qscintilla2 \
+ libqscintilla2_qt4.so:devel/qscintilla2 \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
index a4eaad076793..86a60e23e695 100644
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= multimedia
+PORTREVISION= 1
CATEGORIES= multimedia devel python
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtMultimedia API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index e5cb96056726..8878d3fc0837 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= phonon
+PORTREVISION= 1
CATEGORIES= multimedia devel python
MAINTAINER= kde@FreeBSD.org
@@ -21,7 +22,7 @@ OPTIONS_SUB= yes
API_DESC= Install Phonon API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile
index 6c4fdd38a170..9a595f367615 100644
--- a/multimedia/py-qt5-multimedia/Makefile
+++ b/multimedia/py-qt5-multimedia/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= multimedia
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtMultimedia API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile
index e4b125d317c8..af4a0c66ca07 100644
--- a/multimedia/py-qt5-multimediawidgets/Makefile
+++ b/multimedia/py-qt5-multimediawidgets/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= multimediawidgets
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtMultimedia API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index 60e0c14ade5e..38803d345da9 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= network
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net devel python
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtNetwork API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/net/py-qt5-network/Makefile b/net/py-qt5-network/Makefile
index 2f1e2f6d1c01..511f654a2ab2 100644
--- a/net/py-qt5-network/Makefile
+++ b/net/py-qt5-network/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= network
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net devel python
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +22,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtNetwork API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/print/py-qt5-printsupport/Makefile b/print/py-qt5-printsupport/Makefile
index 7853aa6a3885..f63763470f8b 100644
--- a/print/py-qt5-printsupport/Makefile
+++ b/print/py-qt5-printsupport/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= printsupport
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtPrintsupport API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index a9bb98c4be82..38cf765d128f 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xml
PORTEPOCH= 1
+PORTREVISION= 1
CATEGORIES= textproc devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtXml API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile
index d50d72c96c27..7c8a35a1b304 100644
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= xmlpatterns
+PORTREVISION= 1
CATEGORIES= textproc devel python
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtXmlPatterns API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile
index 88b737a03994..cdf57aa0d3b1 100644
--- a/textproc/py-qt5-xml/Makefile
+++ b/textproc/py-qt5-xml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xml
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc devel python
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +22,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtXml API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile
index 7d3e6fa24ffd..040771192b5f 100644
--- a/textproc/py-qt5-xmlpatterns/Makefile
+++ b/textproc/py-qt5-xmlpatterns/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xmlpatterns
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc devel python
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +22,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtXmlPatterns API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile
index 63207191a5df..173fbc7ce45e 100644
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= webkit
+PORTREVISION= 1
CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtWebKit API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/www/py-qt5-webchannel/Makefile b/www/py-qt5-webchannel/Makefile
index 4cce71c421cb..2e05abdf2460 100644
--- a/www/py-qt5-webchannel/Makefile
+++ b/www/py-qt5-webchannel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= webchannel
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
@@ -25,7 +25,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtWebChannel API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
post-install-DEBUG-off:
diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile
index 56d8adab468b..233590c3ea6a 100644
--- a/www/py-qt5-webengine/Makefile
+++ b/www/py-qt5-webengine/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= webengine
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
@@ -29,7 +29,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtWebEngine API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
post-install-DEBUG-off:
diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile
index 370cab45eed3..42171835fc09 100644
--- a/www/py-qt5-webkit/Makefile
+++ b/www/py-qt5-webkit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= webkit
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
@@ -26,7 +26,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtWebKit API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/www/py-qt5-webkitwidgets/Makefile b/www/py-qt5-webkitwidgets/Makefile
index e1753aa0df06..71d2479582bd 100644
--- a/www/py-qt5-webkitwidgets/Makefile
+++ b/www/py-qt5-webkitwidgets/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= webkitwidgets
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
@@ -24,7 +24,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtWebKitWidgets API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index 0168552232b0..c96cdecb164f 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= gui
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits devel python
@@ -24,7 +25,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtGui API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
BROKEN_sparc64= Does not compile on sparc64
diff --git a/x11-toolkits/py-qt5-quick/Makefile b/x11-toolkits/py-qt5-quick/Makefile
index 753c322afb2c..2b0e34f16d06 100644
--- a/x11-toolkits/py-qt5-quick/Makefile
+++ b/x11-toolkits/py-qt5-quick/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= quick
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +22,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtQuick API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-widgets/Makefile b/x11-toolkits/py-qt5-widgets/Makefile
index 557858121e45..dced86c9f26c 100644
--- a/x11-toolkits/py-qt5-widgets/Makefile
+++ b/x11-toolkits/py-qt5-widgets/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= widgets
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtGui API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile
index 68720c8f548d..8b7d5d84be26 100644
--- a/x11/leechcraft/Makefile
+++ b/x11/leechcraft/Makefile
@@ -3,7 +3,7 @@
PORTNAME= leechcraft
PORTVERSION= 0.6.70
-PORTREVISION= 26
+PORTREVISION= 27
CATEGORIES= x11
MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/
@@ -273,7 +273,7 @@ POLEEMERY_CMAKE_OFF= -DENABLE_POLEEMERY:BOOL=false
POPISHU_DESC= Text editor with IDE features
POPISHU_CMAKE_ON= -DENABLE_POPISHU:BOOL=true
POPISHU_CMAKE_OFF= -DENABLE_POPISHU:BOOL=false
-POPISHU_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+POPISHU_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
POSHUKU_DESC= The full-featured web browser plugin
POSHUKU_CMAKE_ON= -DENABLE_POSHUKU:BOOL=true
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index bf437f7841e3..36107c814a64 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= opengl
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11 devel python
@@ -24,7 +25,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtOpenGL API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2
+API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>
diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile
index b203e287e80f..ca1102cbd8bb 100644
--- a/x11/py-qt5-opengl/Makefile
+++ b/x11/py-qt5-opengl/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= opengl
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 devel python
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_SUB= yes
API_DESC= Install QtOpenGL API for QScintilla2
API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
API_CONFIGURE_OFF= --no-qsci-api
-API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
.include <bsd.port.mk>