View | Details | Raw Unified | Return to bug 149472 | Differences between
and this patch

Collapse All | Expand All

(-)databases/sqlite3/Makefile (-15 / +77 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	sqlite3
8
PORTNAME=	sqlite3
9
PORTVERSION=	3.6.23.1
9
PORTVERSION=	3.7.0.1
10
PORTREVISION=	1
11
CATEGORIES=	databases
10
CATEGORIES=	databases
12
MASTER_SITES=	http://www.sqlite.org/
11
MASTER_SITES=	http://www.sqlite.org/
13
DISTNAME=	sqlite-${PORTVERSION}
12
DISTNAME=	sqlite-${PORTVERSION}
Lines 18-44 Link Here
18
CONFLICTS=	sqlite34-[0-9]*
17
CONFLICTS=	sqlite34-[0-9]*
19
18
20
USE_GMAKE=	YES
19
USE_GMAKE=	YES
21
USE_GNOME=	pkgconfig
20
USE_GNOME=	pkgconfig gnomehack
22
USE_LDCONFIG=	YES
21
USE_LDCONFIG=	YES
23
GNU_CONFIGURE=	YES
22
GNU_CONFIGURE=	YES
24
USE_GNOME=	gnomehack
25
USE_TCL_BUILD=	84+
23
USE_TCL_BUILD=	84+
26
CONFIGURE_ENV+=	TCLSH_CMD="${TCLSH}" \
24
CONFIGURE_ENV+=	TCLSH_CMD="${TCLSH}" \
27
		TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \
25
		TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \
28
		ac_cv_search_pthread_create=""
26
		ac_cv_search_pthread_create=""
29
27
30
MAN1=		sqlite3.1
31
32
OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
28
OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
33
		FTS3		"Enable FTS3 (Full Text Search) module"	off \
29
		GCOV		"Enable coverage testing using gcov"	off \
30
		FTS3		"Enable FTS3 (Full Text Search) module"	on \
34
		RTREE		"Enable R*Tree module"			off \
31
		RTREE		"Enable R*Tree module"			off \
32
		ICU		"Enable built with \"ICU\""		off \
35
		RAMTABLE	"Store temporary tables in RAM"		off \
33
		RAMTABLE	"Store temporary tables in RAM"		off \
34
		SECURE_DELETE	"Overwrite deleted information with zeros" on \
35
		UNLOCK_NOTIFY	"Enable notification on unlocking"	on \
36
		TCLWRAPPER	"Enable TCL wrapper"			off \
36
		TCLWRAPPER	"Enable TCL wrapper"			off \
37
		METADATA	"Enable column metadata"		on \
37
		METADATA	"Enable column metadata"		on \
38
		THREADSAFE	"Build thread-safe library"		on \
38
		THREADSAFE	"Build thread-safe library"		on \
39
		OVERRIDE_LOCK	"Threads can override each others locks" on \
40
		XTHREAD		"Allow connection sharing across threads" off \
39
		EXTENSION	"Allow loadable extensions"		off
41
		EXTENSION	"Allow loadable extensions"		off
40
42
41
.include <bsd.port.pre.mk>
43
.include <bsd.port.options.mk>
44
45
PLIST_FILES+=	bin/sqlite3 include/sqlite3.h include/sqlite3ext.h \
46
		lib/libsqlite3.a lib/libsqlite3.la lib/libsqlite3.so \
47
		lib/libsqlite3.so.8 libdata/pkgconfig/sqlite3.pc
48
49
.if !defined(NO_INSTALL_MANPAGES)
50
MAN1=		sqlite3.1
51
.endif
42
52
43
.if ${OSVERSION} < 700000
53
.if ${OSVERSION} < 700000
44
EXTRA_PATCHES+=		${FILESDIR}/pthread_equal_stub
54
EXTRA_PATCHES+=		${FILESDIR}/pthread_equal_stub
Lines 48-77 Link Here
48
CONFIGURE_ARGS+=	--enable-debug
58
CONFIGURE_ARGS+=	--enable-debug
49
.endif
59
.endif
50
60
61
.if defined(WITH_GCOV)
62
CONFIGURE_ARGS+=	--enable-gcov
63
.endif
64
51
.if defined(WITH_FTS3)
65
.if defined(WITH_FTS3)
52
CFLAGS+=		-DSQLITE_ENABLE_FTS3=1
66
CFLAGS+=		-DSQLITE_ENABLE_FTS3=1
67
.ifndef NOPORTDOCS
68
PORTDOCS+=		README.syntax README.tokenizers
69
.endif
53
.endif
70
.endif
54
71
55
.if defined(WITH_RTREE)
72
.if defined(WITH_RTREE)
56
CFLAGS+=		-DSQLITE_ENABLE_RTREE=1
73
CFLAGS+=		-DSQLITE_ENABLE_RTREE=1
74
.ifndef NOPORTDOCS
75
PORTDOCS+=		README
76
.endif
77
.endif
78
79
.if defined(WITH_ICU)
80
BUILD_DEPENDS+=		${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
81
LIB_DEPENDS+=		icudata.38:${PORTSDIR}/devel/icu
82
CFLAGS+=		-DSQLITE_ENABLE_ICU=1
83
CPPFLAGS+=		`${LOCALBASE}/bin/icu-config --cppflags`
84
LDFLAGS+=		`${LOCALBASE}/bin/icu-config --ldflags`
85
.ifndef NOPORTDOCS
86
PORTDOCS+=		README.txt
87
.endif
57
.endif
88
.endif
58
89
59
.if defined(WITH_RAMTABLE)
90
.if defined(WITH_RAMTABLE)
60
CONFIGURE_ARGS+=	--enable-tempstore=yes
91
CONFIGURE_ARGS+=	--enable-tempstore=yes
61
.endif
92
.endif
62
93
94
.if defined(WITH_SECURE_DELETE)
95
CFLAGS+=		-DSQLITE_SECURE_DELETE=1
96
.endif
97
98
.if defined(WITH_UNLOCK_NOTIFY)
99
CFLAGS+=		-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
100
.endif
101
63
.if defined(WITH_TCLWRAPPER)
102
.if defined(WITH_TCLWRAPPER)
64
CATEGORIES+=		lang tcl
103
CATEGORIES+=		lang tcl
65
COMMENT+=		with TCL Wrapper
104
COMMENT+=		with TCL Wrapper
66
USE_TCL_BUILD=		84+
67
USE_TCL_RUN=		84+
105
USE_TCL_RUN=		84+
68
CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR}
69
PLIST_SUB+=		WITH_TCLWRAPPER=""
70
ALL_TARGET=		all tclsqlite3
106
ALL_TARGET=		all tclsqlite3
71
INSTALL_TARGET=		install tcl_install
107
INSTALL_TARGET=		install tcl_install
108
CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR}
109
PORTEXAMPLES+=		example.tcl
110
PLIST_DIRS+=		lib/sqlite3
111
PLIST_FILES+=		bin/tclsqlite3 lib/sqlite3/libtclsqlite3.so \
112
			lib/sqlite3/pkgIndex.tcl
