[66777] trunk/dports/sysutils/MacPorts/Portfile

[jmr at macports.org]

Revision: 66777
          http://trac.macports.org/changeset/66777
Author:   jmr at macports.org
Date:     2010-04-22 13:24:36 -0700 (Thu, 22 Apr 2010)
Log Message:
-----------
MacPorts port: fix issues building from a non /opt/local prefix (#17633), add var/macports/packages to destroot.keepdirs

Modified Paths:
--------------
    trunk/dports/sysutils/MacPorts/Portfile

Modified: trunk/dports/sysutils/MacPorts/Portfile
===================================================================
--- trunk/dports/sysutils/MacPorts/Portfile	2010-04-22 20:21:12 UTC (rev 66776)
+++ trunk/dports/sysutils/MacPorts/Portfile	2010-04-22 20:24:36 UTC (rev 66777)
@@ -22,19 +22,19 @@
                     sha1    985d159ed4553da91b0704a3d3de7fcf8c5fa78c \
                     rmd160  f6c78cfa5b3cd9beae15c5ffbc0cddd6770c408a
 
-pre-fetch {
-   if {${prefix} != {/opt/local}} {
-      return -code error "You need to use a MacPorts from /opt/local to safely build the MacPorts port (ticket #17633)"
-   }
+variant keep_prefix description "Use configured prefix instead of enforcing /opt/local" {}
+if {![variant_isset keep_prefix]} {
+    prefix          /opt/local
 }
 
-use_parallel_build  yes
-
 # Readline is disabled by default to avoid support issues with people who
 # have a readline in /usr/local. Since this portfile is presumably used in a
 # clean environment, enable it here.
 configure.args      --enable-readline
 
+# we don't want to use anything supplied by ports when building macports itself
+configure.env       PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
 # Some of MacPort's default flags don't play well when we're building
 # MacPorts itself: nuke them
 configure.cppflags
@@ -78,6 +78,11 @@
     file copy -force -- ${worksrcpath}/portmgr/dmg/InstallationCheck.strings ${resources_lang}
     file copy -force -- ${worksrcpath}/src/dep_map_clean.tcl ${resources_scripts}
     file copy -force -- ${worksrcpath}/src/upgrade_sources_conf_default.tcl ${resources_scripts}
+    
+    reinplace "s|__PREFIX__|${prefix}|g" \
+              ${resources_scripts}/InstallationCheck \
+              ${resources_scripts}/postflight \
+              ${resources_lang}/ReadMe.rtf
 }
 
 platform darwin 7 {
@@ -283,5 +288,5 @@
                      ${destroot}${prefix}/share/nls/zh_TW.Big5 \
                      ${destroot}${prefix}/var/macports/build \
                      ${destroot}${prefix}/var/macports/distfiles \
-                     ${destroot}${prefix}/var/macports/receipts
-
+                     ${destroot}${prefix}/var/macports/receipts \
+                     ${destroot}${prefix}/var/macports/packages
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100422/9fb2beb5/attachment.html>