[34807] branches/python-frameworks/dports/lang/python25

[raimue at macports.org]

Revision: 34807
          http://trac.macosforge.org/projects/macports/changeset/34807
Author:   raimue at macports.org
Date:     2008-03-06 09:20:38 -0800 (Thu, 06 Mar 2008)

Log Message:
-----------
lang/python25:
Committing what we got so far from #11267

Modified Paths:
--------------
    branches/python-frameworks/dports/lang/python25/Portfile
    branches/python-frameworks/dports/lang/python25/files/python25

Modified: branches/python-frameworks/dports/lang/python25/Portfile
===================================================================
--- branches/python-frameworks/dports/lang/python25/Portfile	2008-03-06 17:18:21 UTC (rev 34806)
+++ branches/python-frameworks/dports/lang/python25/Portfile	2008-03-06 17:20:38 UTC (rev 34807)
@@ -4,7 +4,7 @@
 
 name			python25
 version			2.5.2
-revision		1
+revision		2
 categories		lang
 platforms		darwin
 maintainers		mww
@@ -28,45 +28,67 @@
 
 depends_lib     port:gettext
 
-patchfiles      patch-configure.diff \
-                patch-Makefile.pre.in.diff \
-                patch-Misc-setuid-prog.c.diff \
-                patch-Modules-posixmodule.c.diff \
+patchfiles      patch-Makefile.pre.in.diff \
                 patch-setup.py.diff \
-                patch-Lib-cgi.py.diff
+		patch-Lib-cgi.py.diff
 
 configure.args	--enable-shared \
-			--mandir=${prefix}/share/man \
-			--disable-framework
+			--enable-framework=${prefix}/Library/Frameworks \
+			--without-readline \
+			--enable-ipv6
 
 post-patch {
-    reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
+	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
+	reinplace "s|/Applications/MacPython|/Applications/MacPorts/MacPython|g" \
+		Mac/Makefile.in Mac/IDLE/Makefile.in \
+		Mac/IDLE/Makefile.in Mac/Tools/Doc/setup.py \
+		Mac/PythonLauncher/Makefile.in \
+		Mac/BuildScript/build-installer.py
 }
 
 test.run	   yes
 test.target	   test
 
-destroot.target altinstall \
-                maninstall
+destroot.target libpython2.5.dylib frameworkinstall maninstall
 
 post-destroot {
-    set branche [join [lrange [split ${version} .] 0 1] .]
+	system "cd ${destroot}${prefix}/bin && \
+		rm idle python pythonw pydoc python-config smtpd.py"
+	system "cd ${destroot}${prefix}/share/man/man1 && \
+		ln -sf ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/share/man/man1/python.1 python2.5.1"
 
-    foreach bin {idle pydoc smtpd.py} {
-        move ${destroot}${prefix}/bin/${bin} \
-            ${destroot}${prefix}/bin/${bin}${branche}
-    }
-    move ${destroot}${prefix}/share/man/man1/python.1 \
-        ${destroot}${prefix}/share/man/man1/python${branche}.1
+	system "cd ${destroot}${prefix}/Library/Frameworks/Python.framework && \
+		rm -f Headers Resources Python && \
+		rm -f Versions/Current"
+	xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
+	xinstall -m 644 ${filespath}/python25 ${destroot}${prefix}/etc/select/python/
+	system "mkdir -p ${destroot}${prefix}/include && \
+		cd ${destroot}${prefix}/include && \
+		ln -sf ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5"
 
-    # install select file for python_select
-    xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
-    xinstall -m 644 ${filespath}/python25 ${destroot}${prefix}/etc/select/python/
+	system "cd ${destroot}${prefix}/lib && \
+		ln -sf ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/lib/libpython2.5.dylib && \
+		ln -sf ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5"
+
+	system "cd ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.5/share/man/man1/ && \
+		gzip python.1"
+
 }
 
+post-activate {
+ui_msg "\n\n\nTo fully complete your installation and make python 2.5 the\ndefault, please run\n\nsudo python_select python25\n\n"
+}
+
 platform darwin 7 {
 	# there is no SystemStubs on 10.3
-	post-patch { reinplace "s|-lSystemStubs||g" ${worksrcpath}/Makefile.pre.in }
+	post-patch { 
+		reinplace "s|-lSystemStubs||g" \
+			configure configure.in
+	}
+	post-configure {
+		reinplace "s|-lSystemStubs||g" \
+			Makefile.pre.in Makefile.pre Makefile
+	}
 	# To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth at gmail.com, ticket #13322)
 	configure.ldflags-append "-lcc_dynamic"
 }
@@ -93,4 +115,3 @@
 livecheck.check	regex
 livecheck.url   ${homepage}download/releases/
 livecheck.regex {Python (2\.5(?:\.\d+)*)}
-

Modified: branches/python-frameworks/dports/lang/python25/files/python25
===================================================================
--- branches/python-frameworks/dports/lang/python25/files/python25	2008-03-06 17:18:21 UTC (rev 34806)
+++ branches/python-frameworks/dports/lang/python25/files/python25	2008-03-06 17:20:38 UTC (rev 34807)
@@ -1,12 +1,12 @@
 bin/python2.5
--
+bin/pythonw2.5
 bin/python-config2.5
 bin/idle2.5
 bin/pydoc2.5
 bin/smtpd2.5.py
 -
 share/man/man1/python2.5.1.gz
--
--
--
--
+Library/Frameworks/Python.framework/Versions/2.5
+Library/Frameworks/Python.framework/Versions/Versions/2.5/Headers
+Library/Frameworks/Python.framework/Versions/Versions/2.5/Resources
+Library/Frameworks/Python.framework/Versions/Versions/2.5/Python

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080306/47e8947a/attachment.html