ports/116377: [update] mail/dspam to 3.8.0

[Anton Yuzhaninov]

>Number:         116377
>Category:       ports
>Synopsis:       [update] mail/dspam to 3.8.0
>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:   Sat Sep 15 19:00:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Anton Yuzhaninov
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
Rambler
>Environment:
System: FreeBSD mailsupport.rambler.ru 7.0-CURRENT FreeBSD 7.0-CURRENT #6: Mon Aug 13 17:10:28 MSD 2007 citrin at mailsupport.rambler.ru:/usr/obj/usr/src/sys/MAIL amd64
>Description:
dspam 3.8.0 contains several bug fixes.
Patch below changes version and removes oracle support
(it was removed from dspam, anyway oracle driver was broken).
>How-To-Repeat:
>Fix:
Apply patch

diff -ruN --exclude=CVS /usr/ports/mail/dspam.orig/Makefile /usr/ports/mail/dspam/Makefile
--- /usr/ports/mail/dspam.orig/Makefile 2007-09-13 15:29:09.000000000 +0400
+++ /usr/ports/mail/dspam/Makefile      2007-09-13 17:21:16.000000000 +0400
@@ -12,14 +12,13 @@

 PORTNAME=      dspam
 PORTVERSION=   ${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=  2
 CATEGORIES=    mail
 MASTER_SITES=  # set later

 MAINTAINER=    itetcu at FreeBSD.org
 COMMENT=       Bayesian spam filter - stable maintenance version

-PORTVER_MAJ=   3.6.8
+PORTVER_MAJ=   3.8.0
 #SNAP_DATE=    .20060421.2101

 MIN_OPTIONS_VER=       ${PORTNAME}-3.6.8_1
@@ -57,7 +56,6 @@
 OPTIONS+=      MYSQL_LOCAL "RUN_DEPEND on selected MySQL server ver." off
 OPTIONS+=      POSTGRESQL "Use PostgreSQL as back-end" on
 OPTIONS+=      POSTGRESQL_LOCAL "RUN_DEPEND on PostgreSQL server" off
-OPTIONS+=      ORACLE "Use Oracle as back-end (BROKEN)" off
 OPTIONS+=      SQLITE2 "Use SQLite v2.x as back-end" off
 OPTIONS+=      SQLITE3 "Use SQLite v3.x as back-end" on
 OPTIONS+=      HASH "Use hash driver" on
@@ -200,10 +198,6 @@
 .      endif
 .endif

-# we need to know if we are building statically or dynamicaly for the plist
-_DBDRV_COUNT=  # blank, but defined so we can check against it
-#_DBDRV_ALL=   pgsql_drv,ora_drv,sqlite3_drv,sqlite_drv,hash_drv,mysql_drv
-# above won't work because ORACLE support is broken so
 _DBDRV=                pgsql_drv,sqlite3_drv,sqlite_drv,hash_drv,mysql_drv,

 .ifndef(WITHOUT_POSTGRESQL)
@@ -224,16 +218,6 @@
 _DBDRV:=       ${_DBDRV:S/pgsql_drv,//}
 .endif

-.if defined(WITH_ORACLE)
-#BUILD_DEPENDS=        ${LOCALBASE}/oracle7/rdbms/lib/libnlsrtl3.a:\
-#      ${PORTSDIR}/databases/oracle7-client
-#CONFIGURE_ARGS+=      --with-oracle-home=     ${LOCALBASE}/oracle7
-#PKGNAMESUFFIX=        -oracle
-#_DBDRV_COUNT:=        ${_DBDRV_COUNT}o
-#.else
-#_DBDRV:=      ${_DBDRV:S/ora_drv,//}
-.endif
-
 .ifndef(WITHOUT_SQLITE3)
 USE_SQLITE=    3
 _DBDRV_COUNT:= ${_DBDRV_COUNT}o
@@ -454,9 +438,9 @@
 MLINKS+=       libdspam.3 dspam_detach.3

 _DOCS= CHANGELOG LICENSE README README.FreeBSD RELEASE.NOTES UPGRADING
-_DOCSL=        courier.txt exim.txt markov.txt mysql_drv.txt ora_drv.txt \
+_DOCSL=        courier.txt exim.txt markov.txt mysql_drv.txt osx.txt \
        pgsql_drv.txt pop3filter.txt postfix.txt qmail.txt relay.txt \
-       sendmail.txt sqlite_drv.txt
+       sendmail.txt sqlite_drv.txt tests.txt

 pre-everything::
 .ifndef(MAINT)
@@ -502,8 +486,6 @@
                ${WRKSRC}/src/tools.mysql_drv/purge-4.1.sql
        @${REINPLACE_CMD} -e 's|WHERE CURRENT_DATE - created_on > 14;|WHERE CURRENT_DATE - created_on > ${SIGNATURE_LIFE};|' \
                ${WRKSRC}/src/tools.pgsql_drv/purge.sql
-       @${REINPLACE_CMD} -e 's|where SYSDATE-created_on > 14|where SYSDATE-created_on > ${SIGNATURE_LIFE};|' \
-               ${WRKSRC}/src/tools.ora_drv/purge.sql
        @${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|" \
                ${WRKSRC}/src/tools.sqlite_drv/purge-2.sql
        @${REINPLACE_CMD} -e "s|where julianday('now')-julianday(created_on) > 14;|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};|" \
@@ -598,11 +580,6 @@
        cd ${WRKSRC}/src/tools.sqlite_drv && \
                ${INSTALL_DATA} *.sql ${EXAMPLESDIR}/sqlite
 .endif
-.ifdef(WITH_ORACLE)
-       @${MKDIR} ${EXAMPLESDIR}/oracle
-       cd ${WRKSRC}/src/tools.ora_drv && \
-               ${INSTALL_DATA} *.sql ${EXAMPLESDIR}/oracle
-.endif

 .ifdef(WITH_CGI)
 .      for I in admin.cgi admingraph.cgi configure.pl dspam.cgi graph.cgi
diff -ruN --exclude=CVS /usr/ports/mail/dspam.orig/distinfo /usr/ports/mail/dspam/distinfo
--- /usr/ports/mail/dspam.orig/distinfo 2007-09-13 15:29:09.000000000 +0400
+++ /usr/ports/mail/dspam/distinfo      2007-09-13 17:09:29.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (dspam-3.6.8.tar.gz) = c4b1a7079690ee16d8b0f36b2a2a90a4
-SHA256 (dspam-3.6.8.tar.gz) = 88c7b41fb81e90ba8a260885a1d14bce39f2ef4a06cc2c6b8bfa0b99ba1aec34
-SIZE (dspam-3.6.8.tar.gz) = 743275
+MD5 (dspam-3.8.0.tar.gz) = 056b8c8b3ad9415a52c01b22ff1e64cf
+SHA256 (dspam-3.8.0.tar.gz) = 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
+SIZE (dspam-3.8.0.tar.gz) = 726160
diff -ruN --exclude=CVS /usr/ports/mail/dspam.orig/pkg-plist /usr/ports/mail/dspam/pkg-plist
--- /usr/ports/mail/dspam.orig/pkg-plist        2007-09-13 15:29:09.000000000 +0400
+++ /usr/ports/mail/dspam/pkg-plist     2007-09-13 22:20:45.000000000 +0400
@@ -59,7 +59,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/exim.txt
 %%PORTDOCS%%%%DOCSDIR%%/markov.txt
 %%PORTDOCS%%%%DOCSDIR%%/mysql_drv.txt
-%%PORTDOCS%%%%DOCSDIR%%/ora_drv.txt
+%%PORTDOCS%%%%DOCSDIR%%/osx.txt
 %%PORTDOCS%%%%DOCSDIR%%/pgsql_drv.txt
 %%PORTDOCS%%%%DOCSDIR%%/pop3filter.txt
 %%PORTDOCS%%%%DOCSDIR%%/postfix.txt
@@ -67,6 +67,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/relay.txt
 %%PORTDOCS%%%%DOCSDIR%%/sendmail.txt
 %%PORTDOCS%%%%DOCSDIR%%/sqlite_drv.txt
+%%PORTDOCS%%%%DOCSDIR%%/tests.txt
 %%PORTDOCS%%%%DOCSDIR%%/UPDATING
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: