[78352] trunk/dports/lang
ryandesign at macports.org
ryandesign at macports.org
Wed May 4 02:05:15 PDT 2011
Revision: 78352
http://trac.macports.org/changeset/78352
Author: ryandesign at macports.org
Date: 2011-05-04 02:05:13 -0700 (Wed, 04 May 2011)
Log Message:
-----------
python ports: remove -arch flags from config in a way that does not leave the config syntactically invalid
python27: fix manpage symlink
Modified Paths:
--------------
trunk/dports/lang/python26/Portfile
trunk/dports/lang/python27/Portfile
trunk/dports/lang/python31/Portfile
trunk/dports/lang/python32/Portfile
Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile 2011-05-04 07:30:32 UTC (rev 78351)
+++ trunk/dports/lang/python26/Portfile 2011-05-04 09:05:13 UTC (rev 78352)
@@ -5,7 +5,7 @@
name python26
version 2.6.6
-revision 1
+revision 2
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -127,7 +127,7 @@
}
# remove -arch flags from the config
- reinplace -E {s|-arch [^[:space:]]+||g} \
+ reinplace -E {s|-arch [a-z0-9_]+||g} \
${destroot}${framewdir}/lib/python${branch}/config/Makefile
}
Modified: trunk/dports/lang/python27/Portfile
===================================================================
--- trunk/dports/lang/python27/Portfile 2011-05-04 07:30:32 UTC (rev 78351)
+++ trunk/dports/lang/python27/Portfile 2011-05-04 09:05:13 UTC (rev 78352)
@@ -7,7 +7,7 @@
name python27
epoch 2
version 2.7.1
-revision 1
+revision 2
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -116,7 +116,7 @@
file delete ${destroot}${framewpath}/${dir}
}
- ln -s ${framewdir}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
+ ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
# ln -s ${framewdir}/bin/2to3 ${destroot}${prefix}/bin/2to3-${branch}
@@ -134,7 +134,7 @@
}
# remove -arch flags from the config
- reinplace -E {s|-arch [^[:space:]]+||g} \
+ reinplace -E {s|-arch [a-z0-9_]+||g} \
${destroot}${framewdir}/lib/python${branch}/config/Makefile
}
Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile 2011-05-04 07:30:32 UTC (rev 78351)
+++ trunk/dports/lang/python31/Portfile 2011-05-04 09:05:13 UTC (rev 78352)
@@ -6,6 +6,7 @@
name python31
epoch 1
version 3.1.3
+revision 1
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -110,7 +111,7 @@
${destroot}${framewdir}/Resources/version.plist
# remove -arch flags from the config
- reinplace -E {s|-arch [^[:space:]]+||g} \
+ reinplace -E {s|-arch [a-z0-9_]+||g} \
${destroot}${framewdir}/lib/python${branch}/config/Makefile
}
Modified: trunk/dports/lang/python32/Portfile
===================================================================
--- trunk/dports/lang/python32/Portfile 2011-05-04 07:30:32 UTC (rev 78351)
+++ trunk/dports/lang/python32/Portfile 2011-05-04 09:05:13 UTC (rev 78352)
@@ -4,8 +4,9 @@
PortGroup select 1.0
name python32
+epoch 20110220
version 3.2
-epoch 20110220
+revision 1
set major [lindex [split $version .] 0]
#set branch [join [lrange [split ${version} .] 0 1] .]
@@ -116,7 +117,7 @@
${destroot}${framewdir}/Resources/version.plist
# remove -arch flags from the config
- reinplace -E {s|-arch [^[:space:]]+||g} \
+ reinplace -E {s|-arch [a-z0-9_]+||g} \
${destroot}${framewdir}/lib/python${branch}/config-${branch}m/Makefile
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110504/66c0f479/attachment.html>
More information about the macports-changes
mailing list