aboutsummaryrefslogtreecommitdiffstats
path: root/databases/sqlite34
diff options
context:
space:
mode:
Diffstat (limited to 'databases/sqlite34')
-rw-r--r--databases/sqlite34/Makefile63
-rw-r--r--databases/sqlite34/distinfo6
-rw-r--r--databases/sqlite34/pkg-plist12
3 files changed, 45 insertions, 36 deletions
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index 7901074ba9a..6d9234cc56a 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -6,12 +6,8 @@
# $FreeBSD$
#
-# By default, this port depends on TCL for building docs. If you want to build
-# without TCL (and thus get no docs), define NOPORTDOCS.
-# If you want to build the TCL wrapper, you have to define WITH_TCLWRAPPER=yes.
-
PORTNAME= sqlite
-PORTVERSION= 3.3.3
+PORTVERSION= 3.3.4
CATEGORIES= databases
MASTER_SITES= http://www.sqlite.org/
@@ -28,11 +24,13 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}3
-OPTIONS= TCLWRAPPER "TCL wrapper for SQLITE" off
-
DOCSDIR= ${PREFIX}/share/doc/sqlite3
EXAMPLESDIR= ${PREFIX}/share/examples/sqlite3
-PORTDOCS= *
+
+OPTIONS= TCLWRAPPER "TCL wrapper for SQLITE" off \
+ THREADS "Enable threads support" off \
+ DEBUG "Enable debugging & verbose explain" off \
+ DOCS "Building docs (depends on TCL)" on
# Defaults, for building the docs:
TCL_V?= 8.4
@@ -41,45 +39,56 @@ MAKE_ENV+= TCL_VER=${TCL_V}
.include <bsd.port.pre.mk>
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+= tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
-.endif
-
.if defined(WITH_TCLWRAPPER)
-CATEGORIES+= lang
-WITH_TCL= YES
-.endif
-
-.if defined(WITH_TCL)
-PLIST_SUB+= WITH_TCL=""
+CATEGORIES+= lang tcl${TCL_V:S/.//}
+LIB_DEPENDS+= tcl${TCL_V:S/.//}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
+PLIST_SUB+= WITH_TCLWRAPPER=""
.else
-PLIST_SUB+= WITH_TCL="@comment "
CONFIGURE_ARGS+= --disable-tcl
+PLIST_SUB+= WITH_TCLWRAPPER="@comment "
+.endif
+
+.if defined(WITH_THREADS)
+CONFIGURE_ARGS+= --enable-threadsafe
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-debug
+.endif
+
+.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
+BUILD_DEPENDS+= tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
+PORTDOCS= *
.endif
post-patch:
- @${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
- -e "s|\./libtool|${LIBTOOL}|g" -e "s|\$${HAVE_TCL:1=tcl_install}||" \
- ${WRKSRC}/Makefile.in
- @${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
- @${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" >>${WRKSRC}/freebsd.hints
+ @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e "s|tclsh \$$(TOP)|\$$(TCLSH) \$$(TOP)|g" \
+ -e "s|./libtool|${LIBTOOL}|g" \
+ -e "s|\$${HAVE_TCL:1=tcl_install}||" \
+ ${WRKSRC}/Makefile.in
+ @${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" \
+ > ${WRKSRC}/freebsd.hints
+ @${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" \
+ >> ${WRKSRC}/freebsd.hints
post-build:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
@${ECHO_MSG} "===> Building docs"
@(cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc)
.endif
post-install:
-.if defined(WITH_TCL)
+.if defined(WITH_TCLWRAPPER)
@${MKDIR} ${PREFIX}/lib/sqlite
@(cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
libtclsqlite3.la ${PREFIX}/lib/sqlite/)
@${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
.endif
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
.endif
diff --git a/databases/sqlite34/distinfo b/databases/sqlite34/distinfo
index f279a4218eb..51919e47443 100644
--- a/databases/sqlite34/distinfo
+++ b/databases/sqlite34/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.3.3.tar.gz) = eb5d9d7e7853b3af78e767d709b7fced
-SHA256 (sqlite-3.3.3.tar.gz) = 5c6a497d358e6702b0ab400f9ebf90e79900dd4fe50e79e969f960b022d0f8b9
-SIZE (sqlite-3.3.3.tar.gz) = 1642834
+MD5 (sqlite-3.3.4.tar.gz) = e31b390c294c0ea093f0bed3353fdff2
+SHA256 (sqlite-3.3.4.tar.gz) = e61f85a18443cad333257f8d8fd4c211a4c4ffd9bf66b36c4050fa7207f8898a
+SIZE (sqlite-3.3.4.tar.gz) = 1644139
diff --git a/databases/sqlite34/pkg-plist b/databases/sqlite34/pkg-plist
index 4c9676e2cdc..7a71dd9dec1 100644
--- a/databases/sqlite34/pkg-plist
+++ b/databases/sqlite34/pkg-plist
@@ -1,14 +1,14 @@
bin/sqlite3
-%%WITH_TCL%%bin/tclsqlite3
+%%WITH_TCLWRAPPER%%bin/tclsqlite3
include/sqlite3.h
lib/libsqlite3.a
lib/libsqlite3.so
lib/libsqlite3.so.8
libdata/pkgconfig/sqlite3.pc
-%%WITH_TCL%%lib/sqlite/libtclsqlite3.so.8
-%%WITH_TCL%%lib/sqlite/libtclsqlite3.so
-%%WITH_TCL%%lib/sqlite/libtclsqlite3.a
-%%WITH_TCL%%lib/sqlite/pkgIndex.tcl
-%%WITH_TCL%%@dirrm lib/sqlite
+%%WITH_TCLWRAPPER%%lib/sqlite/libtclsqlite3.so.8
+%%WITH_TCLWRAPPER%%lib/sqlite/libtclsqlite3.so
+%%WITH_TCLWRAPPER%%lib/sqlite/libtclsqlite3.a
+%%WITH_TCLWRAPPER%%lib/sqlite/pkgIndex.tcl
+%%WITH_TCLWRAPPER%%@dirrm lib/sqlite
%%EXAMPLESDIR%%/example.tcl
@dirrm %%EXAMPLESDIR%%