[43218] branches/release_1_7

[blb at macports.org]

Revision: 43218
          http://trac.macports.org/changeset/43218
Author:   blb at macports.org
Date:     2008-12-07 00:12:45 -0800 (Sun, 07 Dec 2008)
Log Message:
-----------
Merge r43216 from trunk: properly load the sqlite3 package (only installed
on 10.3)

Modified Paths:
--------------
    branches/release_1_7/base/src/sqlite-3.1.3.diff

Property Changed:
----------------
    branches/release_1_7/


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

Modified: branches/release_1_7/base/src/sqlite-3.1.3.diff
===================================================================
--- branches/release_1_7/base/src/sqlite-3.1.3.diff	2008-12-07 08:10:24 UTC (rev 43217)
+++ branches/release_1_7/base/src/sqlite-3.1.3.diff	2008-12-07 08:12:45 UTC (rev 43218)
@@ -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/c9a826ab/attachment.html>