[40885] trunk/dports/lang/python26

blb at macports.org blb at macports.org
Thu Oct 16 23:38:48 PDT 2008 

Revision: 40885
          http://trac.macports.org/changeset/40885
Author:   blb at macports.org
Date:     2008-10-16 23:38:48 -0700 (Thu, 16 Oct 2008)
Log Message:
-----------
Fix framework and application installation locations to use
applications_dir and frameworks_dir (and define if not already, for
MacPorts 1.6 compatibility); ticket #16761
(patch 3 from #16765)

Modified Paths:
--------------
    trunk/dports/lang/python26/Portfile
    trunk/dports/lang/python26/files/patch-Lib-cgi.py.diff

Added Paths:
-----------
    trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff
    trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff
    trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff
    trunk/dports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff

Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile	2008-10-17 06:34:07 UTC (rev 40884)
+++ trunk/dports/lang/python26/Portfile	2008-10-17 06:38:48 UTC (rev 40885)
@@ -28,14 +28,26 @@
                         sha1    d7fd08304b66cb4020786a7ee5aa452235046ecd \
                         rmd160  b44d5cc7efa198b21f41e43e1d28af60875f0a4e
 
+# Can be removed once MacPorts 1.7.0 is released
+if {![info exists applications_dir]} {
+   set applications_dir /Applications/MacPorts
+}
+if {![info exists frameworks_dir]} {
+   set frameworks_dir ${prefix}/Library/Frameworks
+}
+
 patchfiles              patch-Makefile.pre.in.diff \
                         patch-setup.py.diff \
-                        patch-Lib-cgi.py.diff
+                        patch-Lib-cgi.py.diff \
+                        patch-Mac-IDLE-Makefile.in.diff \
+                        patch-Mac-Makefile.in.diff \
+                        patch-Mac-PythonLauncher-Makefile.in.diff \
+                        patch-Mac-Tools-Doc-setup.py.diff
 
 depends_lib             port:gettext
 
 configure.args          --enable-shared \
-                        --enable-framework=${prefix}/Library/Frameworks \
+                        --enable-framework=${frameworks_dir} \
                         --mandir=${prefix}/share/man \
                         --without-readline \
                         --disable-tk \
@@ -44,12 +56,11 @@
 use_parallel_build      no
 
 post-patch {
-   reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
-   reinplace "s|/Applications/MacPython|/Applications/MacPorts/MacPython|g" \
+   reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Lib/cgi.py
+   reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|g" \
       ${worksrcpath}/Mac/Makefile.in ${worksrcpath}/Mac/IDLE/Makefile.in \
       ${worksrcpath}/Mac/Tools/Doc/setup.py \
-      ${worksrcpath}/Mac/PythonLauncher/Makefile.in \
-      ${worksrcpath}/Mac/BuildScript/build-installer.py
+      ${worksrcpath}/Mac/PythonLauncher/Makefile.in
    reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \
       ${worksrcpath}/Mac/PythonLauncher/Makefile.in
 }
@@ -62,7 +73,7 @@
 destroot.target         frameworkinstall maninstall
 
 post-destroot {
-   set framewpath ${prefix}/Library/Frameworks/Python.framework
+   set framewpath ${frameworks_dir}/Python.framework
    set framewdir  ${framewpath}/Versions/${branch}
 
    foreach dir { lib include } {

Modified: trunk/dports/lang/python26/files/patch-Lib-cgi.py.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-Lib-cgi.py.diff	2008-10-17 06:34:07 UTC (rev 40884)
+++ trunk/dports/lang/python26/files/patch-Lib-cgi.py.diff	2008-10-17 06:38:48 UTC (rev 40885)
@@ -2,7 +2,7 @@
 +++ Lib/cgi.py	2007-08-21 15:36:54.000000000 +0200
 @@ -1,13 +1,6 @@
 -#! /usr/local/bin/python
-+#! __PREFIX__/bin/python2.6
++#! @@PREFIX@@/bin/python2.6
  
 -# NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
 -# intentionally NOT "/usr/bin/env python".  On many systems

Added: trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff	2008-10-17 06:38:48 UTC (rev 40885)
@@ -0,0 +1,11 @@
+--- Mac/IDLE/Makefile.in.orig	2008-07-17 23:48:03.000000000 -0600
++++ Mac/IDLE/Makefile.in	2008-10-04 19:50:50.000000000 -0600
+@@ -22,7 +22,7 @@
+ 
+ BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
+ 
+-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION)
+ 
+ all: IDLE.app
+ 

Added: trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff	2008-10-17 06:38:48 UTC (rev 40885)
@@ -0,0 +1,11 @@
+--- Mac/Makefile.in.orig	2008-07-22 01:06:33.000000000 -0600
++++ Mac/Makefile.in	2008-10-04 19:51:40.000000000 -0600
+@@ -18,7 +18,7 @@
+ 
+ # These are normally glimpsed from the previous set
+ bindir=$(prefix)/bin
+-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION)
+ APPINSTALLDIR=$(prefix)/Resources/Python.app
+ 
+ # Variables for installing the "normal" unix binaries

Added: trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff	2008-10-17 06:38:48 UTC (rev 40885)
@@ -0,0 +1,11 @@
+--- Mac/PythonLauncher/Makefile.in.orig	2008-05-02 13:58:56.000000000 -0600
++++ Mac/PythonLauncher/Makefile.in	2008-10-04 19:52:27.000000000 -0600
+@@ -21,7 +21,7 @@
+ 
+ BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
+ 
+-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION)
+ OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
+ 
+ all: Python\ Launcher.app

Added: trunk/dports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff	                        (rev 0)
+++ trunk/dports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff	2008-10-17 06:38:48 UTC (rev 40885)
@@ -0,0 +1,11 @@
+--- Mac/Tools/Doc/setup.py.diff	2008-03-29 09:24:25.000000000 -0600
++++ Mac/Tools/Doc/setup.py	2008-10-04 19:53:40.000000000 -0600
+@@ -30,7 +30,7 @@
+ 
+ MAJOR_VERSION='2.4'
+ MINOR_VERSION='2.4.1'
+-DESTDIR='/Applications/MacPython-%s/PythonIDE.app/Contents/Resources/English.lproj/PythonDocumentation' % MAJOR_VERSION
++DESTDIR='@@APPLICATIONS_DIR@@/MacPython-%s/PythonIDE.app/Contents/Resources/English.lproj/PythonDocumentation' % MAJOR_VERSION
+ 
+ class DocBuild(build):
+     def initialize_options(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081016/f5fbe429/attachment-0001.html

More information about the macports-changes mailing list