Attachment #109162 for bug #150119




#

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

MAINTAINER=	pol@opk.ru
COMMENT=	An SQL database engine in a C library

LICENSE=	unknown
LICENSE_NAME=	Public Domain
LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
LICENSE_TEXT=	Description of the license can be obtained from the following URL: http://www.sqlite.org/copyright.html

CONFLICTS=	sqlite34-[0-9]*

USE_GMAKE=	YES

		TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \
		ac_cv_search_pthread_create=""

# Compilation Options For SQLite http://www.sqlite.org/compile.html
OPTIONS=	\
		FTS3		"Enable FTS3 (Full Text Search) module"	on \
		ICU		"Enable built with \"ICU\""		off \
		RTREE		"Enable R*Tree module"			off \
		RAMTABLE	"Store temporary tables in RAM"		off \
		UPD_DEL_LIMIT	"ORDER BY and LIMIT on UPDATE and DELETE" off \
		SOUNDEX		"Enables the soundex() SQL function"	off \
		METADATA	"Enable column metadata"		on \
		STAT2		"Help SQLite to chose a better query plan" off \
		MEMMAN		"Allows it to release unused memory"	off \
		SECURE_DELETE	"Overwrite deleted information with zeros" on \
		UNLOCK_NOTIFY	"Enable notification on unlocking"	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"		on \
		TCLWRAPPER	"Enable TCL wrapper"			off \
		DEBUG		"Enable debugging & verbose explain"	off \
		GCOV		"Enable coverage testing using gcov"	off \

.include <bsd.port.options.mk>

PLIST_FILES=	bin/sqlite3 include/sqlite3.h include/sqlite3ext.h \
		lib/libsqlite3.a lib/libsqlite3.la lib/libsqlite3.so \
		lib/libsqlite3.so.8 libdata/pkgconfig/sqlite3.pc
PORTDOCS=	*

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


.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=	--enable-debug
CFLAGS+=		-Wall
.endif

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

.if defined(WITH_MEMMAN)
CFLAGS+=		-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
.endif

.if defined(WITH_UPD_DEL_LIMIT)
CFLAGS+=		-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
.endif

.if defined(WITH_SOUNDEX)
CFLAGS+=		-DSQLITE_SOUNDEX=1
.endif

.if defined(WITH_STAT2)
CFLAGS+=		-DSQLITE_ENABLE_STAT2=1
.endif

.if defined(WITH_FTS3)
CFLAGS+=		-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
.endif

