[64645] trunk/base

[jmr at macports.org]

Revision: 64645
          http://trac.macports.org/changeset/64645
Author:   jmr at macports.org
Date:     2010-03-12 10:21:02 -0800 (Fri, 12 Mar 2010)
Log Message:
-----------
delete any existing registry1.0 directory during install

Modified Paths:
--------------
    trunk/base/portmgr/dmg/postflight
    trunk/base/src/registry2.0/Makefile

Modified: trunk/base/portmgr/dmg/postflight
===================================================================
--- trunk/base/portmgr/dmg/postflight	2010-03-12 18:12:25 UTC (rev 64644)
+++ trunk/base/portmgr/dmg/postflight	2010-03-12 18:21:02 UTC (rev 64645)
@@ -43,6 +43,7 @@
 SBINPATH=${PREFIX}/sbin
 CONFIGPATH=${PREFIX}/etc/macports
 MANPAGES=${PREFIX}/share/man
+REG1DIR=${PREFIX}/share/macports/Tcl/registry1.0
 TCLSH=/usr/bin/tclsh
 TCL_PACKAGE_DIR=/Library/Tcl
 TIMESTAMP=$(date +"%Y-%m-%d_at_%H:%M:%S")
@@ -106,6 +107,12 @@
     echo -e "Done.\n"
 }
 
+# Delete the old registry1.0 directory
+function delete_reg1 {
+    if [ -d ${REG1DIR} ]; then
+        rm -vrf ${REG1DIR}
+    fi
+}
 
 echo "The MacPorts Project, postflight script version ${VERSION}: checking the shell environment for user \"${USER}\"."
 
@@ -114,6 +121,7 @@
 
 # Remove old stuff
 cleanup_man
+delete_reg1
 
 # Determine the user's shell, in order to choose an appropriate configuration file we'll be tweaking.
 # Exit nicely if the shell is any other than bash or tcsh, as that's considered non-standard.

Modified: trunk/base/src/registry2.0/Makefile
===================================================================
--- trunk/base/src/registry2.0/Makefile	2010-03-12 18:12:25 UTC (rev 64644)
+++ trunk/base/src/registry2.0/Makefile	2010-03-12 18:21:02 UTC (rev 64645)
@@ -25,6 +25,7 @@
 	rm -f registry_autoconf.tcl
 
 install:: all
+	[ ! -d $(DESTDIR)${datadir}/macports/Tcl/registry1.0 ] || rm -vrf $(DESTDIR)${datadir}/macports/Tcl/registry1.0
 	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
 	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
 	$(SILENT) set -x; for file in ${SRCS}; do \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100312/e852d2cc/attachment.html>