Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/database
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2460
Modified Files:
sqlite3.info sqlite3.patch
Log Message:
New version from tracker #2531889
Index: sqlite3.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/database/sqlite3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sqlite3.patch 29 Aug 2007 02:03:36 -0000 1.2
+++ sqlite3.patch 24 Jan 2009 21:13:12 -0000 1.3
@@ -1,4904 +1,97 @@
-diff -urN sqlite-3.4.2.old/Makefile.in sqlite-3.4.2.new/Makefile.in
---- sqlite-3.4.2.old/Makefile.in 2007-06-28 07:46:18.000000000 -0500
-+++ sqlite-3.4.2.new/Makefile.in 2007-08-21 17:33:14.000000000 -0500
-@@ -279,7 +279,7 @@
- # of the most recently modified source code file
- #
- last_change: $(SRC)
-- cat $(SRC) | grep '$$Id: ' | sort -k 5 | tail -1 \
-+ cat $(SRC) | grep '$$Id: ' | sort -k 5 | tail -n 1 \
- | $(NAWK) '{print $$5,$$6}' >last_change
-
[...4909 lines suppressed...]
-+ if( Configcmp(np->data,key)==0 ) break;
-+ np = np->next;
-+ }
-+ return np ? np->data : 0;
-+}
-+
-+/* Remove all data from the table. Pass each data to the function "f"
-+** as it is removed. ("f" may be null to avoid this step.) */
-+void Configtable_clear(f)
-+int(*f)(/* struct config * */);
-+{
-+ int i;
-+ if( x4a==0 || x4a->count==0 ) return;
-+ if( f ) for(i=0; i<x4a->count; i++) (*f)(x4a->tbl[i].data);
-+ for(i=0; i<x4a->size; i++) x4a->ht[i] = 0;
-+ x4a->count = 0;
-+ return;
-+}
-
-
Index: sqlite3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/database/sqlite3.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sqlite3.info 12 Aug 2008 18:12:27 -0000 1.10
+++ sqlite3.info 24 Jan 2009 21:13:12 -0000 1.11
@@ -1,6 +1,6 @@
Package: sqlite3
-Version: 3.4.2
-Revision: 1004
+Version: 3.6.9
+Revision: 1001
Description: Embedded SQL database, version 3
DescDetail: <<
@@ -16,7 +16,20 @@
Maintainer: Pepe Barbe <pepe.ba...@gmail.com>
Homepage: http://www.sqlite.org/
-DocFiles: README VERSION www/copyright-release.html LICENSE
+DocFiles: README VERSION LICENSE
+
+Source: http://sqlite.org/sqlite-%v.tar.gz
+Source-MD5: 4cfef90543d712a5b8fbcc6444956e03
+
+# Patch so that 'make test' works and the lemon binary is buffer overflow
+# safe if we ever decide to install at (Debian and Ubuntu installs it).
+Patch: %n.patch
+PatchScript: head -n 10 src/sqlite.h.in > LICENSE
+ConfigureParams: --with-tcl=%p/lib --enable-threadsafe --enable-load-extension
+NoSetCPPFLAGS: true
+SetCPPFLAGS: -I%p/include/readline
+SetCFLAGS: -Os -DSQLITE_ENABLE_COLUMN_METADATA=1
+# Compiling with the -D flag is needed for libgda
Depends: %N-shlibs (= %v-%r), readline5-shlibs (>= 5.0-1004)
BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006),
tcltk (<< 8.5), tcltk-dev (<< 8.5), fink (>= 0.28)
@@ -25,45 +38,35 @@
# lclint installs %p/lib/Makefile, which leads configure to believe
# it has to use tcltk from its builddir, hence failure
-# Patch so that 'make test' works and the lemon binary is buffer overflow
-# safe if we ever decide to install at (Debian and Ubuntu installs it).
-Patch: %n.patch
-PatchScript: head -n 10 src/sqlite.h.in > LICENSE
-ConfigureParams: --with-tcl=%p/lib --enable-threadsafe
CompileScript: <<
- #!/bin/sh -ev
- config_TARGET_READLINE_LIBS='-L%p/lib -lreadline -lncurses' \
- ./configure %c
- make
- make sqlite3_analyzer
- make doc
+ #!/bin/sh -ev
+ config_TARGET_READLINE_LIBS='-L%p/lib -lreadline -lncurses' \
+ ./configure %c
+ sed -i.bak -e s,'$(libdir)/sqlite','$(libdir)/tcl8.4/sqlite3', Makefile
+ make
+ make sqlite3_analyzer
+<<
- # Don't actually run the test suite, it's LONG
- # make fulltest
+InfoTest: <<
+ TestScript: make test || exit 2
<<
+
InstallScript: <<
- #!/bin/sh -ev
- TCLLIBPATH=%p/lib/tcl8.4 make install DESTDIR=%d
- perl -i -pe 's,%i,%p,g' %i/lib/tcl8.4/sqlite3/pkgIndex.tcl
- cp .libs/sqlite3_analyzer %i/bin
- cd %i/lib/tcl8.4/sqlite3/
- ln -s libtclsqlite3.dylib libtclsqlite3.0.dylib
+ #!/bin/sh -ev
+ TCLLIBDIR=%p/lib/tcl8.4 make install DESTDIR=%d
+ #perl -i -pe 's,%i,%p,g' %i/lib/tcl8.4/sqlite3/pkgIndex.tcl
+ cp -r sqlite3_analyzer %i/bin
+
+ cd %i/lib/tcl8.4/sqlite3/
+ mv libtclsqlite3.dylib libtclsqlite3.0.dylib
<<
-SetCPPFLAGS: -I%p/include/readline
-SetCFLAGS: -Os -DSQLITE_ENABLE_COLUMN_METADATA=1
-# Compiling with the -D flag is needed for libgda
-
-
-Source: http://sqlite.org/sqlite-%v.tar.gz
-Source-MD5: 2feec9b429f9298c9f288420c8b449f8
-
SplitOff: <<
Package: %N-shlibs
Description: Embedded SQL database (shared libraries)
- DocFiles: README VERSION www/copyright-release.html LICENSE
+ DocFiles: VERSION LICENSE
Shlibs: %p/lib/libsqlite3.0.dylib 9.0.0 %n (>= 3.0.8-1)
- Files: lib/libsqlite3.0.8.6.dylib lib/libsqlite3.0.dylib
+ Files: lib/libsqlite3.0.dylib
<<
SplitOff2: <<
@@ -72,14 +75,13 @@
Depends: %N-shlibs (= %v-%r)
# Does NOT conflict with sqlite-dev, strangely enough
- DocFiles: README VERSION www/copyright-release.html LICENSE
+ DocFiles: VERSION LICENSE
BuildDependsOnly: True
Files: <<
- include
- lib/libsqlite3.la
- lib/libsqlite3.a
- lib/libsqlite3.dylib
- lib/pkgconfig
+ include
+ lib/libsqlite3.la
+ lib/libsqlite3.a
+ lib/pkgconfig
<<
<<
@@ -89,25 +91,15 @@
Depends: %N-shlibs (= %v-%r), tcltk (<< 8.5)
Conflicts: %N-tcltk
Replaces: %N-tcltk
-
- DocFiles: README VERSION www/copyright-release.html LICENSE
- Shlibs: <<
- !%p/lib/tcl8.4/sqlite3/libtclsqlite3.dylib
- !%p/lib/tcl8.4/sqlite3/libtclsqlite3.0.dylib
- <<
+ DocFiles: VERSION LICENSE
+ Shlibs: %p/lib/tcl8.4/sqlite3/libtclsqlite3.0.dylib 9.0.0 %n (>= 3.0.8-1)
Files: lib/tcl8.4
<<
-SplitOff4: <<
- Package: %N-doc
- Description: Embedded SQL database (HTML documentation)
- DocFiles: doc/* README VERSION www/copyright-release.html LICENSE
-<<
-
SplitOff5: <<
Package: %N-analyzer
Description: SQLite3 analyzer program
Depends: %N-tcl
- DocFiles: README VERSION www/copyright-release.html LICENSE
- files: %p/bin/sqlite3_analyzer
+ DocFiles: VERSION LICENSE
+ Files: %p/bin/sqlite3_analyzer
<<
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
