[109959] users/mojca/wxports
mojca at macports.org
mojca at macports.org
Thu Aug 22 16:03:02 PDT 2013
Revision: 109959
https://trac.macports.org/changeset/109959
Author: mojca at macports.org
Date: 2013-08-22 16:03:02 -0700 (Thu, 22 Aug 2013)
Log Message:
-----------
mojca/wxWidgets: prevent a conflict between py2X-wxpython-2.8 and py2Y-wxpython-2.8 by installing common files in wxWidgets already
Modified Paths:
--------------
users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
users/mojca/wxports/python/py-wxpython-2.8/Portfile
Modified: users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/Portfile 2013-08-22 23:02:08 UTC (rev 109958)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/Portfile 2013-08-22 23:03:02 UTC (rev 109959)
@@ -14,6 +14,7 @@
conflicts_build wxgtk wxWidgets wxWidgets-python wxWidgets30 wxWidgets-devel
version 2.8.12
set branch [join [lrange [split ${version} .] 0 1] .]
+set wxpythonsubset wxPython-2.8.12.1-MacPorts-subset
categories graphics devel
platforms darwin
@@ -34,15 +35,24 @@
homepage http://www.wxwidgets.org/
distname wxWidgets
master_sites sourceforge:wxwindows \
- http://biolpc22.york.ac.uk/pub/${version}/
+ http://biolpc22.york.ac.uk/pub/${version}/ \
+ https://trac.macports.org/raw-attachment/ticket/19190/
+# TODO: the last location is just a temporary one
+# - looking for suggestion for a better name
+# - directory structure is not really needed, at least two top dirs could go
use_bzip2 yes
-distfiles ${distname}-${version}${extract.suffix}
+distfiles ${distname}-${version}${extract.suffix} \
+ ${wxpythonsubset}${extract.suffix}
dist_subdir ${distname}/${version}
-checksums rmd160 928e221abe1a00cd2d72d2a4fd3640ba639b9915 \
- sha256 3b0ac1d2d017683851841501c8e1b744b97242d684a1668ded61809b0504f707
+checksums ${distname}-${version}${extract.suffix} \
+ rmd160 928e221abe1a00cd2d72d2a4fd3640ba639b9915 \
+ sha256 3b0ac1d2d017683851841501c8e1b744b97242d684a1668ded61809b0504f707 \
+ ${wxpythonsubset}${extract.suffix} \
+ rmd160 6028e4fd3ebfa837545f4470f171b843f923e01e \
+ sha256 fb5dc3c417c7179c32fa0efc63e7df1ea31469b79ea189c39e7bcccecb54598b
subport wxgtk-2.8 {}
@@ -142,6 +152,11 @@
system -W ${build.dir} "make -C contrib/src/${c} install ${destroot.destdir}"
}
+ # copy a subset of wxPython to wxWidgets to prevent a later conflict
+ # between py2X-wxpython-2.8 and py2Y-wxpython-2.8
+ copy ${workpath}/${wxpythonsubset}/include/wx-2.8/wx/wxPython \
+ ${destroot}${wxWidgets.prefix}/include/wx-2.8/wx/
+
set destdocdir ${destroot}${wxWidgets.prefix}/share/doc/${distname}
xinstall -d -m 755 ${destdocdir}
xinstall -m 644 -W ${workpath}/${distname}-${version} \
Modified: users/mojca/wxports/python/py-wxpython-2.8/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-2.8/Portfile 2013-08-22 23:02:08 UTC (rev 109958)
+++ users/mojca/wxports/python/py-wxpython-2.8/Portfile 2013-08-22 23:03:02 UTC (rev 109959)
@@ -64,6 +64,9 @@
reinplace "s|# @@FLAGS3@@|cflags.extend(\[\"-isysroot\", \"${wxWidgets.sdk}\"\])|" ${worksrcpath}/config.py
}
}
+ post-destroot {
+ delete ${destroot}${wxWidgets.prefix}
+ }
}
variant gtk conflicts carbon description {use wxGTK} {
@@ -76,6 +79,9 @@
reinplace "s|# @@FLAGS1@@|cflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
reinplace "s|# @@FLAGS2@@|lflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
}
+ post-destroot {
+ delete ${destroot}${wxWidgets.prefix}
+ }
}
# TODO: think a bit more about it
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130822/350d8bb8/attachment.html>
More information about the macports-changes
mailing list