72
.else
113
.else
73
CONFIGURE_ARGS+=	--disable-tcl
114
CONFIGURE_ARGS+=	--disable-tcl
74
PLIST_SUB+=		WITH_TCLWRAPPER="@comment "
75
.endif
115
.endif
76
116
77
.if !defined(WITHOUT_METADATA)
117
.if !defined(WITHOUT_METADATA)
Lines 79-86 Link Here
79
.endif
119
.endif
80
120
81
.if !defined(WITHOUT_THREADSAFE)
121
.if !defined(WITHOUT_THREADSAFE)
82
CONFIGURE_ARGS+=	--enable-threadsafe \
122
CONFIGURE_ARGS+=	--enable-threadsafe
83
			--enable-threads-override-locks
123
.if !defined(WITHOUT_XTHREAD)
124
CONFIGURE_ARGS+=	--enable-threads-override-locks
125
.endif
126
.if !defined(WITHOUT_OVERRIDE_LOCK)
127
CONFIGURE_ARGS+=	--enable-cross-thread-connections
128
.endif
84
.else
129
.else
85
CONFIGURE_ARGS+=	--disable-threadsafe
130
CONFIGURE_ARGS+=	--disable-threadsafe
86
.endif
131
.endif
Lines 91-96 Link Here
91
CONFIGURE_ARGS+=	--disable-load-extension
136
CONFIGURE_ARGS+=	--disable-load-extension
92
.endif
137
.endif
93
138
139
CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
140
MAKE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
141
94
post-install:
142
post-install:
95
.if defined(WITH_TCLWRAPPER)
143
.if defined(WITH_TCLWRAPPER)
96
	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
144
	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
Lines 100-104 Link Here
100
.if !defined(NO_INSTALL_MANPAGES)
148
.if !defined(NO_INSTALL_MANPAGES)
101
	@${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1
149
	@${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1
102
.endif
150
.endif
151
.ifndef NOPORTDOCS
152
.ifdef WITH_FTS3
153
	@${MKDIR} ${DOCSDIR}
154
	@${INSTALL_DATA} ${WRKSRC}/ext/fts3/README.syntax ${WRKSRC}/ext/fts3/README.tokenizers ${DOCSDIR}
155
.endif
156
.ifdef WITH_RTREE
157
	@${MKDIR} ${DOCSDIR}
158
	@${INSTALL_DATA} ${WRKSRC}/ext/rtree/README ${DOCSDIR}
159
.endif
160
.ifdef WITH_ICU
161
	@${MKDIR} ${DOCSDIR}
162
	@${INSTALL_DATA} ${WRKSRC}/ext/icu/README.txt ${DOCSDIR}
163
.endif
164
.endif
103
165
104
.include <bsd.port.post.mk>
166
.include <bsd.port.mk>
(-)databases/sqlite3/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (sqlite-3.6.23.1.tar.gz) = d99f1b31da0eb33271464bee15cec701
1
MD5 (sqlite-3.7.0.1.tar.gz) = d25d7551ba6bb310362cb0e7d4906f25
2
SHA256 (sqlite-3.6.23.1.tar.gz) = 1a0517438a573a68ab73e8ed75d194086d55d75883542ab1d5ae1080bbddd492
2
SHA256 (sqlite-3.7.0.1.tar.gz) = 9e2c01e581fb554b8b690b4e88af1da23d891c8b5f60e423e81ae00cf714e8fd
3
SIZE (sqlite-3.6.23.1.tar.gz) = 3086807
3
SIZE (sqlite-3.7.0.1.tar.gz) = 3266205
(-)databases/sqlite3/pkg-plist (-14 lines)
Lines 1-14 Link Here
1
bin/sqlite3
2
%%WITH_TCLWRAPPER%%bin/tclsqlite3
3
include/sqlite3.h
4
include/sqlite3ext.h
5
lib/libsqlite3.a
6
lib/libsqlite3.la
7
lib/libsqlite3.so
8
lib/libsqlite3.so.8
9
libdata/pkgconfig/sqlite3.pc
10
%%WITH_TCLWRAPPER%%lib/sqlite3/libtclsqlite3.so
11
%%WITH_TCLWRAPPER%%lib/sqlite3/pkgIndex.tcl
12
%%WITH_TCLWRAPPER%%@dirrm lib/sqlite3
13
%%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl
14
%%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%%

Return to bug 149472