Attachment #108609 for bug #149472




#

PORTNAME=	sqlite3
PORTVERSION=	3.7.0.1
PORTREVISION=	1
CATEGORIES=	databases
MASTER_SITES=	http://www.sqlite.org/
DISTNAME=	sqlite-${PORTVERSION}

CONFLICTS=	sqlite34-[0-9]*

USE_GMAKE=	YES
USE_GNOME=	pkgconfig gnomehack
USE_LDCONFIG=	YES
GNU_CONFIGURE=	YES
USE_GNOME=	gnomehack
USE_TCL_BUILD=	84+
CONFIGURE_ENV+=	TCLSH_CMD="${TCLSH}" \
		TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \
		ac_cv_search_pthread_create=""

MAN1=		sqlite3.1

OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
		GCOV		"Enable coverage testing using gcov"	off \
		FTS3		"Enable FTS3 (Full Text Search) module"	off \
		RTREE		"Enable R*Tree module"			off \
		ICU		"Enable built with \"ICU\""		off \
		RAMTABLE	"Store temporary tables in RAM"		off \
		SECURE_DELETE	"Overwrite deleted information with zeros" on \
		UNLOCK_NOTIFY	"Enable notification on unlocking"	on \
		TCLWRAPPER	"Enable TCL wrapper"			off \
		METADATA	"Enable column metadata"		on \
		THREADSAFE	"Build thread-safe library"		on \
		OVERRIDE_LOCK	"Threads can override each others locks" on \
		XTHREAD		"Allow connection sharing across threads" off \
		EXTENSION	"Allow loadable extensions"		off

.include <bsd.port.options.mk>

.if !defined(NO_INSTALL_MANPAGES)
MAN1=		sqlite3.1
.endif

.if ${OSVERSION} < 700000
EXTRA_PATCHES+=		${FILESDIR}/pthread_equal_stub

CONFIGURE_ARGS+=	--enable-debug
.endif

.if defined(WITH_GCOV)
CONFIGURE_ARGS+=	--enable-gcov
.endif

.if defined(WITH_FTS3)
CFLAGS+=		-DSQLITE_ENABLE_FTS3=1
.ifndef NOPORTDOCS
PLIST_SUB+=		WITH_FTS3=""
.else
PLIST_SUB+=		WITH_FTS3="@comment "
.endif
.else
PLIST_SUB+=		WITH_FTS3="@comment "
.endif

.if defined(WITH_RTREE)
CFLAGS+=		-DSQLITE_ENABLE_RTREE=1
.ifndef NOPORTDOCS
PLIST_SUB+=		WITH_RTREE=""
.else
PLIST_SUB+=		WITH_RTREE="@comment "
.endif
.else
PLIST_SUB+=		WITH_RTREE="@comment "
.endif

