<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/6d74310f65d4d5ea2e4c25f063cdf9b6be5931e8">https://github.com/macports/macports-ports/commit/6d74310f65d4d5ea2e4c25f063cdf9b6be5931e8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6d74310f65d4d5ea2e4c25f063cdf9b6be5931e8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 4 04:05:26 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-qscintilla: do not use python PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Portfile overrides most of the settings.
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since final build will be the same.
</span>---
python/py-qscintilla/Portfile | 50 ++++++++++++++++++++++++++-----------------
1 file changed, 30 insertions(+), 20 deletions(-)
<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 46b5bc7..17bb647 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;'>@@ -1,8 +1,6 @@
</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 qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span>
name py-qscintilla
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,35 +26,39 @@ dist_subdir qscintilla
</span> distname QScintilla_gpl-${version}
master_sites sourceforge:pyqt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 34 35 36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</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:#ffe0e0;'>-if {${name} ne ${subport}} {
</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}-qscintilla {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/Python
</span>
depends_lib-append port:qscintilla \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt4
</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}-pyqt4
</span>
# allow configure.py to respect --spec=... argument
patchfiles-append patch-configure.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-configure {
set cache [open "${configure.dir}/.qmake.cache" w 0644]
puts ${cache} "CONFIG += ${qt_arch_types}"
close ${cache}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_ver_dot [join [split ${python.version} ""] "."]
</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>
configure.pre_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.dir ${worksrcpath}/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd ${python.bin} configure.py
</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> configure.args-append \
--pyqt=PyQt4 \
--sip=${prefix}/bin/sip-${python_ver_dot} \
--qmake=${qt_qmake_cmd} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --pyqt-sipdir=${prefix}/share/py${python.version}-sip/PyQt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pyqt-sipdir=${prefix}/share/py${pver}-sip/PyQt4 \
</span> --apidir=${qt_data_dir}/qsci
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,19 +67,27 @@ if {${name} ne ${subport}} {
</span> # --disable-dependency-tracking is not recognized.
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${worksrcpath}/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.dir ${worksrcpath}/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd ${build.cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
move ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2.api \
${destroot}${qt_data_dir}/qsci/api/python/QScintilla2-Python${python_ver_dot}.api
}
}
<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;'>+if {${subport} eq ${name}} {
</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
</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/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${name}/README"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type regex
livecheck.url ${homepage}download
</pre><pre style='margin:0'>
</pre>