<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/30bcbf1b88e2f18ad6896fe2273e185292879082">https://github.com/macports/macports-ports/commit/30bcbf1b88e2f18ad6896fe2273e185292879082</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 30bcbf1b88e2f18ad6896fe2273e185292879082
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sun Mar 28 16:56:28 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> py27-wxpython-2.8: delete port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/46351
</span>---
python/py-wxpython-2.8/Portfile | 115 ----------------------
python/py-wxpython-2.8/files/patch-config.py.diff | 74 --------------
python/py-wxpython-3.0/Portfile | 4 +-
python/py-wxpython-4.0/Portfile | 2 +-
4 files changed, 2 insertions(+), 193 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-2.8/Portfile b/python/py-wxpython-2.8/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 52f21eb46da..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-2.8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,115 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=2:ts=2:sts=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name py-wxpython-2.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.12.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories-append graphics devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license wxwidgets-3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mojca @mojca} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Python interface to the wxWidgets ${branch} cross platform GUI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description wxPython is a GUI toolkit for the Python programming \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- language. It allows Python programmers to create \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- programs with a robust, highly functional graphical \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user interface, simply and easily. It is implemented \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as a Python extension module (native code) that wraps \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the wxWidgets cross platform GUI library, written in C++. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version 2.8 is provided for compatibility reasons only. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- See description of wxWidgets-2.8 for further details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.wxpython.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:wxpython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname wxPython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 94eae06087bdd930e21bf90cc6672f93a1f5a17a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${distname}-src-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${distname}/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${distname}-src-${version}/wxPython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# extract just the docs and wxPython subdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.post_args "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-wxpython-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-numeric
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-config.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant carbon conflicts gtk description {use 32-bit carbon-based wxWidgets} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxWidgets-2.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: the following line would end up with --no-user-cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #build.args WX_CONFIG="${wxWidgets.wxconfig}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ${python.bin} setup.py WXPORT="mac" WX_CONFIG="${wxWidgets.wxconfig}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd ${python.bin} setup.py WXPORT="mac" WX_CONFIG="${wxWidgets.wxconfig}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: test if this works on 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|# @@FLAGS1@@|cflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|# @@FLAGS2@@|lflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${wxWidgets.sdk} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|# @@FLAGS3@@|cflags.extend(\[\"-isysroot\", \"${wxWidgets.sdk}\"\])|" ${worksrcpath}/config.py
</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;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${wxWidgets.prefix}
</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;'>- variant gtk conflicts carbon description {use wxGTK} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxGTK-2.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not sure if/what other dependencies should be listed here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ${python.bin} setup.py WXPORT="gtk2" WX_CONFIG="${wxWidgets.wxconfig}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd ${python.bin} setup.py WXPORT="gtk2" WX_CONFIG="${wxWidgets.wxconfig}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|# @@FLAGS1@@|cflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|# @@FLAGS2@@|lflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
</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;'>- delete ${destroot}${wxWidgets.prefix}
</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;'>- if {![variant_isset carbon] && ![variant_isset gtk]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gtk will be the default variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using +carbon is possible on <= 10.6 (or 10.7 with an old Xcode version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +gtk
</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 none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Once upon a time this would install the documentation,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # however the python PortGroup disables all steps including fetching & extracting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which makes it a bit inconvenient to do things like this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If anyone is missing the docs badly enough, you are welcome to fix this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in both py-wxpython-2.8 and py-wxpython-3.0.
</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;'>- # xinstall -d -m 755 ${destroot}${prefix}/share/doc/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file copy ${worksrcpath}/samples ${destroot}${prefix}/share/doc/${name}/examples
</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.url https://api.github.com/repos/wxWidgets/wxPython/tags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex tarball/wxPy-(2\\.8\\.\[^"\]+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-2.8/files/patch-config.py.diff b/python/py-wxpython-2.8/files/patch-config.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 95a54c34fb4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-2.8/files/patch-config.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,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-first two patches: http://trac.wxwidgets.org/ticket/15462
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the rest is to make gtk work and for proper handling of arch & sdk flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -722,6 +722,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build, without a way to remove an architecture. Furthermore GCC will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- barf if multiple '-isysroot' arguments are present.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from distutils import log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stripArch = stripSysroot = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler_so = list(compiler_so)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -765,9 +766,9 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sysroot = compiler_so[idx+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sysroot and not os.path.isdir(sysroot):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- log.warn("Compiling with an SDK that doesn't seem to exist: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.warning("Compiling with an SDK that doesn't seem to exist: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sysroot)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- log.warn("Please check your Xcode installation")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.warning("Please check your Xcode installation")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return compiler_so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1024,27 +1025,16 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WXRELEASE = os.popen(WX_CONFIG + ' --release').read()[:-1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WXPREFIX = os.popen(WX_CONFIG + ' --prefix').read()[:-1]
</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;'>-- if sys.platform[:6] == "darwin" and WXPORT == 'mac':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if sys.platform[:6] == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libs = ['stdc++']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_SCRIPTS = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # @@FLAGS1@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # @@FLAGS2@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # @@FLAGS3@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if WXPORT == 'mac':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Flags and such for a Darwin (Max OS X) build of Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WXPLAT = '__WXMAC__'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GENDIR = 'mac'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libs = ['stdc++']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NO_SCRIPTS = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if not ARCH == "":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cflags.append("-arch")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cflags.append(ARCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lflags.append("-arch")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lflags.append(ARCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if ARCH == "ppc":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # cflags.append("-isysroot")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # cflags.append("/Developer/SDKs/MacOSX10.3.9.sdk")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if not os.environ.get('CC') or not os.environ.get('CXX'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.environ["CXX"] = "g++-4.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.environ["CC"] = "gcc-4.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.environ["CPP"] = "cpp-4.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set flags for other Unix type platforms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GENDIR = WXPORT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1070,14 +1060,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags += portcfg.split()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # wx-config doesn't output that for some reason. For now, just
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # add it unconditionally but we should really check if the lib is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # really found there or wx-config should be fixed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if WXPORT != 'msw':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libdirs.append("/usr/X11R6/lib")
</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;'>- # Move the various -I, -D, etc. flags we got from the *config scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # into the distutils lists.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = adjustCFLAGS(cflags, defines, includes)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-3.0/Portfile b/python/py-wxpython-3.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 413b5a10328..c8ccd28e0cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wxpython-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,6 @@ dist_subdir wxWidgets/${wx_version}
</span> extract.post_args "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-wxpython-2.8
</span> # As long as wxPython and wxWidgets are at the same version,
# this port could also depend on wxWidgets-3.0.
# A separate port is there just because wxPython usually lags behind.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,8 +68,7 @@ if {${name} ne ${subport}} {
</span> # Once upon a time this would install the documentation,
# however the python PortGroup disables all steps including fetching & extracting
# which makes it a bit inconvenient to do things like this.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If anyone is missing the docs badly enough, you are welcome to fix this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in both py-wxpython-2.8 and py-wxpython-3.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If anyone is missing the docs badly enough, you are welcome to fix this.
</span> #
# post-destroot {
# xinstall -d -m 755 ${destroot}${prefix}/share/doc/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/Portfile b/python/py-wxpython-4.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2e76c35933..0b583272fc1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-4.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wxpython-4.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ python.versions 27 35 36 37 38 39
</span>
if {${name} ne ${subport}} {
if {${python.version} == 27} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-wxpython-2.8 py${python.version}-wxpython-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-wxpython-3.0
</span> }
# wxPython uses internal wxwidgets source code
</pre><pre style='margin:0'>
</pre>