Date: Mon, 6 Dec 2004 18:39:10 +0800 (CST) From: Gea-Suan Lin <gslin@netnews.NCTU.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gslin@netnews.NCTU.edu.tw Subject: ports/74761: Update port: mail/dspam Message-ID: <20041206103910.2C6E86B@netnews.NCTU.edu.tw> Resent-Message-ID: <200412061040.iB6AeKg5025613@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74761
>Category: ports
>Synopsis: Update port: mail/dspam
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 06 10:40:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Gea-Suan Lin
>Release: FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD netnews.NCTU.edu.tw 4.10-RELEASE-p2 FreeBSD 4.10-RELEASE-p2 #0: Tue Aug 10 21:24:00 CST 2004 root@netnews.NCTU.edu.tw:/da1/usr.obj/da0/usr.src/sys/NETNEWS i386
>Description:
* Add support for mysql 5.0.x
* Fix install failed in dspam-mysql. (WITH_MYSQL problem)
There is no change for package, so it's no need to bump PORTREVISION.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/mail/dspam/Makefile dspam/Makefile
--- /usr/ports/mail/dspam/Makefile Thu Dec 2 04:34:40 2004
+++ dspam/Makefile Mon Dec 6 18:34:56 2004
@@ -48,6 +48,7 @@
## back-end
OPTIONS+= MYSQL40 "Use MySQL 4.0.x as back-end" off
OPTIONS+= MYSQL41 "Use MySQL 4.1.x as back-end" off
+OPTIONS+= MYSQL50 "Use MySQL 5.0.x as back-end" off
OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off
OPTIONS+= POSTGRESQL73 "Use PostgreSQL v.7.3 as back-end" off
OPTIONS+= POSTGRESQL74 "Use PostgreSQL v.7.4 as back-end" off
@@ -252,9 +253,13 @@
.elseif defined(WITH_MYSQL41)
WANT_MYSQL_VER= 41
#PKGNAMESUFFIX= -mysql41
+.elseif defined(WITH_MYSQL50)
+WANT_MYSQL_VER= 50
+#PKGNAMESUFFIX= -mysql50
.endif
-.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41)
+.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || defined(WITH_MYSQL50)
+HAVE_MYSQL= yes
CONFIGURE_ARGS+= --with-storage-driver=mysql_drv \
--with-mysql-includes=${LOCALBASE}/include/mysql \
--with-mysql-libraries=${LOCALBASE}/lib/mysql
@@ -330,7 +335,7 @@
.endif
.if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} || defined(WITH_SQLITE)
-# DBDRV_COUNT==!(defined(WITH_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE) || defined(WITH_BDB))
+# DBDRV_COUNT==!(defined(HAVE_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE) || defined(WITH_BDB))
WITH_SQLITE= on
LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite
CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv \
@@ -551,16 +556,16 @@
@${ECHO_CMD} "You can use one and only one database back-end at once."
@${FALSE}
.endif
-.if defined(WITH_NEURAL_NET) && !(defined(WITH_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74))
+.if defined(WITH_NEURAL_NET) && !(defined(HAVE_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74))
@${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking."
@${FALSE}
.endif
-.if defined(WITH_VIRT_USERS) && !(defined(WITH_MYSQL) || \
+.if defined(WITH_VIRT_USERS) && !(defined(HAVE_MYSQL) || \
defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE))
@${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users."
@${FALSE}
.endif
-.if defined(WITH_PREF_EXT) && !( defined(WITH_MYSQL) || \
+.if defined(WITH_PREF_EXT) && !(defined(HAVE_MYSQL) || \
defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) )
@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
@${FALSE}
@@ -579,7 +584,7 @@
# @${MKDIR} ${LOG_DIR}
# @${MKDIR} ${DSPAM_HOME}
-.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41)
+.if defined(HAVE_MYSQL)
@${MKDIR} ${EXAMPLESDIR}/mysql
cd ${WRKSRC}/tools.mysql_drv && \
${INSTALL_DATA} README mysql_objects-space.sql \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041206103910.2C6E86B>