[48969] trunk/dports/lang
raimue at macports.org
raimue at macports.org
Tue Mar 31 20:57:09 PDT 2009
Revision: 48969
http://trac.macports.org/changeset/48969
Author: raimue at macports.org
Date: 2009-03-31 20:57:08 -0700 (Tue, 31 Mar 2009)
Log Message:
-----------
lang/python{24,25,26,30}:
Use new PortGroup select. This also handles ${frameworks_dir} correctly if it
is not the default. Revision bump required due to changed files.
Modified Paths:
--------------
trunk/dports/lang/python24/Portfile
trunk/dports/lang/python24/files/python24
trunk/dports/lang/python25/Portfile
trunk/dports/lang/python25/files/python25
trunk/dports/lang/python26/Portfile
trunk/dports/lang/python26/files/python26
trunk/dports/lang/python30/Portfile
trunk/dports/lang/python30/files/python30
Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile 2009-04-01 03:47:35 UTC (rev 48968)
+++ trunk/dports/lang/python24/Portfile 2009-04-01 03:57:08 UTC (rev 48969)
@@ -1,10 +1,11 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name python24
version 2.4.6
-revision 2
+revision 3
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -75,6 +76,9 @@
destroot.target frameworkinstall maninstall
+select.group python
+select.file ${filespath}/python[string map {. {}} ${branch}]
+
platform macosx {
post-destroot {
set framewpath ${frameworks_dir}/Python.framework
@@ -107,10 +111,6 @@
file delete ${destroot}${framewpath}/${dir}
}
- # install select file for python_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
- xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
-
# Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
# (this becomes Python.framework/Versions/2.4/Python) which doesn't
Modified: trunk/dports/lang/python24/files/python24
===================================================================
--- trunk/dports/lang/python24/files/python24 2009-04-01 03:47:35 UTC (rev 48968)
+++ trunk/dports/lang/python24/files/python24 2009-04-01 03:57:08 UTC (rev 48969)
@@ -6,7 +6,7 @@
bin/smtpd2.4.py
-
share/man/man1/python2.4.1.gz
-Library/Frameworks/Python.framework/Versions/2.4
-Library/Frameworks/Python.framework/Versions/2.4/Headers
-Library/Frameworks/Python.framework/Versions/2.4/Resources
-Library/Frameworks/Python.framework/Versions/2.4/Python
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.4
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.4/Headers
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.4/Resources
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.4/Python
Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile 2009-04-01 03:47:35 UTC (rev 48968)
+++ trunk/dports/lang/python25/Portfile 2009-04-01 03:57:08 UTC (rev 48969)
@@ -1,9 +1,11 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name python25
version 2.5.4
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
platforms darwin
@@ -70,6 +72,9 @@
build.args-append MAKE="${build.cmd} CC=${configure.cc}"
destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
+select.group python
+select.file ${filespath}/python[string map {. {}} ${branch}]
+
platform macosx {
post-destroot {
set framewpath ${frameworks_dir}/Python.framework
@@ -96,10 +101,6 @@
foreach dir { Headers Resources Python Versions/Current } {
file delete ${destroot}${framewpath}/${dir}
}
-
- # install select file for python_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
- xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
}
}
Modified: trunk/dports/lang/python25/files/python25
===================================================================
--- trunk/dports/lang/python25/files/python25 2009-04-01 03:47:35 UTC (rev 48968)
+++ trunk/dports/lang/python25/files/python25 2009-04-01 03:57:08 UTC (rev 48969)
@@ -6,7 +6,7 @@
bin/smtpd2.5.py
-
share/man/man1/python2.5.1.gz
-Library/Frameworks/Python.framework/Versions/2.5
-Library/Frameworks/Python.framework/Versions/2.5/Headers
-Library/Frameworks/Python.framework/Versions/2.5/Resources
-Library/Frameworks/Python.framework/Versions/2.5/Python
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.5
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.5/Headers
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.5/Resources
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.5/Python
Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile 2009-04-01 03:47:35 UTC (rev 48968)
+++ trunk/dports/lang/python26/Portfile 2009-04-01 03:57:08 UTC (rev 48969)
@@ -1,10 +1,11 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name python26
version 2.6.1
-revision 1
+revision 2
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -69,6 +70,9 @@
build.args-append MAKE="${build.cmd} CC=${configure.cc}"
destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
+select.group python
+select.file ${filespath}/python[string map {. {}} ${branch}]
+
post-destroot {
set framewpath ${frameworks_dir}/Python.framework
set framewdir ${framewpath}/Versions/${branch}
@@ -79,10 +83,6 @@
ln -s ${framewdir}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
- # install select file for python_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
- xinstall -m 644 ${filespath}/${name} ${destroot}${prefix}/etc/select/python/
-
# Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
# (this becomes Python.framework/Versions/2.6/Python) which doesn't
Modified: trunk/dports/lang/python26/files/python26
===================================================================
--- trunk/dports/lang/python26/files/python26 2009-04-01 03:47:35 UTC (rev 48968)
+++ trunk/dports/lang/python26/files/python26 2009-04-01 03:57:08 UTC (rev 48969)
@@ -6,7 +6,7 @@
bin/smtpd2.6.py
-
share/man/man1/python2.6.1.gz
-Library/Frameworks/Python.framework/Versions/2.6
-Library/Frameworks/Python.framework/Versions/2.6/Headers
-Library/Frameworks/Python.framework/Versions/2.6/Resources
-Library/Frameworks/Python.framework/Versions/2.6/Python
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Headers
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Resources
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Python
Modified: trunk/dports/lang/python30/Portfile
===================================================================
--- trunk/dports/lang/python30/Portfile 2009-04-01 03:47:35 UTC (rev 48968)
+++ trunk/dports/lang/python30/Portfile 2009-04-01 03:57:08 UTC (rev 48969)
@@ -1,10 +1,11 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name python30
version 3.0.1
-revision 1
+revision 2
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -71,6 +72,9 @@
build.args-append MAKE="${build.cmd} CC=${configure.cc}"
destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
+select.group python
+select.file ${filespath}/python[string map {. {}} ${branch}]
+
post-destroot {
set framewpath ${frameworks_dir}/Python.framework
set framewdir ${framewpath}/Versions/${branch}
@@ -81,10 +85,6 @@
ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
- # install select file for python_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
- xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
-
# Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
# (this becomes Python.framework/Versions/3.0/Python) which doesn't
Modified: trunk/dports/lang/python30/files/python30
===================================================================
--- trunk/dports/lang/python30/files/python30 2009-04-01 03:47:35 UTC (rev 48968)
+++ trunk/dports/lang/python30/files/python30 2009-04-01 03:57:08 UTC (rev 48969)
@@ -6,7 +6,7 @@
bin/smtpd3.0.py
-
share/man/man1/python3.0.1.gz
-Library/Frameworks/Python.framework/Versions/3.0
-Library/Frameworks/Python.framework/Versions/3.0/Headers
-Library/Frameworks/Python.framework/Versions/3.0/Resources
-Library/Frameworks/Python.framework/Versions/3.0/Python
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/3.0
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/3.0/Headers
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/3.0/Resources
+${frameworks_dir}/Library/Frameworks/Python.framework/Versions/3.0/Python
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090331/357c99db/attachment-0001.html>
More information about the macports-changes
mailing list