[Midnightbsd-cvs] CVS Commit: databases/sqlite3: Update to 3.4.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 10 14:18:49 EDT 2007
Log Message:
-----------
Update to 3.4.1
Modified Files:
--------------
mports/databases/sqlite3:
Makefile (r1.2 -> r1.3)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.1 -> r1.2)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/sqlite3/pkg-plist -Ldatabases/sqlite3/pkg-plist -u -r1.1 -r1.2
--- databases/sqlite3/pkg-plist
+++ databases/sqlite3/pkg-plist
@@ -1,6 +1,7 @@
bin/sqlite3
%%WITH_TCLWRAPPER%%bin/tclsqlite3
include/sqlite3.h
+include/sqlite3ext.h
lib/libsqlite3.a
lib/libsqlite3.la
lib/libsqlite3.so
@@ -12,5 +13,7 @@
%%WITH_TCLWRAPPER%%lib/sqlite/libtclsqlite3.so.8
%%WITH_TCLWRAPPER%%lib/sqlite/pkgIndex.tcl
%%WITH_TCLWRAPPER%%@dirrm lib/sqlite
-%%EXAMPLESDIR%%/example.tcl
- at dirrm %%EXAMPLESDIR%%
+%%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl
+%%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%%
+%%THOL%%%%DATADIR%%/sqlite3_with_threads-override-locks
+%%THOL%%@dirrm %%DATADIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldatabases/sqlite3/Makefile -Ldatabases/sqlite3/Makefile -u -r1.2 -r1.3
--- databases/sqlite3/Makefile
+++ databases/sqlite3/Makefile
@@ -8,13 +8,19 @@
#
PORTNAME= sqlite
-PORTVERSION= 3.3.17
+PORTVERSION= 3.4.1
CATEGORIES= databases
MASTER_SITES= http://www.sqlite.org/
+.if defined(USE_THOL)
+PKGNAMESUFFIX= -threads
+.endif
+DISTNAME= sqlite-${PORTVERSION}
-MAINTAINER= mnag at FreeBSD.org
+MAINTAINER= ports at MidnightBSD.org
COMMENT= An SQL database engine in a C library w/ Tcl wrapper
+SLAVEDIRS= databases/sqlite3-threads
+
USE_GMAKE= YES
USE_GNOME= pkgconfig
USE_AUTOTOOLS= libtool:15
@@ -29,14 +35,25 @@
OPTIONS= DEBUG "Enable debugging & verbose explain" off \
DOCS "Building docs (depends on TCL)" on \
- TCLWRAPPER "TCL wrapper for SQLITE" off \
- THREADS "Enable threads support" off
+ FTS1 "Enable FTS1 (Full Text Search) module" off \
+ FTS2 "Enable FTS2 (Full Text Search) module" off \
+ TCLWRAPPER "TCL wrapper for SQLITE" off
# Defaults, for building the docs:
TCL_V?= 8.4
MAKE_ARGS+= TCLSH=tclsh${TCL_V}
MAKE_ENV+= TCL_VER=${TCL_V}
+.if !defined(USE_THOL)
+OPTIONS+= THREADS "Enable threads support" off
+PLIST_SUB+= THOL="@comment "
+CONFLICTS= sqlite-threads-3*
+.else
+CONFIGURE_ARGS+= --enable-threadsafe --enable-threads-override-locks
+PLIST_SUB+= THOL=""
+CONFLICTS= sqlite-3*
+.endif
+
.include <bsd.port.pre.mk>
.if defined(WITH_DEBUG)
@@ -49,6 +66,17 @@
PORTDOCS= *
.endif
+.if defined(WITH_FTS1) && defined(WITH_FTS2)
+CFLAGS+= -DSQLITE_ENABLE_FTS1 -DSQLITE_ENABLE_FTS2
+EXTRA_PATCHES+= ${FILESDIR}/fts12_patch-Makefile.in
+.elif defined(WITH_FTS1) && !defined(WITH_FTS2)
+CFLAGS+= -DSQLITE_ENABLE_FTS1
+EXTRA_PATCHES+= ${FILESDIR}/fts1_patch-Makefile.in
+.elif defined(WITH_FTS2) && !defined(WITH_FTS1)
+CFLAGS+= -DSQLITE_ENABLE_FTS2
+EXTRA_PATCHES+= ${FILESDIR}/fts2_patch-Makefile.in
+.endif
+
.if defined(WITH_TCLWRAPPER)
CATEGORIES+= lang tcl${TCL_V:S/.//}
LIB_DEPENDS+= tcl${TCL_V:S/.//}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
@@ -64,15 +92,11 @@
.endif
post-patch:
-.if defined(WITH_THREADS)
- @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -E -e "s|(Libs:.*)|\1 ${PTHREAD_LIBS}|" \
- -e "s|(Cflags:.*)|\1 ${PTHREAD_CFLAGS}|" \
- ${WRKSRC}/sqlite.pc.in ${WRKSRC}/sqlite3.pc.in
-.endif
+ @${REINPLACE_CMD} -E -e "s|^(TLIBS.*)|\1 -lm|g" \
+ ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e "s|tclsh \$$(TOP)|\$$(TCLSH) \$$(TOP)|g" \
-e "s|./libtool|${LIBTOOL}|g" \
+ -e "s|--mode=link|--mode=link --tag=CC|g" \
-e "s|\$${HAVE_TCL:1=tcl_install}||" \
${WRKSRC}/Makefile.in
@${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" \
@@ -80,6 +104,15 @@
@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" \
>> ${WRKSRC}/freebsd.hints
+pre-configure:
+.if defined(WITH_THREADS) || defined(USE_THOL)
+ @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -E -e "s|(Libs:.*)|\1 ${PTHREAD_LIBS}|" \
+ -e "s|(Cflags:.*)|\1 ${PTHREAD_CFLAGS}|" \
+ ${WRKSRC}/sqlite.pc.in ${WRKSRC}/sqlite3.pc.in
+.endif
+
post-install:
.if defined(WITH_TCLWRAPPER)
@${MKDIR} ${PREFIX}/lib/sqlite
@@ -87,12 +120,16 @@
libtclsqlite3.la ${PREFIX}/lib/sqlite/)
@${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
+ @${MKDIR} ${EXAMPLESDIR}
+ @${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
.endif
.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
.endif
- @${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
+.if defined(USE_THOL)
+ @${MKDIR} ${DATADIR}
+ @${TOUCH} ${DATADIR}/sqlite3_with_threads-override-locks
+.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldatabases/sqlite3/distinfo -Ldatabases/sqlite3/distinfo -u -r1.2 -r1.3
--- databases/sqlite3/distinfo
+++ databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.3.17.tar.gz) = 549eac1ee0b6ff4615f16e0ef0eb68fb
-SHA256 (sqlite-3.3.17.tar.gz) = ee667dcc41c001229b93efff4ae489236934fd590c7c3d6664105ed50d6f899c
-SIZE (sqlite-3.3.17.tar.gz) = 2111281
+MD5 (sqlite-3.4.1.tar.gz) = 0f06955b18da295fecb62d4bf9ded3c6
+SHA256 (sqlite-3.4.1.tar.gz) = d604a4db7781db3d8dda0bb30c4a35bbee184d48e72d9c0de855cf55170ee1be
+SIZE (sqlite-3.4.1.tar.gz) = 2237515
More information about the Midnightbsd-cvs
mailing list