Index: portmgr/dmg/postflight.in
===================================================================
--- portmgr/dmg/postflight.in	(revision 141209)
+++ portmgr/dmg/postflight.in	(working copy)
@@ -46,6 +46,7 @@
 MANPAGES=${PREFIX}/share/man
 DSCL=/usr/bin/dscl
 RUNUSR=macports
+MACPORTS_HOME=${PREFIX}/var/macports/home
 TCLSH=@TCLSH@
 TCL_PACKAGE_PATH=@TCL_PACKAGE_PATH@
 TIMESTAMP=$(date +"%Y-%m-%d_at_%H:%M:%S")
@@ -165,7 +166,7 @@
         ${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts
         ${DSCL} -q . -create /Users/${RUNUSR} Password \*
         ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $(${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $2}')
-        ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory ${PREFIX}/var/macports/home
+        ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory ${MACPORTS_HOME}
         ${DSCL} -q . -create /Users/${RUNUSR} UserShell /usr/bin/false
     fi
     if [[ $(sw_vers -productVersion | /usr/bin/awk -F . '{print $2}') -eq 4 ]]; then
@@ -176,9 +177,9 @@
             ${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts
         fi
     fi
-    if [[ "$(${DSCL} -q . -read /Users/${RUNUSR} NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ]]; then
+    if [[ "$(${DSCL} -q . -read /Users/${RUNUSR} NFSHomeDirectory)" != "NFSHomeDirectory: ${MACPORTS_HOME}" ]]; then
         echo "Updating home directory location for user \"${RUNUSR}\""
-        ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory ${PREFIX}/var/macports/home
+        ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory ${MACPORTS_HOME}
     fi
 }