Fri Dec 17 00:37:34 2010 UTC ()
Add two new options for sqlite3, rtree (for multi-dimensional search optimization),
and fts (full-text searching). Both options are off by default.


(agc)
diff -r1.36 -r1.37 pkgsrc/databases/sqlite3/Makefile
diff -r0 -r1.3 pkgsrc/databases/sqlite3/options.mk

cvs diff -r1.36 -r1.37 pkgsrc/databases/sqlite3/Makefile (switch to unified diff)

--- pkgsrc/databases/sqlite3/Makefile 2010/12/09 05:32:05 1.36
+++ pkgsrc/databases/sqlite3/Makefile 2010/12/17 00:37:34 1.37
@@ -1,45 +1,47 @@ @@ -1,45 +1,47 @@
1# $NetBSD: Makefile,v 1.36 2010/12/09 05:32:05 adam Exp $ 1# $NetBSD: Makefile,v 1.37 2010/12/17 00:37:34 agc Exp $
2 2
3DISTNAME= sqlite-autoconf-3070400 3DISTNAME= sqlite-autoconf-3070400
4PKGNAME= sqlite3-3.7.4 4PKGNAME= sqlite3-3.7.4
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= http://www.hwaci.com/sw/sqlite/ \ 6MASTER_SITES= http://www.hwaci.com/sw/sqlite/ \
7 http://www.sqlite.org/ 7 http://www.sqlite.org/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.sqlite.org/ 10HOMEPAGE= http://www.sqlite.org/
11COMMENT= SQL Database Engine in a C Library 11COMMENT= SQL Database Engine in a C Library
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
 16.include "options.mk"
 17
16USE_LIBTOOL= yes 18USE_LIBTOOL= yes
17USE_TOOLS+= gmake 19USE_TOOLS+= gmake
18GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
19 21
20PKGCONFIG_OVERRIDE+= sqlite3.pc.in 22PKGCONFIG_OVERRIDE+= sqlite3.pc.in
21 23
22INSTALLATION_DIRS+= ${PKGMANDIR}/man1 24INSTALLATION_DIRS+= ${PKGMANDIR}/man1
23 25
24.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
25 27
26# In the past, Linux had database corruption issues with pread, so 28# In the past, Linux had database corruption issues with pread, so
27# only enable it on safe platforms. 29# only enable it on safe platforms.
28CFLAGS.NetBSD+= -DUSE_PREAD 30CFLAGS.NetBSD+= -DUSE_PREAD
29 31
30# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 32# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
31.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 33.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
32CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 34CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0
33.endif 35.endif
34 36
35# This define includes the sqlite3_unlock_notify() API in the build. 37# This define includes the sqlite3_unlock_notify() API in the build.
36# It is required by Firefox 4.x. 38# It is required by Firefox 4.x.
37CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 39CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1
38 40
39# Uses dlopen and friends but doesn't use -ldl on Linux. 41# Uses dlopen and friends but doesn't use -ldl on Linux.
40# See http://www.sqlite.org/cvstrac/tktview?tn=3555 42# See http://www.sqlite.org/cvstrac/tktview?tn=3555
41LIBS+= ${BUILDLINK_LDADD.dl} 43LIBS+= ${BUILDLINK_LDADD.dl}
42 44
43.include "../../devel/readline/buildlink3.mk" 45.include "../../devel/readline/buildlink3.mk"
44.include "../../mk/dlopen.buildlink3.mk" 46.include "../../mk/dlopen.buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/databases/sqlite3/options.mk
# $NetBSD: options.mk,v 1.3 2010/12/17 00:37:34 agc Exp $

PKG_OPTIONS_VAR=		PKG_OPTIONS.sqlite3
PKG_SUPPORTED_OPTIONS=		rtree fts

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mrtree)
CFLAGS+=	-DSQLITE_ENABLE_RTREE=1
.endif

.if !empty(PKG_OPTIONS:Mfts)
CFLAGS+=	-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
.endif