diff options
| -rw-r--r-- | databases/sqlite3/Makefile | 23 | ||||
| -rw-r--r-- | databases/sqlite3/distinfo | 6 | ||||
| -rw-r--r-- | databases/sqlite3/files/patch-Makefile.in | 24 | ||||
| -rw-r--r-- | databases/sqlite3/pkg-plist | 10 |
4 files changed, 44 insertions, 19 deletions
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 3c6b6a161745..b43088301b63 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -6,13 +6,13 @@ # PORTNAME= sqlite3 -PORTVERSION= 3.6.10 +PORTVERSION= 3.6.11 CATEGORIES= databases MASTER_SITES= http://www.sqlite.org/ DISTNAME= sqlite-${PORTVERSION} MAINTAINER= mnag@FreeBSD.org -COMMENT= An SQL database engine in a C library w/ Tcl wrapper +COMMENT= An SQL database engine in a C library CONFLICTS= sqlite34-[0-9]* @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} 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 \ + TCLWRAPPER "Enable TCL wrapper" off \ METADATA "Enable column metadata" on \ THREADS "Enable threads support" on @@ -46,12 +46,13 @@ CONFIGURE_ARGS+= --enable-tempstore=yes .endif .if defined(WITH_TCLWRAPPER) -TCL_V?= 8.4 -MAKE_ARGS+= TCLSH=tclsh${TCL_V} -MAKE_ENV+= TCL_VER=${TCL_V} +USE_TCL= 84+ +.include "${PORTSDIR}/Mk/bsd.tcl.mk" +MAKE_ARGS+= TCLSH=${TCLSH} +MAKE_ENV+= TCL_VER=${TCL_VER} CATEGORIES+= lang tcl -LIB_DEPENDS+= tcl${TCL_V:S/.//}:${PORTSDIR}/lang/tcl${TCL_V:S/.//} -CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_V} +COMMENT+= with TCL Wrapper +CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} PLIST_SUB+= WITH_TCLWRAPPER="" .else CONFIGURE_ARGS+= --disable-tcl @@ -89,10 +90,10 @@ post-patch: post-install: .if defined(WITH_TCLWRAPPER) - @${MKDIR} ${PREFIX}/lib/sqlite + @${MKDIR} ${PREFIX}/lib/sqlite3 @(cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \ - libtclsqlite3.la ${PREFIX}/lib/sqlite/) - @${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/ + libtclsqlite3.la ${PREFIX}/lib/sqlite3/) + @${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite3/ @${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR} diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo index dead6bbe024e..2c2a3cf9a094 100644 --- a/databases/sqlite3/distinfo +++ b/databases/sqlite3/distinfo @@ -1,3 +1,3 @@ -MD5 (sqlite-3.6.10.tar.gz) = a03bdc86df4025b6881d58557e4b5bd3 -SHA256 (sqlite-3.6.10.tar.gz) = 2157db34aa0aace8d5a1a5c723280f2840b3383498a225cab36014f0a45faa01 -SIZE (sqlite-3.6.10.tar.gz) = 2763053 +MD5 (sqlite-3.6.11.tar.gz) = 7ebb099696ab76cc6ff65dd496d17858 +SHA256 (sqlite-3.6.11.tar.gz) = fd07be79b4d4e8453675e142907a777d07776ec2b3e2a9f4dd7645a27fcd28a1 +SIZE (sqlite-3.6.11.tar.gz) = 2804714 diff --git a/databases/sqlite3/files/patch-Makefile.in b/databases/sqlite3/files/patch-Makefile.in index 8c5ffa3d9492..235709574305 100644 --- a/databases/sqlite3/files/patch-Makefile.in +++ b/databases/sqlite3/files/patch-Makefile.in @@ -18,3 +18,27 @@ Makefile: $(TOP)/Makefile.in ./config.status +# +# http://www.sqlite.org/cvstrac/tktview?tn=3732 +# +--- Makefile.in.orig 2009-03-23 00:21:28.000000000 -0300 ++++ Makefile.in 2009-03-23 00:22:03.000000000 -0300 +@@ -163,7 +163,7 @@ + + # Object files for the SQLite library (non-amalgamation). + # +-OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \ ++OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \ + btree.lo build.lo callback.lo complete.lo date.lo \ + delete.lo expr.lo fault.lo func.lo global.lo \ + hash.lo journal.lo insert.lo legacy.lo loadext.lo \ +@@ -518,6 +518,9 @@ + auth.lo: $(TOP)/src/auth.c $(HDR) + $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/auth.c + ++backup.lo: $(TOP)/src/backup.c $(HDR) ++ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/backup.c ++ + bitvec.lo: $(TOP)/src/bitvec.c $(HDR) + $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/bitvec.c + diff --git a/databases/sqlite3/pkg-plist b/databases/sqlite3/pkg-plist index 416bbbd23f12..54c3187cd4e8 100644 --- a/databases/sqlite3/pkg-plist +++ b/databases/sqlite3/pkg-plist @@ -7,10 +7,10 @@ lib/libsqlite3.la lib/libsqlite3.so lib/libsqlite3.so.8 libdata/pkgconfig/sqlite3.pc -%%WITH_TCLWRAPPER%%lib/sqlite/libtclsqlite3.a -%%WITH_TCLWRAPPER%%lib/sqlite/libtclsqlite3.la -%%WITH_TCLWRAPPER%%lib/sqlite/libtclsqlite3.so -%%WITH_TCLWRAPPER%%lib/sqlite/pkgIndex.tcl -%%WITH_TCLWRAPPER%%@dirrm lib/sqlite +%%WITH_TCLWRAPPER%%lib/sqlite3/libtclsqlite3.a +%%WITH_TCLWRAPPER%%lib/sqlite3/libtclsqlite3.la +%%WITH_TCLWRAPPER%%lib/sqlite3/libtclsqlite3.so +%%WITH_TCLWRAPPER%%lib/sqlite3/pkgIndex.tcl +%%WITH_TCLWRAPPER%%@dirrm lib/sqlite3 %%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl %%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%% |