[43220] tags/release_1_7_0-rc1

[blb at macports.org]

Revision: 43220
          http://trac.macports.org/changeset/43220
Author:   blb at macports.org
Date:     2008-12-07 00:18:48 -0800 (Sun, 07 Dec 2008)
Log Message:
-----------
Merge r43218 and r43219 from branches/release_1_7 (properly load sqlite3
package, and reference scripts in postflight correctly); see r43199 for
note about updating this tag

Modified Paths:
--------------
    tags/release_1_7_0-rc1/base/portmgr/dmg/postflight
    tags/release_1_7_0-rc1/base/src/sqlite-3.1.3.diff

Property Changed:
----------------
    tags/release_1_7_0-rc1/


Property changes on: tags/release_1_7_0-rc1
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release_1_7:43187-43198
/trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43140,43153,43194
   + /branches/release_1_7:43187-43219
/trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43140,43153,43194,43216-43217

Modified: tags/release_1_7_0-rc1/base/portmgr/dmg/postflight
===================================================================
--- tags/release_1_7_0-rc1/base/portmgr/dmg/postflight	2008-12-07 08:14:25 UTC (rev 43219)
+++ tags/release_1_7_0-rc1/base/portmgr/dmg/postflight	2008-12-07 08:18:48 UTC (rev 43220)
@@ -60,9 +60,9 @@
     fi
     
     # Add [default] tag to the central MacPorts repository, if it isn't already
-    ${TCLSH} upgrade_sources_conf_default.tcl ${PREFIX}
+    ${TCLSH} ${0}/Contents/Resources/upgrade_sources_conf_default.tcl ${PREFIX}
     # Remove any duplicates from the dep map (could occur with 1.6 and earlier)
-    ${TCLSH} dep_map_clean.tcl ${TCL_PACKAGE_DIR}
+    ${TCLSH} ${0}/Contents/Resources/dep_map_clean.tcl ${TCL_PACKAGE_DIR}
 }
 
 # Through this command we write an environment variable to an appropriate shell configuration file,

Modified: tags/release_1_7_0-rc1/base/src/sqlite-3.1.3.diff
===================================================================
--- tags/release_1_7_0-rc1/base/src/sqlite-3.1.3.diff	2008-12-07 08:14:25 UTC (rev 43219)
+++ tags/release_1_7_0-rc1/base/src/sqlite-3.1.3.diff	2008-12-07 08:18:48 UTC (rev 43220)
@@ -34,7 +34,7 @@
 diff -ru src/sqlite-3.1.3/tclinstaller.tcl src/sqlite-3.1.3.mine/tclinstaller.tcl
 --- src/sqlite-3.1.3/tclinstaller.tcl	2005-01-30 17:10:01.000000000 -0500
 +++ src/sqlite-3.1.3.mine/tclinstaller.tcl	2007-05-31 17:33:32.000000000 -0400
-@@ -7,7 +7,7 @@
+@@ -7,14 +7,14 @@
  set VERSION [lindex $argv 0]
  set LIBFILE .libs/libtclsqlite3[info sharedlibextension]
  if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" }
@@ -43,3 +43,11 @@
  set LIBNAME [file tail $LIBFILE]
  set LIB $LIBDIR/sqlite3/$LIBNAME
  
+ file delete -force $LIBDIR/sqlite3
+ file mkdir $LIBDIR/sqlite3
+ set fd [open $LIBDIR/sqlite3/pkgIndex.tcl w]
+-puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB sqlite3\]"
++puts $fd "package ifneeded sqlite3 $VERSION \[list load \[file join \$dir libtclsqlite3.dylib\]\]"
+ close $fd
+ 
+ # We cannot use [file copy] because that will just make a copy of
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081207/d86be793/attachment-0001.html>