[66776] trunk/base/portmgr/dmg

[jmr at macports.org]

Revision: 66776
          http://trac.macports.org/changeset/66776
Author:   jmr at macports.org
Date:     2010-04-22 13:21:12 -0700 (Thu, 22 Apr 2010)
Log Message:
-----------
remove hardcoded /opt/local from dmg resources

Modified Paths:
--------------
    trunk/base/portmgr/dmg/InstallationCheck
    trunk/base/portmgr/dmg/ReadMe.rtf
    trunk/base/portmgr/dmg/postflight

Modified: trunk/base/portmgr/dmg/InstallationCheck
===================================================================
--- trunk/base/portmgr/dmg/InstallationCheck	2010-04-22 19:51:04 UTC (rev 66775)
+++ trunk/base/portmgr/dmg/InstallationCheck	2010-04-22 20:21:12 UTC (rev 66776)
@@ -20,7 +20,7 @@
    exit 113
 fi
 
-if [[ -f /opt/local/etc/ports/dp_version ]]; then
+if [[ -f __PREFIX__/etc/ports/dp_version ]]; then
    # message 18 in InstallationCheck.strings
    exit 114
 fi

Modified: trunk/base/portmgr/dmg/ReadMe.rtf
===================================================================
--- trunk/base/portmgr/dmg/ReadMe.rtf	2010-04-22 19:51:04 UTC (rev 66775)
+++ trunk/base/portmgr/dmg/ReadMe.rtf	2010-04-22 20:21:12 UTC (rev 66776)
@@ -26,7 +26,7 @@
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 
 \f0\b0 \cf0 \
-The MacPorts installer copies MacPorts to the target directory /opt/local. If you wish to install to any path other than that, you must install MacPorts via its source code. See {\field{\*\fldinst{HYPERLINK "http://www.macports.org/install.php"}}{\fldrslt Installing MacPorts}} on the MacPorts webpage for instructions on installation alternatives.\
+The MacPorts installer copies MacPorts to the target directory __PREFIX__. If you wish to install to any path other than that, you must install MacPorts via its source code. See {\field{\*\fldinst{HYPERLINK "http://www.macports.org/install.php"}}{\fldrslt Installing MacPorts}} on the MacPorts webpage for instructions on installation alternatives.\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 
 \f1\b \cf0 \
@@ -35,7 +35,7 @@
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 
 \f0\b0 \cf0 \
-Aside from a few MacPorts executable commands in /opt/local/bin, most MacPorts files are installed in /opt/local/var/macports. Within these directories you will find a "sources" directory containing the Portfiles that hold the necessary instructions to install individual ports, and also the source code for MacPorts itself. Both are kept up to date by using the 
+Aside from a few MacPorts executable commands in __PREFIX__/bin, most MacPorts files are installed in __PREFIX__/var/macports. Within these directories you will find a "sources" directory containing the Portfiles that hold the necessary instructions to install individual ports, and also the source code for MacPorts itself. Both are kept up to date by using the 
 \f2\i port selfupdate
 \f0\i0  command as shown below. Please read the port(1) man page for more information.\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
@@ -45,7 +45,7 @@
 Shell Environment:
 \f0\b0 \
 \
-A file named ~/.profile is created for the "bash" shell (default on Mac OS X 10.3 and newer) during the MacPorts installation. It contains the necessary statements to append MacPorts' binary paths within /opt/local/ to your shell environment, so MacPorts is available to you on subsequent terminal sessions. You may have to quit and restart your terminal application for this change to take effect.\
+A file named ~/.profile is created for the "bash" shell (default on Mac OS X 10.3 and newer) during the MacPorts installation. It contains the necessary statements to append MacPorts' binary paths within __PREFIX__/ to your shell environment, so MacPorts is available to you on subsequent terminal sessions. You may have to quit and restart your terminal application for this change to take effect.\
 \
 
 \f1\b \
@@ -123,4 +123,4 @@
 \f0\b0 \cf0 If you are interested in developing your own ports for private usage, or would like to submit your ports for inclusion within the MacPorts software repository, please consult the documentation provided on our website. The MacPorts project depends on a community of active participants and we are always open to welcoming new volunteers and their contributions!\
 \
 Thank you for your interest in MacPorts!\
-}
\ No newline at end of file
+}

Modified: trunk/base/portmgr/dmg/postflight
===================================================================
--- trunk/base/portmgr/dmg/postflight	2010-04-22 19:51:04 UTC (rev 66775)
+++ trunk/base/portmgr/dmg/postflight	2010-04-22 20:21:12 UTC (rev 66776)
@@ -38,7 +38,7 @@
 VERSION=1.8.0
 
 # Abstraction variables:
-PREFIX=/opt/local
+PREFIX=__PREFIX__
 BINPATH=${PREFIX}/bin
 SBINPATH=${PREFIX}/sbin
 CONFIGPATH=${PREFIX}/etc/macports
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100422/aa2a32af/attachment.html>