svn commit: r462214 - in head: Mk/Uses cad/openscad comms/py-qt5-serialport databases/py-qt4-sql databases/py-qt5-sql databases/sqliteman databases/sqliteman/files databases/tora databases/tora/fil...
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sun Feb 18 09:55:16 UTC 2018
Author: rakuco
Date: Sun Feb 18 09:55:10 2018
New Revision: 462214
URL: https://svnweb.freebsd.org/changeset/ports/462214
Log:
Update QScintilla 2.10.2.
Upstream has renamed its libraries and we no longer need to patch
devel/qscintilla-qt5 to create a library whose name does not conflict with
devel/qscintilla's. However, the library names are different so we need to bump
PORTREVISION in several ports (the SOVERSION has changed too).
Thanks to antoine for the exp-run.
PR: 225928
Added:
head/databases/sqliteman/files/
head/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake (contents, props changed)
head/databases/tora/files/patch-config_m4_qtkde.m4 (contents, props changed)
head/devel/smokegen/files/patch-cmake_FindQScintilla.cmake (contents, props changed)
Deleted:
head/devel/qscintilla2-qt5/files/
Modified:
head/Mk/Uses/pyqt.mk
head/cad/openscad/Makefile
head/comms/py-qt5-serialport/Makefile
head/databases/py-qt4-sql/Makefile
head/databases/py-qt5-sql/Makefile
head/databases/sqliteman/Makefile
head/databases/tora/Makefile
head/devel/p5-perlqt/Makefile
head/devel/py-qt4-assistant/Makefile
head/devel/py-qt4-core/Makefile
head/devel/py-qt4-dbus/Makefile
head/devel/py-qt4-declarative/Makefile
head/devel/py-qt4-designer/Makefile
head/devel/py-qt4-help/Makefile
head/devel/py-qt4-qscintilla2/Makefile
head/devel/py-qt4-qscintilla2/pkg-plist
head/devel/py-qt4-script/Makefile
head/devel/py-qt4-scripttools/Makefile
head/devel/py-qt4-test/Makefile
head/devel/py-qt5-core/Makefile
head/devel/py-qt5-dbus/Makefile
head/devel/py-qt5-designer/Makefile
head/devel/py-qt5-help/Makefile
head/devel/py-qt5-qscintilla2/Makefile
head/devel/py-qt5-qscintilla2/pkg-plist
head/devel/py-qt5-test/Makefile
head/devel/qscintilla2-designerplugin-qt5/Makefile
head/devel/qscintilla2-designerplugin/Makefile
head/devel/qscintilla2-qt5/Makefile
head/devel/qscintilla2-qt5/distinfo
head/devel/qscintilla2-qt5/pkg-plist
head/devel/qscintilla2/Makefile
head/devel/qscintilla2/distinfo
head/devel/qscintilla2/pkg-plist
head/devel/ruby-qtruby/Makefile
head/devel/smokegen/Makefile
head/devel/smokeqt/Makefile
head/devel/universalindentgui/Makefile
head/devel/universalindentgui/files/patch-UniversalIndentGUI.pro
head/graphics/py-qt4-svg/Makefile
head/graphics/py-qt5-svg/Makefile
head/graphics/qgis/Makefile
head/lang/py-qt5-qml/Makefile
head/math/octave/Makefile
head/multimedia/py-qt4-multimedia/Makefile
head/multimedia/py-qt4-phonon/Makefile
head/multimedia/py-qt5-multimedia/Makefile
head/multimedia/py-qt5-multimediawidgets/Makefile
head/net/py-qt4-network/Makefile
head/net/py-qt5-network/Makefile
head/print/py-qt5-printsupport/Makefile
head/textproc/py-qt4-xml/Makefile
head/textproc/py-qt4-xmlpatterns/Makefile
head/textproc/py-qt5-xml/Makefile
head/textproc/py-qt5-xmlpatterns/Makefile
head/www/py-qt4-webkit/Makefile
head/www/py-qt5-webchannel/Makefile
head/www/py-qt5-webengine/Makefile
head/www/py-qt5-webkit/Makefile
head/www/py-qt5-webkitwidgets/Makefile
head/x11-toolkits/py-qt4-gui/Makefile
head/x11-toolkits/py-qt5-quick/Makefile
head/x11-toolkits/py-qt5-widgets/Makefile
head/x11/leechcraft/Makefile
head/x11/py-qt4-opengl/Makefile
head/x11/py-qt5-opengl/Makefile
Modified: head/Mk/Uses/pyqt.mk
==============================================================================
--- head/Mk/Uses/pyqt.mk Sun Feb 18 09:44:40 2018 (r462213)
+++ head/Mk/Uses/pyqt.mk Sun Feb 18 09:55:10 2018 (r462214)
@@ -62,7 +62,7 @@ MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${P
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
Modified: head/cad/openscad/Makefile
==============================================================================
--- head/cad/openscad/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/cad/openscad/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/comms/py-qt5-serialport/Makefile
==============================================================================
--- head/comms/py-qt5-serialport/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/comms/py-qt5-serialport/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= serialport
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= comms devel python
MAINTAINER= kde at 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>
Modified: head/databases/py-qt4-sql/Makefile
==============================================================================
--- head/databases/py-qt4-sql/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/databases/py-qt4-sql/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/databases/py-qt5-sql/Makefile
==============================================================================
--- head/databases/py-qt5-sql/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/databases/py-qt5-sql/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sql
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases devel python
MAINTAINER= kde at 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>
Modified: head/databases/sqliteman/Makefile
==============================================================================
--- head/databases/sqliteman/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/databases/sqliteman/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -3,14 +3,14 @@
PORTNAME= sqliteman
PORTVERSION= 1.2.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= databases
MASTER_SITES= SF
MAINTAINER= wen at 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
Added: head/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/sqliteman/files/patch-cmake_modules_FindQScintilla.cmake Sun Feb 18 09:55:10 2018 (r462214)
@@ -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}
Modified: head/databases/tora/Makefile
==============================================================================
--- head/databases/tora/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/databases/tora/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Added: head/databases/tora/files/patch-config_m4_qtkde.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/tora/files/patch-config_m4_qtkde.m4 Sun Feb 18 09:55:10 2018 (r462214)
@@ -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)
+ ])
+
Modified: head/devel/p5-perlqt/Makefile
==============================================================================
--- head/devel/p5-perlqt/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/p5-perlqt/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -2,14 +2,14 @@
PORTNAME= perlqt
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel kde kde-kde4 perl5
PKGNAMEPREFIX= p5-
MAINTAINER= kde at 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
Modified: head/devel/py-qt4-assistant/Makefile
==============================================================================
--- head/devel/py-qt4-assistant/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-assistant/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/devel/py-qt4-core/Makefile
==============================================================================
--- head/devel/py-qt4-core/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-core/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/devel/py-qt4-dbus/Makefile
==============================================================================
--- head/devel/py-qt4-dbus/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-dbus/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/devel/py-qt4-declarative/Makefile
==============================================================================
--- head/devel/py-qt4-declarative/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-declarative/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= declarative
+PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at 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>
Modified: head/devel/py-qt4-designer/Makefile
==============================================================================
--- head/devel/py-qt4-designer/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-designer/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/devel/py-qt4-help/Makefile
==============================================================================
--- head/devel/py-qt4-help/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-help/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= help
+PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at 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>
Modified: head/devel/py-qt4-qscintilla2/Makefile
==============================================================================
--- head/devel/py-qt4-qscintilla2/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-qscintilla2/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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 at 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
Modified: head/devel/py-qt4-qscintilla2/pkg-plist
==============================================================================
--- head/devel/py-qt4-qscintilla2/pkg-plist Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-qscintilla2/pkg-plist Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/devel/py-qt4-script/Makefile
==============================================================================
--- head/devel/py-qt4-script/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-script/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/devel/py-qt4-scripttools/Makefile
==============================================================================
--- head/devel/py-qt4-scripttools/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-scripttools/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/devel/py-qt4-test/Makefile
==============================================================================
--- head/devel/py-qt4-test/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt4-test/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/devel/py-qt5-core/Makefile
==============================================================================
--- head/devel/py-qt5-core/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt5-core/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= core
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MAINTAINER= kde at 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
Modified: head/devel/py-qt5-dbus/Makefile
==============================================================================
--- head/devel/py-qt5-dbus/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt5-dbus/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= dbus
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MAINTAINER= kde at 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>
Modified: head/devel/py-qt5-designer/Makefile
==============================================================================
--- head/devel/py-qt5-designer/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt5-designer/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= designer
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MAINTAINER= kde at 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>
Modified: head/devel/py-qt5-help/Makefile
==============================================================================
--- head/devel/py-qt5-help/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt5-help/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= help
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
MAINTAINER= kde at 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>
Modified: head/devel/py-qt5-qscintilla2/Makefile
==============================================================================
--- head/devel/py-qt5-qscintilla2/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt5-qscintilla2/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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 at 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
Modified: head/devel/py-qt5-qscintilla2/pkg-plist
==============================================================================
--- head/devel/py-qt5-qscintilla2/pkg-plist Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt5-qscintilla2/pkg-plist Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/devel/py-qt5-test/Makefile
==============================================================================
--- head/devel/py-qt5-test/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/py-qt5-test/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= test
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MAINTAINER= kde at 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>
Modified: head/devel/qscintilla2-designerplugin-qt5/Makefile
==============================================================================
--- head/devel/qscintilla2-designerplugin-qt5/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/qscintilla2-designerplugin-qt5/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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 at 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
Modified: head/devel/qscintilla2-designerplugin/Makefile
==============================================================================
--- head/devel/qscintilla2-designerplugin/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/qscintilla2-designerplugin/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -12,7 +12,7 @@ DISTNAME= ${QSCI2_DISTNAME}
MAINTAINER= kde at 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
Modified: head/devel/qscintilla2-qt5/Makefile
==============================================================================
--- head/devel/qscintilla2-qt5/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/qscintilla2-qt5/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/devel/qscintilla2-qt5/distinfo
==============================================================================
--- head/devel/qscintilla2-qt5/distinfo Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/qscintilla2-qt5/distinfo Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/devel/qscintilla2-qt5/pkg-plist
==============================================================================
--- head/devel/qscintilla2-qt5/pkg-plist Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/qscintilla2-qt5/pkg-plist Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/devel/qscintilla2/Makefile
==============================================================================
--- head/devel/qscintilla2/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/qscintilla2/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/devel/qscintilla2/distinfo
==============================================================================
--- head/devel/qscintilla2/distinfo Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/qscintilla2/distinfo Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/devel/qscintilla2/pkg-plist
==============================================================================
--- head/devel/qscintilla2/pkg-plist Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/qscintilla2/pkg-plist Sun Feb 18 09:55:10 2018 (r462214)
@@ -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
Modified: head/devel/ruby-qtruby/Makefile
==============================================================================
--- head/devel/ruby-qtruby/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/ruby-qtruby/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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 at 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
Modified: head/devel/smokegen/Makefile
==============================================================================
--- head/devel/smokegen/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/smokegen/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -2,6 +2,7 @@
PORTNAME= smokegen
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-kde4
MAINTAINER= kde at FreeBSD.org
COMMENT= SMOKE bindings for KDE
Added: head/devel/smokegen/files/patch-cmake_FindQScintilla.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/smokegen/files/patch-cmake_FindQScintilla.cmake Sun Feb 18 09:55:10 2018 (r462214)
@@ -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}
Modified: head/devel/smokeqt/Makefile
==============================================================================
--- head/devel/smokeqt/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/smokeqt/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -2,13 +2,13 @@
PORTNAME= smokeqt
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel kde kde-kde4
MAINTAINER= kde at 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
Modified: head/devel/universalindentgui/Makefile
==============================================================================
--- head/devel/universalindentgui/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/universalindentgui/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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/
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
Modified: head/devel/universalindentgui/files/patch-UniversalIndentGUI.pro
==============================================================================
--- head/devel/universalindentgui/files/patch-UniversalIndentGUI.pro Sun Feb 18 09:44:40 2018 (r462213)
+++ head/devel/universalindentgui/files/patch-UniversalIndentGUI.pro Sun Feb 18 09:55:10 2018 (r462214)
@@ -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)
Modified: head/graphics/py-qt4-svg/Makefile
==============================================================================
--- head/graphics/py-qt4-svg/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/graphics/py-qt4-svg/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/graphics/py-qt5-svg/Makefile
==============================================================================
--- head/graphics/py-qt5-svg/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/graphics/py-qt5-svg/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= svg
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel python
MAINTAINER= kde at 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>
Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/graphics/qgis/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -4,6 +4,7 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
DISTVERSION= 2_18_15
+PORTREVISION= 1
CATEGORIES= graphics geography
MAINTAINER= rhurlin at 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 \
Modified: head/lang/py-qt5-qml/Makefile
==============================================================================
--- head/lang/py-qt5-qml/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/lang/py-qt5-qml/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= qml
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang devel python
MAINTAINER= kde at 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>
Modified: head/math/octave/Makefile
==============================================================================
--- head/math/octave/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/math/octave/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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/GraphicsMag
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
Modified: head/multimedia/py-qt4-multimedia/Makefile
==============================================================================
--- head/multimedia/py-qt4-multimedia/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/multimedia/py-qt4-multimedia/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= multimedia
+PORTREVISION= 1
CATEGORIES= multimedia devel python
MAINTAINER= kde at 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>
Modified: head/multimedia/py-qt4-phonon/Makefile
==============================================================================
--- head/multimedia/py-qt4-phonon/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/multimedia/py-qt4-phonon/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= phonon
+PORTREVISION= 1
CATEGORIES= multimedia devel python
MAINTAINER= kde at 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>
Modified: head/multimedia/py-qt5-multimedia/Makefile
==============================================================================
--- head/multimedia/py-qt5-multimedia/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/multimedia/py-qt5-multimedia/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= multimedia
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia devel python
MAINTAINER= kde at 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>
Modified: head/multimedia/py-qt5-multimediawidgets/Makefile
==============================================================================
--- head/multimedia/py-qt5-multimediawidgets/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/multimedia/py-qt5-multimediawidgets/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= multimediawidgets
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia devel python
MAINTAINER= kde at 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>
Modified: head/net/py-qt4-network/Makefile
==============================================================================
--- head/net/py-qt4-network/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/net/py-qt4-network/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -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>
Modified: head/net/py-qt5-network/Makefile
==============================================================================
--- head/net/py-qt5-network/Makefile Sun Feb 18 09:44:40 2018 (r462213)
+++ head/net/py-qt5-network/Makefile Sun Feb 18 09:55:10 2018 (r462214)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= network
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net devel python
MAINTAINER= kde at 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}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list