pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/dspam * Enable support for sqlite3 storage driver.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5287be25201f
branches: trunk
changeset: 492497:5287be25201f
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Thu Apr 14 05:32:37 2005 +0000
description:
* Enable support for sqlite3 storage driver.
* Don't enable daemon mode globally, only for mysql/pgsql.
diffstat:
mail/dspam/Makefile | 12 ++++++++----
mail/dspam/options.mk | 14 ++++++++++++--
2 files changed, 20 insertions(+), 6 deletions(-)
diffs (78 lines):
diff -r a79b024f3337 -r 5287be25201f mail/dspam/Makefile
--- a/mail/dspam/Makefile Thu Apr 14 05:00:16 2005 +0000
+++ b/mail/dspam/Makefile Thu Apr 14 05:32:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/14 04:59:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.28 2005/04/14 05:32:37 xtraeme Exp $
DISTNAME= dspam-3.4.4
CATEGORIES= mail
@@ -64,8 +64,7 @@
--with-dspam-group=${DSPAM_GROUP} \
--with-dspam-mode=${DSPAM_BINMODE} \
--with-logdir=${DSPAM_LOGDIR} \
- --sysconfdir=${PKG_SYSCONFDIR} \
- --enable-daemon
+ --sysconfdir=${PKG_SYSCONFDIR}
.include "options.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
@@ -127,7 +126,7 @@
'-s|./configure.pl.*$$||' . ${DATADIR}/${d}
.endfor
.undef d
-.for drv in mysql pgsql sqlite
+.for drv in mysql pgsql
. if !empty(DSPAM_STORAGE_DRIVER:M${drv})
${INSTALL_DATA_DIR} ${DATADIR}/${drv}
cd ${WRKSRC}/src/tools.${drv}_drv && \
@@ -135,5 +134,10 @@
. endif
.endfor
.undef drv
+.if !empty(DSPAM_STORAGE_DRIVER:Msqlite*)
+ ${INSTALL_DATA_DIR} ${DATADIR}/sqlite
+ cd ${WRKSRC}/src/tools.sqlite_drv && \
+ ${PAX} -rwppm '-s|.*/Makefile.*$$||' . ${DATADIR}/sqlite
+.endif
.include "../../mk/bsd.pkg.mk"
diff -r a79b024f3337 -r 5287be25201f mail/dspam/options.mk
--- a/mail/dspam/options.mk Thu Apr 14 05:00:16 2005 +0000
+++ b/mail/dspam/options.mk Thu Apr 14 05:32:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2005/03/21 21:35:52 xtraeme Exp $
+# $NetBSD: options.mk,v 1.8 2005/04/14 05:32:37 xtraeme Exp $
.if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
@@ -40,7 +40,7 @@
### This is the backend database used to store the DSPAM signatures as
### well as other state information. The recommended storage driver is
### "mysql", even for small installations.
-### Possible: mysql, pgsql, bdb or sqlite
+### Possible: mysql, pgsql, bdb, sqlite or sqlite3
### Default: sqlite
###
DSPAM_STORAGE_DRIVER?= sqlite
@@ -70,10 +70,20 @@
. include "../../databases/sqlite/buildlink3.mk"
CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv
SQLITE_PLIST_SUBST= SQLITE=
+.elif !empty(DSPAM_STORAGE_DRIVER:Msqlite3)
+. include "../../databases/sqlite3/buildlink3.mk"
+CONFIGURE_ARGS+= --with-storage-driver=sqlite3_drv
+SQLITE_PLIST_SUBST+= SQLITE=
.else
PKG_FAIL_REASON+= "${PKGBASE}: unknown storage driver \`${DSPAM_STORAGE_DRIVER}\'"
.endif
+# daemon mode only supports MySQL and PostgreSQL
+.if !empty(DSPAM_STORAGE_DRIVER:Mmysql) || \
+ !empty(DSPAM_STORAGE_DRIVER:Mpgsql)
+CONFIGURE_ARGS+= --enable-daemon
+.endif
+
MYSQL_PLIST_SUBST?= MYSQL="@comment "
PGSQL_PLIST_SUBST?= PGSQL="@comment "
SQLITE_PLIST_SUBST?= SQLITE="@comment "
Home |
Main Index |
Thread Index |
Old Index