Changeset 40142

Timestamp:

09/22/08 03:43:46 (2 months ago)

Author:

jmr@…

Message:

Run a script in 'make install' and .dmg postflight which removes any duplicate entries from the dep_map (#8763)

Location:

trunk/base

Files:

• Mk/macports.upgrade.mk (modified) (1 diff)
• portmgr/dmg/postflight (modified) (2 diffs)
• src/dep_map_clean.tcl (added)

trunk/base/Mk/macports.upgrade.mk

@@ -111 +111 @@
         }
 
+# Remove duplicate entries from the dependency map (could occur with 1.6 and earlier):
+        $(TCLSH) src/dep_map_clean.tcl ${TCL_PACKAGE_DIR}
+
 # Upgrade success announcement (meaning we're done ;):
         @[ -f ${UPGRADECHECK} ] || { echo ""; echo "MacPorts installation successfully upgraded from the old DarwinPorts namespace!"; echo ""; \

trunk/base/portmgr/dmg/postflight

@@ -43 +43 @@
 SBINPATH=${PREFIX}/sbin
 MANPAGES=${PREFIX}/share/man
+TCLSH=/usr/bin/tclsh
+TCL_PACKAGE_DIR=/Library/Tcl
 TIMESTAMP=$(date +"%Y-%m-%d_at_%H:%M:%S")
 BACKUP_SUFFIX=macports-saved_${TIMESTAMP}
@@ -57 +59 @@
         echo "Successful!"
     fi
+    
+    # Remove any duplicates from the dep map (could occur with 1.6 and earlier)
+    ${TCLSH} dep_map_clean.tcl ${TCL_PACKAGE_DIR}
 }