.if defined(WITH_ICU)
BUILD_DEPENDS+=		${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
LIB_DEPENDS+=		icudata.38:${PORTSDIR}/devel/icu
CFLAGS+=		-DSQLITE_ENABLE_ICU=1
CPPFLAGS+=		`${LOCALBASE}/bin/icu-config --cppflags`
LDFLAGS+=		`${LOCALBASE}/bin/icu-config --ldflags`
CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ENV+=		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.ifndef NOPORTDOCS
PLIST_SUB+=		WITH_ICU=""
.else
PLIST_SUB+=		WITH_ICU="@comment "
.endif
.else
PLIST_SUB+=		WITH_ICU="@comment "
.endif

.if defined(WITH_RAMTABLE)
CONFIGURE_ARGS+=	--enable-tempstore=yes
.endif

.if defined(WITH_SECURE_DELETE)
CFLAGS+=		-DSQLITE_SECURE_DELETE=1
.endif

.if defined(WITH_UNLOCK_NOTIFY)
CFLAGS+=		-DSQLITE_ENABLE_UNLOCK_NOTIFY=1
.endif

.if defined(WITH_TCLWRAPPER)
CATEGORIES+=		lang tcl
COMMENT+=		with TCL Wrapper

.endif

.if !defined(WITHOUT_THREADSAFE)
CONFIGURE_ARGS+=	--enable-threadsafe
.if !defined(WITHOUT_XTHREAD)
CONFIGURE_ARGS+=	--enable-threads-override-locks
.endif
.if !defined(WITHOUT_OVERRIDE_LOCK)
CONFIGURE_ARGS+=	--enable-cross-thread-connections
.endif
.else
CONFIGURE_ARGS+=	--disable-threadsafe
.endif

CONFIGURE_ARGS+=	--disable-load-extension
.endif

.if !defined(NOPORTDOCS) && ( defined(WITH_FTS3) || defined(WITH_RTREE) || defined(WITH_ICU) )
PLIST_SUB+=		WITH_DOCSDIR=""
.else
PLIST_SUB+=		WITH_DOCSDIR="@comment "
.endif

post-install:
.if defined(WITH_TCLWRAPPER)
	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin

.if !defined(NO_INSTALL_MANPAGES)
	@${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1
.endif
.ifndef NOPORTDOCS
.	ifdef WITH_FTS3
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/ext/fts3/README.syntax ${WRKSRC}/ext/fts3/README.tokenizers ${DOCSDIR}
.	endif
.	ifdef WITH_RTREE
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/ext/rtree/README ${DOCSDIR}
.	endif
.	ifdef WITH_ICU
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/ext/icu/README.txt ${DOCSDIR}
.	endif
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/usr/ports/databases/sqlite3/distinfo (-3 / +3 lines)
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

Lines 12-14 Link Here

(-)/usr/ports/databases/sqlite3/pkg-plist (+5 lines)
12	%%WITH_TCLWRAPPER%%@dirrm lib/sqlite3	12	%%WITH_TCLWRAPPER%%@dirrm lib/sqlite3
13	%%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl	13	%%WITH_TCLWRAPPER%%%%EXAMPLESDIR%%/example.tcl
14	%%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%%	14	%%WITH_TCLWRAPPER%%@dirrm %%EXAMPLESDIR%%
		15	%%WITH_FTS3%%%%DOCSDIR%%/README.syntax
		16	%%WITH_FTS3%%%%DOCSDIR%%/README.tokenizers
		17	%%WITH_RTREE%%%%DOCSDIR%%/README
		18	%%WITH_ICU%%%%DOCSDIR%%/README.txt
		19	%%WITH_DOCSDIR%%@dirrm %%DOCSDIR%%

Return to bug 149472

Lines 6-13 Link Here

(-)/usr/ports/databases/sqlite3/Makefile (-10 / +84 lines)
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 \
		29	GCOV "Enable coverage testing using gcov" off \
33	FTS3 "Enable FTS3 (Full Text Search) module" off \	30	FTS3 "Enable FTS3 (Full Text Search) module" off \
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	.if !defined(NO_INSTALL_MANPAGES)
		46	MAN1= sqlite3.1
		47	.endif
42		48
43	.if ${OSVERSION} < 700000	49	.if ${OSVERSION} < 700000
44	EXTRA_PATCHES+= ${FILESDIR}/pthread_equal_stub	50	EXTRA_PATCHES+= ${FILESDIR}/pthread_equal_stub
Lines 48-65 Link Here
48	CONFIGURE_ARGS+= --enable-debug	54	CONFIGURE_ARGS+= --enable-debug
49	.endif	55	.endif
50		56
		57	.if defined(WITH_GCOV)
		58	CONFIGURE_ARGS+= --enable-gcov
		59	.endif
		60
51	.if defined(WITH_FTS3)	61	.if defined(WITH_FTS3)
52	CFLAGS+= -DSQLITE_ENABLE_FTS3=1	62	CFLAGS+= -DSQLITE_ENABLE_FTS3=1
		63	.ifndef NOPORTDOCS
		64	PLIST_SUB+= WITH_FTS3=""
		65	.else
		66	PLIST_SUB+= WITH_FTS3="@comment "
		67	.endif
		68	.else
		69	PLIST_SUB+= WITH_FTS3="@comment "
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	PLIST_SUB+= WITH_RTREE=""
		76	.else
		77	PLIST_SUB+= WITH_RTREE="@comment "
		78	.endif
		79	.else
		80	PLIST_SUB+= WITH_RTREE="@comment "
		81	.endif
		82
		83	.if defined(WITH_ICU)
		84	BUILD_DEPENDS+= ${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
		85	LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu
		86	CFLAGS+= -DSQLITE_ENABLE_ICU=1
		87	CPPFLAGS+= `${LOCALBASE}/bin/icu-config --cppflags`
		88	LDFLAGS+= `${LOCALBASE}/bin/icu-config --ldflags`
		89	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		90	MAKE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		91	.ifndef NOPORTDOCS
		92	PLIST_SUB+= WITH_ICU=""
		93	.else
		94	PLIST_SUB+= WITH_ICU="@comment "
		95	.endif
		96	.else
		97	PLIST_SUB+= WITH_ICU="@comment "
57	.endif	98	.endif
58		99
59	.if defined(WITH_RAMTABLE)	100	.if defined(WITH_RAMTABLE)
60	CONFIGURE_ARGS+= --enable-tempstore=yes	101	CONFIGURE_ARGS+= --enable-tempstore=yes
61	.endif	102	.endif
62		103
		104	.if defined(WITH_SECURE_DELETE)
		105	CFLAGS+= -DSQLITE_SECURE_DELETE=1
		106	.endif
		107
		108	.if defined(WITH_UNLOCK_NOTIFY)
		109	CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1
		110	.endif
		111
63	.if defined(WITH_TCLWRAPPER)	112	.if defined(WITH_TCLWRAPPER)
64	CATEGORIES+= lang tcl	113	CATEGORIES+= lang tcl
65	COMMENT+= with TCL Wrapper	114	COMMENT+= with TCL Wrapper
Lines 79-86 Link Here
79	.endif	128	.endif
80		129
81	.if !defined(WITHOUT_THREADSAFE)	130	.if !defined(WITHOUT_THREADSAFE)
82	CONFIGURE_ARGS+= --enable-threadsafe \	131	CONFIGURE_ARGS+= --enable-threadsafe
83	--enable-threads-override-locks	132	.if !defined(WITHOUT_XTHREAD)
		133	CONFIGURE_ARGS+= --enable-threads-override-locks
		134	.endif
		135	.if !defined(WITHOUT_OVERRIDE_LOCK)
		136	CONFIGURE_ARGS+= --enable-cross-thread-connections
		137	.endif
84	.else	138	.else
85	CONFIGURE_ARGS+= --disable-threadsafe	139	CONFIGURE_ARGS+= --disable-threadsafe
86	.endif	140	.endif
Lines 91-96 Link Here
91	CONFIGURE_ARGS+= --disable-load-extension	145	CONFIGURE_ARGS+= --disable-load-extension
92	.endif	146	.endif
93		147
		148	.if !defined(NOPORTDOCS) && ( defined(WITH_FTS3) \|\| defined(WITH_RTREE) \|\| defined(WITH_ICU) )
		149	PLIST_SUB+= WITH_DOCSDIR=""
		150	.else
		151	PLIST_SUB+= WITH_DOCSDIR="@comment "
		152	.endif
		153
94	post-install:	154	post-install:
95	.if defined(WITH_TCLWRAPPER)	155	.if defined(WITH_TCLWRAPPER)
96	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin	156	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
Lines 100-104 Link Here
100	.if !defined(NO_INSTALL_MANPAGES)	160	.if !defined(NO_INSTALL_MANPAGES)
101	@${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1	161	@${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1
102	.endif	162	.endif
		163	.ifndef NOPORTDOCS
		164	. ifdef WITH_FTS3
		165	@${MKDIR} ${DOCSDIR}
		166	@${INSTALL_DATA} ${WRKSRC}/ext/fts3/README.syntax ${WRKSRC}/ext/fts3/README.tokenizers ${DOCSDIR}
		167	. endif
		168	. ifdef WITH_RTREE
		169	@${MKDIR} ${DOCSDIR}
		170	@${INSTALL_DATA} ${WRKSRC}/ext/rtree/README ${DOCSDIR}
		171	. endif
		172	. ifdef WITH_ICU
		173	@${MKDIR} ${DOCSDIR}
		174	@${INSTALL_DATA} ${WRKSRC}/ext/icu/README.txt ${DOCSDIR}
		175	. endif
		176	.endif
103		177
104	.include <bsd.port.post.mk>	178	.include <bsd.port.mk>