.if defined(WITH_RTREE)
CFLAGS+=		-DSQLITE_ENABLE_RTREE=1
.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`
.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
USE_TCL_BUILD=		84+
USE_TCL_RUN=		84+
CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR}
PLIST_SUB+=		WITH_TCLWRAPPER=""
ALL_TARGET=		all tclsqlite3
INSTALL_TARGET=		install tcl_install
CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR}
PORTEXAMPLES+=		example.tcl
PLIST_DIRS+=		lib/sqlite3
PLIST_FILES+=		bin/tclsqlite3 lib/sqlite3/libtclsqlite3.so \
			lib/sqlite3/pkgIndex.tcl
.else
CONFIGURE_ARGS+=	--disable-tcl
PLIST_SUB+=		WITH_TCLWRAPPER="@comment "
.endif

.if !defined(WITHOUT_METADATA)

.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

CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

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.2.tar.gz) = 5f1853c4c1eba3330b6104f274918673
2	SHA256 (sqlite-3.6.23.1.tar.gz) = 1a0517438a573a68ab73e8ed75d194086d55d75883542ab1d5ae1080bbddd492	2	SHA256 (sqlite-3.7.2.tar.gz) = bb53cad58f1c502662644d88e24a552dc8de982d650f80d8debaf13b15bb3b8a
3	SIZE (sqlite-3.6.23.1.tar.gz) = 3086807	3	SIZE (sqlite-3.7.2.tar.gz) = 3309139

Line 0 Link Here

(-)/usr/ports/databases/sqlite3/files/patch-src-os_unix.c (+11 lines)
	1	--- src/os_unix.c.orig 2010-08-31 10:44:29.000000000 +0400
	2	+++ src/os_unix.c 2010-08-31 10:44:48.000000000 +0400
	3	@@ -4841,7 +4841,7 @@
	4	char *zErr;
	5	UNUSED_PARAMETER(NotUsed);
	6	unixEnterMutex();
	7	- zErr = dlerror();
	8	+ zErr = (char *)dlerror();
	9	if( zErr ){
	10	sqlite3_snprintf(nBuf, zBufOut, "%s", zErr);
	11	}




bin/sqlite3
%%WITH_TCLWRAPPER%%bin/tclsqlite3
include/sqlite3.h
include/sqlite3ext.h
lib/libsqlite3.a
lib/libsqlite3.la
lib/libsqlite3.so
lib/libsqlite3.so.8
libdata/pkgconfig/sqlite3.pc
%%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%%

Return to bug 150119

Lines 6-20 Link Here

(-)/usr/ports/databases/sqlite3/Makefile (-16 / +98 lines)
6	#	6	#
7		7
8	PORTNAME= sqlite3	8	PORTNAME= sqlite3
9	PORTVERSION= 3.6.23.1	9	PORTVERSION= 3.7.2
10	PORTREVISION= 3
11	CATEGORIES= databases	10	CATEGORIES= databases
12	MASTER_SITES= http://www.sqlite.org/	11	MASTER_SITES= http://www.sqlite.org/ http://www2.sqlite.org/
13	DISTNAME= sqlite-${PORTVERSION}	12	DISTNAME= sqlite-${PORTVERSION}
14		13
15	MAINTAINER= pol@opk.ru	14	MAINTAINER= pol@opk.ru
16	COMMENT= An SQL database engine in a C library	15	COMMENT= An SQL database engine in a C library
17		16
		17	LICENSE= unknown
		18	LICENSE_NAME= Public Domain
		19	LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
		20	LICENSE_TEXT= Description of the license can be obtained from the following URL: http://www.sqlite.org/copyright.html
		21
18	CONFLICTS= sqlite34-[0-9]*	22	CONFLICTS= sqlite34-[0-9]*
19		23
20	USE_GMAKE= YES	24	USE_GMAKE= YES
Lines 26-41 Link Here
26	TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \	30	TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \
27	ac_cv_search_pthread_create=""	31	ac_cv_search_pthread_create=""
28		32
29	OPTIONS= DEBUG "Enable debugging & verbose explain" off \	33	# Compilation Options For SQLite http://www.sqlite.org/compile.html
30	FTS3 "Enable FTS3 (Full Text Search) module" off \	34	OPTIONS= \
		35	FTS3 "Enable FTS3 (Full Text Search) module" on \
		36	ICU "Enable built with \"ICU\"" off \
31	RTREE "Enable R*Tree module" off \	37	RTREE "Enable R*Tree module" off \
32	RAMTABLE "Store temporary tables in RAM" off \	38	RAMTABLE "Store temporary tables in RAM" off \
33	TCLWRAPPER "Enable TCL wrapper" off \	39	UPD_DEL_LIMIT "ORDER BY and LIMIT on UPDATE and DELETE" off \
		40	SOUNDEX "Enables the soundex() SQL function" off \
34	METADATA "Enable column metadata" on \	41	METADATA "Enable column metadata" on \
		42	STAT2 "Help SQLite to chose a better query plan" off \
		43	MEMMAN "Allows it to release unused memory" off \
		44	SECURE_DELETE "Overwrite deleted information with zeros" on \
		45	UNLOCK_NOTIFY "Enable notification on unlocking" on \
35	THREADSAFE "Build thread-safe library" on \	46	THREADSAFE "Build thread-safe library" on \
36	EXTENSION "Allow loadable extensions" on	47	OVERRIDE_LOCK "Threads can override each others locks" on \
		48	XTHREAD "Allow connection sharing across threads" off \
		49	EXTENSION "Allow loadable extensions" on \
		50	TCLWRAPPER "Enable TCL wrapper" off \
		51	DEBUG "Enable debugging & verbose explain" off \
		52	GCOV "Enable coverage testing using gcov" off \
		53
		54	.include <bsd.port.options.mk>
37		55
38	.include <bsd.port.pre.mk>	56	PLIST_FILES= bin/sqlite3 include/sqlite3.h include/sqlite3ext.h \
		57	lib/libsqlite3.a lib/libsqlite3.la lib/libsqlite3.so \
		58	lib/libsqlite3.so.8 libdata/pkgconfig/sqlite3.pc
		59	PORTDOCS= *
39		60
40	.if !defined(NO_INSTALL_MANPAGES)	61	.if !defined(NO_INSTALL_MANPAGES)
41	MAN1= sqlite3.1	62	MAN1= sqlite3.1
Lines 47-78 Link Here
47		68
48	.if defined(WITH_DEBUG)	69	.if defined(WITH_DEBUG)
49	CONFIGURE_ARGS+= --enable-debug	70	CONFIGURE_ARGS+= --enable-debug
		71	CFLAGS+= -Wall
		72	.endif
		73
		74	.if defined(WITH_GCOV)
		75	CONFIGURE_ARGS+= --enable-gcov
		76	LDFLAGS+= -fstack-protector
		77	.endif
		78
		79	.if defined(WITH_MEMMAN)
		80	CFLAGS+= -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
		81	.endif
		82
		83	.if defined(WITH_UPD_DEL_LIMIT)
		84	CFLAGS+= -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
		85	.endif
		86
		87	.if defined(WITH_SOUNDEX)
		88	CFLAGS+= -DSQLITE_SOUNDEX=1
		89	.endif
		90
		91	.if defined(WITH_STAT2)
		92	CFLAGS+= -DSQLITE_ENABLE_STAT2=1
50	.endif	93	.endif
51		94
52	.if defined(WITH_FTS3)	95	.if defined(WITH_FTS3)
53	CFLAGS+= -DSQLITE_ENABLE_FTS3=1	96	CFLAGS+= -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
54	.endif	97	.endif
55		98
56	.if defined(WITH_RTREE)	99	.if defined(WITH_RTREE)
57	CFLAGS+= -DSQLITE_ENABLE_RTREE=1	100	CFLAGS+= -DSQLITE_ENABLE_RTREE=1
58	.endif	101	.endif
59		102
		103	.if defined(WITH_ICU)
		104	BUILD_DEPENDS+= ${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
		105	LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu
		106	CFLAGS+= -DSQLITE_ENABLE_ICU=1
		107	CPPFLAGS+= `${LOCALBASE}/bin/icu-config --cppflags`
		108	LDFLAGS+= `${LOCALBASE}/bin/icu-config --ldflags`
		109	.endif
		110
60	.if defined(WITH_RAMTABLE)	111	.if defined(WITH_RAMTABLE)
61	CONFIGURE_ARGS+= --enable-tempstore=yes	112	CONFIGURE_ARGS+= --enable-tempstore=yes
62	.endif	113	.endif
63		114
		115	.if defined(WITH_SECURE_DELETE)
		116	CFLAGS+= -DSQLITE_SECURE_DELETE=1
		117	.endif
		118
		119	.if defined(WITH_UNLOCK_NOTIFY)
		120	CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1
		121	.endif
		122
64	.if defined(WITH_TCLWRAPPER)	123	.if defined(WITH_TCLWRAPPER)
65	CATEGORIES+= lang tcl	124	CATEGORIES+= lang tcl
66	COMMENT+= with TCL Wrapper	125	COMMENT+= with TCL Wrapper
67	USE_TCL_BUILD= 84+
68	USE_TCL_RUN= 84+	126	USE_TCL_RUN= 84+
69	CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR}
70	PLIST_SUB+= WITH_TCLWRAPPER=""
71	ALL_TARGET= all tclsqlite3	127	ALL_TARGET= all tclsqlite3
72	INSTALL_TARGET= install tcl_install	128	INSTALL_TARGET= install tcl_install
		129	CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR}
		130	PORTEXAMPLES+= example.tcl
		131	PLIST_DIRS+= lib/sqlite3
		132	PLIST_FILES+= bin/tclsqlite3 lib/sqlite3/libtclsqlite3.so \
		133	lib/sqlite3/pkgIndex.tcl
73	.else	134	.else
74	CONFIGURE_ARGS+= --disable-tcl	135	CONFIGURE_ARGS+= --disable-tcl
75	PLIST_SUB+= WITH_TCLWRAPPER="@comment "
76	.endif	136	.endif
77		137
78	.if !defined(WITHOUT_METADATA)	138	.if !defined(WITHOUT_METADATA)
Lines 80-87 Link Here
80	.endif	140	.endif
81		141
82	.if !defined(WITHOUT_THREADSAFE)	142	.if !defined(WITHOUT_THREADSAFE)
83	CONFIGURE_ARGS+= --enable-threadsafe \	143	CONFIGURE_ARGS+= --enable-threadsafe
84	--enable-threads-override-locks	144	.if !defined(WITHOUT_XTHREAD)
		145	CONFIGURE_ARGS+= --enable-threads-override-locks
		146	.endif
		147	.if !defined(WITHOUT_OVERRIDE_LOCK)
		148	CONFIGURE_ARGS+= --enable-cross-thread-connections
		149	.endif
85	.else	150	.else
86	CONFIGURE_ARGS+= --disable-threadsafe	151	CONFIGURE_ARGS+= --disable-threadsafe
87	.endif	152	.endif
Lines 92-97 Link Here
92	CONFIGURE_ARGS+= --disable-load-extension	157	CONFIGURE_ARGS+= --disable-load-extension
93	.endif	158	.endif
94		159
		160	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		161	MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		162
95	post-install:	163	post-install:
96	.if defined(WITH_TCLWRAPPER)	164	.if defined(WITH_TCLWRAPPER)
97	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin	165	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
Lines 101-105 Link Here
101	.if !defined(NO_INSTALL_MANPAGES)	169	.if !defined(NO_INSTALL_MANPAGES)
102	@${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1	170	@${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1
103	.endif	171	.endif
		172	.ifndef NOPORTDOCS
		173	.ifdef WITH_FTS3
		174	@${MKDIR} ${DOCSDIR}
		175	@${INSTALL_DATA} ${WRKSRC}/ext/fts3/README.syntax ${WRKSRC}/ext/fts3/README.tokenizers ${DOCSDIR}
		176	.endif
		177	.ifdef WITH_RTREE
		178	@${MKDIR} ${DOCSDIR}
		179	@${INSTALL_DATA} ${WRKSRC}/ext/rtree/README ${DOCSDIR}
		180	.endif
		181	.ifdef WITH_ICU
		182	@${MKDIR} ${DOCSDIR}
		183	@${INSTALL_DATA} ${WRKSRC}/ext/icu/README.txt ${DOCSDIR}
		184	.endif
		185	.endif
104		186
105	.include <bsd.port.post.mk>	187	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)/usr/ports/databases/sqlite3/pkg-plist (-14 lines)
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%%