4 files changed, 31 insertions, 75 deletions

diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 7b9d3e83cf8b..e3f312719d15 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqlite3
-PORTVERSION=	3.5.6
+PORTVERSION=	3.6.4
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 DISTNAME=	sqlite-${PORTVERSION}
@@ -19,7 +19,6 @@ CONFLICTS=	sqlite34-[0-9]*
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	libtool:15
-USE_DOS2UNIX=	*.pc.in
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=		--prefix=${PREFIX}
@@ -28,6 +27,7 @@ OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
 		FTS3		"Enable FTS3 (Full Text Search) module"	off \
 		RAMTABLE	"Store temporary tables in RAM"		off \
 		TCLWRAPPER	"TCL wrapper for SQLITE"		off \
+		METADATA	"Enable column metadata"		on \
 		THREADS		"Enable threads support"		on
 
 .include <bsd.port.pre.mk>
@@ -58,6 +58,10 @@ CONFIGURE_ARGS+=	--disable-tcl
 PLIST_SUB+=		WITH_TCLWRAPPER="@comment "
 .endif
 
+.if !defined(WITHOUT_METADATA)
+CFLAGS+=		-DSQLITE_ENABLE_COLUMN_METADATA=1
+.endif
+
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-threadsafe \
 			--enable-cross-thread-connections \
@@ -80,6 +84,7 @@ post-patch:
 	@${REINPLACE_CMD} -E -e "s|-lpthread||g" \
 		${WRKSRC}/sqlite.pc.in ${WRKSRC}/sqlite3.pc.in
 .endif
+	@${REINPLACE_CMD} -e "s|fts3.c||g" ${WRKSRC}/tool/mksqlite3c.tcl
 
 post-install:
 .if defined(WITH_TCLWRAPPER)
diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo
index 283ce040cbc6..8a0c8042ef51 100644
--- a/databases/sqlite3/distinfo
+++ b/databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.5.6.tar.gz) = 903c9e935c538af392364a9172a3d98d
-SHA256 (sqlite-3.5.6.tar.gz) = 1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
-SIZE (sqlite-3.5.6.tar.gz) = 2543979
+MD5 (sqlite-3.6.4.tar.gz) = b9832cd8734d4568e384e1c60b50c92f
+SHA256 (sqlite-3.6.4.tar.gz) = 2e47b2f5c4184a6bd83d27631521dbed41c991e2d22feace507e68d39812e724
+SIZE (sqlite-3.6.4.tar.gz) = 2246598
diff --git a/databases/sqlite3/files/fts3_patch-Makefile.in b/databases/sqlite3/files/fts3_patch-Makefile.in
index 3d144ee5c313..e2a2750382f6 100644
--- a/databases/sqlite3/files/fts3_patch-Makefile.in
+++ b/databases/sqlite3/files/fts3_patch-Makefile.in
@@ -1,62 +1,17 @@
---- Makefile.in.orig	2008-01-22 16:42:50.000000000 -0200
-+++ Makefile.in	2008-03-04 23:43:03.000000000 -0300
-@@ -116,7 +116,7 @@
+--- Makefile.in.orig	2008-10-14 15:07:37.000000000 -0300
++++ Makefile.in	2008-10-29 11:46:27.000000000 -0200
+@@ -179,6 +179,8 @@
+ LIBOBJ = $(OBJS$(USE_AMALGAMATION))
  
- # You should not have to change anything below this line
- ###############################################################################
--TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
-+#TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
- 
- # Object files for the SQLite library.
- #
-@@ -133,6 +133,8 @@
-          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
-          where.lo utf.lo legacy.lo vtab.lo
  
 +LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_tokenizer.lo fts3_tokenizer1.lo
 +
  # All of the source code files.
  #
  SRC = \
-@@ -204,13 +206,15 @@
- # Source code for extensions
- #
- SRC += \
--  $(TOP)/ext/fts1/fts1.c \
--  $(TOP)/ext/fts1/fts1.h \
--  $(TOP)/ext/fts1/fts1_hash.c \
--  $(TOP)/ext/fts1/fts1_hash.h \
--  $(TOP)/ext/fts1/fts1_porter.c \
--  $(TOP)/ext/fts1/fts1_tokenizer.h \
--  $(TOP)/ext/fts1/fts1_tokenizer1.c
-+  $(TOP)/ext/fts3/fts3.c \
-+  $(TOP)/ext/fts3/fts3.h \
-+  $(TOP)/ext/fts3/fts3_hash.c \
-+  $(TOP)/ext/fts3/fts3_hash.h \
-+  $(TOP)/ext/fts3/fts3_icu.c \
-+  $(TOP)/ext/fts3/fts3_porter.c \
-+  $(TOP)/ext/fts3/fts3_tokenizer.h \
-+  $(TOP)/ext/fts3/fts3_tokenizer.c \
-+  $(TOP)/ext/fts3/fts3_tokenizer1.c
- 
- 
- # Source code to the test files.
-@@ -286,9 +290,9 @@
- # Header files used by extensions
- #
- HDR += \
--  $(TOP)/ext/fts1/fts1.h \
--  $(TOP)/ext/fts1/fts1_hash.h \
--  $(TOP)/ext/fts1/fts1_tokenizer.h
-+  $(TOP)/ext/fts3/fts3.h \
-+  $(TOP)/ext/fts3/fts3_hash.h \
-+  $(TOP)/ext/fts3/fts3_tokenizer.h
- 
- # Header files used by the VDBE submodule
- #
-@@ -561,6 +565,22 @@
- 		libsqlite3.la $(LIBTCL)
- 
+@@ -719,6 +721,20 @@
+                 -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE $(TEMP_STORE) \
+ 		-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
  
 +fts3.lo:	$(TOP)/ext/fts3/fts3.c $(HDR)
 +	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c
@@ -72,8 +27,6 @@
 +
 +fts3_tokenizer1.lo:	$(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
 +	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
-+
-+
- fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
- 	./testfixture $(TOP)/test/all.test
  
+ fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
+ 	./testfixture$(TEXE) $(TOP)/test/all.test
diff --git a/databases/sqlite3/files/patch-Makefile.in b/databases/sqlite3/files/patch-Makefile.in
index 1b7d46e8a134..8c5ffa3d9492 100644
--- a/databases/sqlite3/files/patch-Makefile.in
+++ b/databases/sqlite3/files/patch-Makefile.in
@@ -1,6 +1,15 @@
---- Makefile.in.orig	Mon Jan  8 11:39:27 2007
-+++ Makefile.in	Mon Feb 12 10:18:02 2007
-@@ -260,7 +260,7 @@
+--- Makefile.in.orig	2008-10-14 15:07:37.000000000 -0300
++++ Makefile.in	2008-10-29 11:06:53.000000000 -0200
+@@ -135,7 +135,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
+ bindir = @bindir@
+ includedir = @includedir@
+ INSTALL = @INSTALL@
+@@ -426,7 +426,7 @@
  # This is the default Makefile target.  The objects listed here
  # are what get build when you type just "make" with no arguments.
  #
@@ -9,14 +18,3 @@
  
  Makefile: $(TOP)/Makefile.in
  	./config.status
-@@ -666,8 +666,8 @@
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
- 	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
- 	$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(prefix)/include
--	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
--	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 
-+	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig;
-+	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig;
- 
- tcl_install:	libtclsqlite3.la
- 	tclsh $(TOP)/tclinstaller.tcl $(VERSION)