Ticket #16765: 0003-Fix-framework-and-application-installation-locations.patch

Portfile

@@ -28 +28 @@
                         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 +56 @@
 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 +73 @@
 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 } {

files/patch-Lib-cgi.py.diff

@@ -2 +2 @@
 +++ 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

new file files/patch-Mac-IDLE-Makefile.in.diff

@@ +1 @@
+--- 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
+ 

new file files/patch-Mac-Makefile.in.diff

@@ +1 @@
+--- 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

new file files/patch-Mac-PythonLauncher-Makefile.in.diff

@@ +1 @@
+--- 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

new file files/patch-Mac-Tools-Doc-setup.py.diff

@@ +1 @@
+--- 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):