<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cffde0404317a0c9e59fdccab13dd37370ab9aed">https://github.com/macports/macports-ports/commit/cffde0404317a0c9e59fdccab13dd37370ab9aed</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cffde0404317a0c9e59fdccab13dd37370ab9aed
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 4 22:26:28 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> append Qt version to qscintilla port names
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Revbump all dependents.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55211
</span>---
aqua/TOra/Portfile | 7 +-
.../patch-cmake-modules-FindQScintilla.cmake.diff | 11 ++
databases/sqlitebrowser/Portfile | 3 +-
databases/sqliteman/Portfile | 4 +-
devel/eric4/Portfile | 3 +-
devel/hgview/Portfile | 5 +-
devel/qscintilla/Portfile | 186 ++++++++++++++++++---
devel/qscintilla/files/Qsci.pro | 8 -
devel/qscintilla/files/patch-add_debug.diff | 21 +--
.../qscintilla}/files/patch-configure.py.diff | 0
devel/qscintilla2/Portfile | 98 +----------
devel/qscintilla2/files/patch-configure.py.diff | 42 -----
devel/tortoisehg/Portfile | 3 +-
gis/qgis/Portfile | 6 +-
math/octave-devel/Portfile | 10 +-
math/octave/Portfile | 6 +-
python/py-pyqt4/Portfile | 3 +-
python/py-pyqt5/Portfile | 3 +-
python/py-qscintilla/Portfile | 90 +---------
science/openscad/Portfile | 4 +-
20 files changed, 222 insertions(+), 291 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TOra/Portfile b/aqua/TOra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 485116b..fcd0afd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/TOra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TOra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cmake 1.0
</span>
name TOra
version 2.1.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> license GPL-2
description GUI tool for Oracle, PostgreSQL, and MySQL
long_description Database developer/DBA frontend for various DB servers.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,10 +23,11 @@ checksums md5 ea4a75a9daeaf58492413e3f7fe40293 \
</span>
depends_build port:cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:qscintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:qscintilla-qt4
</span>
patchfiles patch-cmake-modules-FindOracle.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-osx_tools-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-osx_tools-Info.plist.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-modules-FindQScintilla.cmake.diff
</span>
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}/tmprelease/
# -Dmacports_prefix is there due to the patch for the Info.plist file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TOra/files/patch-cmake-modules-FindQScintilla.cmake.diff b/aqua/TOra/files/patch-cmake-modules-FindQScintilla.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4536eec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TOra/files/patch-cmake-modules-FindQScintilla.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/FindQScintilla.cmake.orig 2010-06-05 06:39:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/FindQScintilla.cmake 2017-11-04 09:43:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${FRAMEWORK_INCLUDE_DIR}/Qsci
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2_qt4 libqscintilla2_qt4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_LIBRARY(QSCINTILLA_LIBRARY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NAMES ${QSCINTILLA_NAMES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATHS ${QT_LIBRARY_DIR}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/sqlitebrowser/Portfile b/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9ed29f..df71eb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup github 1.0
</span> PortGroup app 1.0
github.setup sqlitebrowser sqlitebrowser 3.9.1 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories databases
platforms darwin linux
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +42,7 @@ checksums rmd160 96624d2a492fb8b81c8f91d41c2d988a16a18bd0 \
</span> universal_variant no
depends_lib-append port:antlr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qscintilla2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-qt5
</span>
qt5.depends_component \
qtmacextras qttools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/sqliteman/Portfile b/databases/sqliteman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a75700..fd362a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/sqliteman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/sqliteman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup cmake 1.0
</span>
name sqliteman
version 1.2.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span>
description GUI tool for Sqlite3
long_description The best developer's and/or admin's GUI tool for Sqlite3 in the world. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ patchfiles patch-litemanwindow.cpp.diff \
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:qscintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:qscintilla-qt4
</span>
depends_run-append port:sqlite3 \
port:qt4-mac-sqlite3-plugin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/eric4/Portfile b/devel/eric4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d503fdb..d2edee1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/eric4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/eric4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name eric4
version 4.5.13
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +28,7 @@ checksums rmd160 0b01bb4c46c4ac959b5f45f037caeece624c504d \
</span>
depends_lib port:python27 \
port:py27-pyqt4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-qscintilla \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-qscintilla-qt4 \
</span> port:py27-pysvn \
port:py27-rope \
port:py27-pylint \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/hgview/Portfile b/devel/hgview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 249701f..933a95f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/hgview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/hgview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup python 1.0
</span>
name hgview
version 1.9.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel python
license GPL-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +27,7 @@ depends_build-append port:asciidoc \
</span> port:xmlto
depends_lib-append path:bin/hg:mercurial \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qscintilla \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qscintilla-qt4 \
</span> port:py${python.version}-pygments \
port:py${python.version}-docutils \
port:py${python.version}-urwid
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +54,7 @@ post-destroot {
</span>
subport ${name}-devel {
version 1.7.99
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> fetch.type hg
hg.url http://hg.logilab.org/master/hgview/
hg.tag b115909fe347
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/Portfile b/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eda998b..0973835 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake 1.0
</span> PortGroup cxx11 1.1
name qscintilla
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE: The version of this port must be kept in sync with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 'py*-qscintilla' port(s), since they contain the python bindings!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> version 2.10.1
checksums rmd160 5dbddfdaf826e95251589a41696d5786b497e86f \
sha256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64
categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license {GPL-2 GPL-3 OpenSSLException}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {michaelld @michaelld} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {michaelld @michaelld} {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span> description QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control.
homepage http://www.riverbankcomputing.com/software/qscintilla/
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,36 +25,174 @@ long_description QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ e
</span> breakpoints and the current line. Styling choices are more open \
than with many editors, allowing the use of proportional fonts, \
bold and italics, multiple foreground and background colours and \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- multiple fonts. See the py*-qscintilla port to install python bindings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ multiple fonts.
</span>
distname QScintilla_gpl-${version}
master_sites sourceforge:pyqt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# don't include qscintilla2 via CONFIG, instead do it directly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to avoid linking against an already-installed library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-add_debug.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach qt_major {4 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-qt${qt_major} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake${qt_major} 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/Qt4Qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # enable C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respect configure.cxx_stdlib when linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt${qt_major}.depends_component qtmacextras
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append CONFIG+=absolute_library_soname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append CONFIG+=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}-designer-qt${qt_major} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake${qt_major} 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Qt Designer plugin for Qt${qt_major} QScintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/designer-Qt4Qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-add_debug.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append CONFIG+="debug_and_release build_all"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append CONFIG+=release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt${qt_major}.depends_component qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants ${name}-qt${qt_major} debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}-qt${qt_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py-${name}-qt${qt_major} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories-append python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksum {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:py27-qscintilla-qt${qt_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${subport}/README"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions {27 34 35 36}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py${pver}-${name}-qt${qt_major} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake${qt_major} 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories-append python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Python bindings for Qt${qt_major} QScintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description Python bindings for Qt${qt_major} QScintilla, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a port to Qt of Neil Hodgson's Scintilla C++ editor control.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# enable C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/Python
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# respect configure.cxx_stdlib when linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow configure.py to respect --spec=... argument
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-configure.py.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append CONFIG+="debug_and_release build_all"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append CONFIG+=release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-qt${qt_major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${pver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pver}-sip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pver}-pyqt${qt_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cache [open "${configure.dir}/.qmake.cache" w 0644]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "CONFIG += ${qt_arch_types}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${cache}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_ver_dot [join [split ${pver} ""] "."]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python${python_ver_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --prefix is not recognized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd ${configure.python} configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pyqt=PyQt${qt_major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sip=${prefix}/bin/sip-${python_ver_dot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --qmake=${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${qt_major} eq 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pyqt-sipdir=${prefix}/share/py${pver}-sip/PyQt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --spec=${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.spec_cmd --spec=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --disable-dependency-tracking is not recognized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2.api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2-Python${python_ver_dot}.api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # drop in a simple QMake file, for easy building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/Qsci.pro ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksum {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${subport}/README"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt4 description "build Qt4 version of ${name}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-qt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-designer-qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt5 description "build Qt5 version of ${name}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-designer-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # rename QMake .pro files in subdirs to work with top-level file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/Qt4Qt5/qscintilla.pro \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Qt4Qt5/Qt4Qt5.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/designer-Qt4Qt5/designer.pro \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/designer-Qt4Qt5/designer-Qt4Qt5.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +qt4
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/files/Qsci.pro b/devel/qscintilla/files/Qsci.pro
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6bf41d1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla/files/Qsci.pro
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- mode: sh -*- ###########################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TEMPLATE = subdirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CONFIG += ordered
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUBDIRS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Qt4Qt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- designer-Qt4Qt5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/files/patch-add_debug.diff b/devel/qscintilla/files/patch-add_debug.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a2416cb..67394d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla/files/patch-add_debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla/files/patch-add_debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- designer-Qt4Qt5/designer.pro.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ designer-Qt4Qt5/designer.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEMPLATE = lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGET = qscintillaplugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CONFIG += plugin qscintilla2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CONFIG += plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- greaterThan(QT_MAJOR_VERSION, 4) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT += designer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,3 +24,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- designer.pro.orig 2017-07-03 10:40:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ designer.pro 2017-11-04 06:49:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,3 +24,9 @@
</span>
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+QSCI_LIB = qscintilla2_qt$${QT_MAJOR_VERSION}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +!debug_and_release|build_pass {
+ CONFIG(debug, debug|release):macx {
+ TARGET = $$member(TARGET, 0)_debug
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QSCI_LIB = $$member(QSCI_LIB, 0)_debug
</span> + }
+}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCLUDEPATH += ../Qt4Qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS += -L../Qt4Qt5 -l$$QSCI_LIB
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qscintilla/files/patch-configure.py.diff b/devel/qscintilla/files/patch-configure.py.diff
</span>similarity index 100%
rename from python/py-qscintilla/files/patch-configure.py.diff
rename to devel/qscintilla/files/patch-configure.py.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/Portfile b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ccd04c5..092ec08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,108 +1,28 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
name qscintilla2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> version 2.10.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5dbddfdaf826e95251589a41696d5786b497e86f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
license GPL-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.riverbankcomputing.com/software/qscintilla/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- As well as features found in standard text editing components, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QScintilla includes features especially useful when editing and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debugging source code. These include support for syntax styling, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error indicators, code completion and call tips. The selection \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- margin can contain markers like those used in debuggers to indicate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- breakpoints and the current line. Styling choices are more open \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- than with many editors, allowing the use of proportional fonts, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bold and italics, multiple foreground and background colours and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- multiple fonts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname QScintilla_gpl-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:pyqt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq ${name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${worksrcdir}/Qt4Qt5
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtmacextras
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append CONFIG+=absolute_library_soname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append CONFIG+=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by qscintilla-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span> }
subport ${name}-designer {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Qt Designer plugin for port ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${worksrcdir}/designer-Qt4Qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qttools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.debug_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by qscintilla-designer-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span> }
set python_versions {27 34 35 36}
foreach pver ${python_versions} {
subport py${pver}-${name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Python bindings for port ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${worksrcdir}/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${pver} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${pver}-sip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${pver}-pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # allow configure.py to respect --spec=... argument
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_ver_dot [join [split ${pver} ""] "."]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python${python_ver_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --prefix is not recognized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd ${configure.python} configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --pyqt=PyQt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sip=${prefix}/bin/sip-${python_ver_dot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qmake=${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.spec_cmd --spec=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --disable-dependency-tracking is not recognized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2.api \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2-Python${python_ver_dot}.api
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by py${pver}-qscintilla-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}download
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex >QScintilla\[_-\]gpl-\(\[0-9.\]+\)${extract.suffix}<
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/files/patch-configure.py.diff b/devel/qscintilla2/files/patch-configure.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0d841af..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig 2017-07-03 10:40:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2017-11-04 02:44:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -940,24 +940,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.qmake_spec = 'win32-msvc.net'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.qmake_spec = 'win32-msvc'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Otherwise use the default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.qmake_spec = ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # # Otherwise use the default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # self.qmake_spec = ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The binary MacOS/X Qt installer used to default to XCode. If so then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use macx-clang (Qt v5) or macx-g++ (Qt v4).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Qt v5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if qt_config.QMAKE_SPEC == 'macx-xcode':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # This will exist (and we can't check anyway).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.qmake_spec = 'macx-clang'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # No need to explicitly name the default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.qmake_spec = ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except AttributeError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Qt v4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.qmake_spec = 'macx-g++'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # # Qt v5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # if qt_config.QMAKE_SPEC == 'macx-xcode':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # # This will exist (and we can't check anyway).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # self.qmake_spec = 'macx-clang'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # # No need to explicitly name the default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # self.qmake_spec = ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # except AttributeError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # # Qt v4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # self.qmake_spec = 'macx-g++'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.qt_inc_dir = qt_config.QT_INSTALL_HEADERS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tortoisehg/Portfile b/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e188334..89bb861 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup app 1.0
</span> PortGroup bitbucket 1.0
bitbucket.setup tortoisehg thg 4.3.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name tortoisehg
categories devel python
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +27,7 @@ python.default_version 27
</span> # Can use either mercurial or mercurial-devel.
depends_lib path:bin/hg:mercurial \
port:py${python.version}-pyqt4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qscintilla \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qscintilla-qt4 \
</span> port:py${python.version}-iniparse
depends_build port:py${python.version}-sphinx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/Portfile b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ff7d9a..43fd3eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup active_variants 1.1
version 2.18.13
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set version_u [string map {. _} ${version}]
github.setup qgis QGIS ${version_u} final-
categories gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +101,7 @@ variant qt5 conflicts qt4 description "Build with Qt5 and Python 3" {
</span>
depends_lib-append port:python36 \
port:py36-pyqt5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-qscintilla2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-qscintilla-qt5 \
</span> port:qt5-qtwebkit \
port:qt5-qtscript \
port:qt5-sqlite-plugin \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,7 +151,7 @@ variant qt4 conflicts qt5 description "Build with Qt4 and Python 2.7" {
</span> depends_lib-append port:python27 \
port:py27-pyqt4 \
port:py27-gdal \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-qscintilla \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-qscintilla-qt4 \
</span> port:qt4-mac-sqlite3-plugin \
port:qca \
port:qca-ossl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/Portfile b/math/octave-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c62fb43..5d990ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ set version_tip 4.2.0-rc4
</span>
if { ${name} eq ${subport} } {
version ${version_tip}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> hg.tag e078f5607762
# see http://savannah.gnu.org/bugs/?48773
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ if { ${name} eq ${subport} } {
</span>
subport octave-devel-rc {
version ${version_rc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span> hg.tag 69ac19073ae6
if {${version_rc} eq ${version_release}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ subport octave-devel-rc {
</span>
subport octave-devel-release {
version ${version_release}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span> hg.tag 00f7b278defd
if {${version_release} eq ${version_rc}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -417,7 +417,7 @@ variant java description {enable Java interface} {
</span> variant qt4 conflicts qt5 description {build the GUI using Qt4} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qscintilla-qt4
</span>
if { ${subport} eq "octave-devel-release" } {
configure.args-replace --disable-gui --enable-gui
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,7 +430,7 @@ if { ${subport} ne "octave-devel-release" } {
</span> variant qt5 conflicts qt4 description {build the GUI using Qt5} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qscintilla-qt5
</span>
# see http://savannah.gnu.org/bugs/?41027
patchfiles-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce2b215..2882868 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ compiler.blacklist-append {*gcc-4.6} {clang < 700}
</span>
name octave
version 4.2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 12
</span> categories math science
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -356,7 +356,7 @@ variant java description {enable Java interface} {
</span> variant qt4 conflicts qt5 description {build the GUI using Qt4} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qscintilla-qt4
</span>
configure.args-replace --without-qt --with-qt=4
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -364,7 +364,7 @@ variant qt4 conflicts qt5 description {build the GUI using Qt4} {
</span> variant qt5 conflicts qt4 description {build the GUI using Qt5} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qscintilla-qt5
</span>
# see https://savannah.gnu.org/bugs/?46723
# see https://savannah.gnu.org/bugs/?49053
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt4/Portfile b/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 90cb520..47a6113 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +18,7 @@ long_description \
</span> homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro
version 4.12.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
set patch [lindex [split ${version} .] 2]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +137,7 @@ if {${name} ne ${subport}} {
</span> configure.args-delete --no-qsci-api
configure.args-append --qsci-api \
--qsci-api-destdir=${qt_data_dir}/qsci
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qscintilla-qt4
</span>
post-destroot {
# move the Qsci API file to a Python specific name
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/Portfile b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05ec713..6169f5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup python 1.0
</span>
name py-pyqt5
version 5.9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append devel
platforms darwin
maintainers {mmoll @mamoll} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +67,7 @@ if {${name} ne ${subport}} {
</span>
variant scintilla description {Build the PyQt API for QScintilla} {
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qscintilla2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-qt5
</span> configure.args-replace \
--no-qsci-api \
--qsci-api
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qscintilla/Portfile b/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 246ded4..ad9fc5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,96 +3,20 @@
</span> PortSystem 1.0
name py-qscintilla
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE: The version of these python bindings must match that of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# installed devel/qscintilla port, or configure/building will fail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# with strange error messages.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> version 2.10.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5dbddfdaf826e95251589a41696d5786b497e86f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories python devel
license GPL-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {michaelld @michaelld} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Python bindings for QScintilla
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.riverbankcomputing.com/software/qscintilla/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Python bindings for QScintilla, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a port to Qt of Neil Hodgson's Scintilla C++ editor control.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir qscintilla
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname QScintilla_gpl-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:pyqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by py-qscintilla-qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
set python_versions {27 34 35 36}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> foreach pver ${python_versions} {
subport py${pver}-qscintilla {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${worksrcdir}/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qscintilla \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${pver} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${pver}-sip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${pver}-pyqt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # allow configure.py to respect --spec=... argument
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cache [open "${configure.dir}/.qmake.cache" w 0644]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cache} "CONFIG += ${qt_arch_types}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${cache}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_ver_dot [join [split ${pver} ""] "."]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python${python_ver_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --prefix is not recognized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd ${configure.python} configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --pyqt=PyQt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sip=${prefix}/bin/sip-${python_ver_dot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qmake=${qt_qmake_cmd} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --pyqt-sipdir=${prefix}/share/py${pver}-sip/PyQt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --spec=${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --disable-dependency-tracking is not recognized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2.api \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2-Python${python_ver_dot}.api
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by py${pver}-qscintilla-qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fetch {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksum {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:py27-qscintilla
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${name}/README"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}download
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex >QScintilla-gpl\[_-\]\(\[0-9.\]+\)${extract.suffix}<
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/Portfile b/science/openscad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7c5fb2..720950a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openscad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup qmake 1.0
</span>
name openscad
version 2015.03-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> license GPL-2
categories science cad
maintainers dstrubbe openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ depends_lib-append port:boost \
</span> port:gmp \
port:mpfr \
port:OpenCSG \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qscintilla \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-qt4 \
</span> port:freetype \
port:fontconfig \
port:harfbuzz
</pre><pre style='margin:0'>
</pre>