[78692] trunk/dports
jmr at macports.org
jmr at macports.org
Wed May 18 04:55:17 PDT 2011
Revision: 78692
http://trac.macports.org/changeset/78692
Author: jmr at macports.org
Date: 2011-05-18 04:55:15 -0700 (Wed, 18 May 2011)
Log Message:
-----------
move python25's tkinter module back into py25-tkinter (#24595) and adjust dependents accordingly
Modified Paths:
--------------
trunk/dports/lang/python25/Portfile
trunk/dports/python/py25-matplotlib/Portfile
trunk/dports/python/py25-opengl/Portfile
trunk/dports/python/py25-pmw/Portfile
trunk/dports/python/py25-tkinter/Portfile
trunk/dports/science/bkchem/Portfile
Added Paths:
-----------
trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff
Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile 2011-05-18 11:02:50 UTC (rev 78691)
+++ trunk/dports/lang/python25/Portfile 2011-05-18 11:55:15 UTC (rev 78692)
@@ -5,7 +5,7 @@
name python25
version 2.5.5
-revision 4
+revision 5
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -33,9 +33,10 @@
patch-Lib-distutils-dist.py.diff \
patch-setup.py.diff \
patch-configure.diff \
- patch-64bit.diff
+ patch-64bit.diff \
+ patch-setup_no_tkinter.py.diff
-depends_lib port:gettext port:zlib port:openssl port:tk \
+depends_lib port:gettext port:zlib port:openssl \
port:sqlite3 port:db46 port:bzip2 \
port:gdbm port:readline port:ncurses
depends_run port:python_select
Added: trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff (rev 0)
+++ trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff 2011-05-18 11:55:15 UTC (rev 78692)
@@ -0,0 +1,11 @@
+--- setup.py.orig 2009-03-31 12:20:48.000000000 -0600
++++ setup.py 2009-09-17 00:33:12.000000000 -0600
+@@ -17,7 +17,7 @@
+ from distutils.command.install_lib import install_lib
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_tkinter"]
+
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (at the front) if
Modified: trunk/dports/python/py25-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py25-matplotlib/Portfile 2011-05-18 11:02:50 UTC (rev 78691)
+++ trunk/dports/python/py25-matplotlib/Portfile 2011-05-18 11:55:15 UTC (rev 78692)
@@ -79,6 +79,7 @@
}
variant tkinter description "Enable tkAgg backend" {
+ depends_lib-append port:py25-tkinter
post-patch {
reinplace "s|^tkagg=False|tkagg=True|" ${worksrcpath}/setup.cfg
}
Modified: trunk/dports/python/py25-opengl/Portfile
===================================================================
--- trunk/dports/python/py25-opengl/Portfile 2011-05-18 11:02:50 UTC (rev 78691)
+++ trunk/dports/python/py25-opengl/Portfile 2011-05-18 11:55:15 UTC (rev 78692)
@@ -26,7 +26,7 @@
rmd160 2793dc5e13364d56fe6714ea28dc8a94ff174eae
depends_build-append port:py25-distribute
-depends_lib-append port:py25-pil port:py25-numpy
+depends_lib-append port:py25-pil port:py25-numpy port:py25-tkinter
test.run yes
Modified: trunk/dports/python/py25-pmw/Portfile
===================================================================
--- trunk/dports/python/py25-pmw/Portfile 2011-05-18 11:02:50 UTC (rev 78691)
+++ trunk/dports/python/py25-pmw/Portfile 2011-05-18 11:55:15 UTC (rev 78692)
@@ -23,6 +23,8 @@
worksrcdir ${distname}/src
+depends_lib-append port:py25-tkinter
+
livecheck.type regex
livecheck.url http://sourceforge.net/projects/pmw/files/
livecheck.regex Pmw.(\[0-9.\]\\.\[0-9.\]\\.\[0-9.\]).tar.gz
Modified: trunk/dports/python/py25-tkinter/Portfile
===================================================================
--- trunk/dports/python/py25-tkinter/Portfile 2011-05-18 11:02:50 UTC (rev 78691)
+++ trunk/dports/python/py25-tkinter/Portfile 2011-05-18 11:55:15 UTC (rev 78692)
@@ -4,22 +4,37 @@
PortGroup python25 1.0
name py25-tkinter
-version 2.5.4
-revision 1
+version 2.5.5
categories python graphics
platforms darwin
-maintainers nomaintainer
-description This is a stub. tkinter is now built with python25
+maintainers jwa openmaintainer
+description Python 2.5 bindings to the Tk widget set
long_description ${description}
-homepage http://www.python.org/doc/current/lib/module-Tkinter.html
+homepage http://docs.python.org/release/2.5.4/lib/module-Tkinter.html
+master_sites http://www.python.org/ftp/python/${version}/
+dist_subdir python25
+distname Python-${version}
+use_bzip2 yes
+checksums md5 1d00e2fb19418e486c30b850df625aa3 \
+ sha1 dcf1abd94a1ab4155dcd3668cca42c5bfc81159f \
+ rmd160 4754238d415142466778560d989582464385654c
-build { }
-distfiles
+depends_lib-append port:tk
-destroot {
- xinstall -d ${destroot}${prefix}/share/doc/${name}
- system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
+worksrcdir ${worksrcdir}/Modules
+
+extract.post_args "| tar -xf - ${distname}/Modules/_tkinter.c \
+ ${distname}/Modules/tkappinit.c"
+post-extract {
+ file copy ${filespath}/setup.py ${worksrcpath}
}
-livecheck.type none
+configure {
+ reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
+ reinplace "s|__TK-VERSION__|8.5|g" ${worksrcpath}/setup.py
+}
+
+livecheck.type regex
+livecheck.url http://www.python.org/download/releases/
+livecheck.regex Python (2.5.\[0-9\]+)
Modified: trunk/dports/science/bkchem/Portfile
===================================================================
--- trunk/dports/science/bkchem/Portfile 2011-05-18 11:02:50 UTC (rev 78691)
+++ trunk/dports/science/bkchem/Portfile 2011-05-18 11:55:15 UTC (rev 78692)
@@ -18,6 +18,7 @@
sha1 0a3ea20ef4aa1348553a0ae2eded2cfc01180f8e \
rmd160 3489f9c39171befa4d89df54667becef61f9657c
+depends_lib-append port:py25-tkinter
patchfiles patch-setup.py.diff
post-patch {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110518/61a50942/attachment-0001.html>
More information about the macports-changes
mailing list