Ticket #35701: patch-mail-dspam-improve-storage-drivers.diff

mail/dspam/Portfile

@@ -5 +5 @@
 
 name            dspam
 version         3.10.2
+revision        1
 categories      mail net
 license         AGPL-3
 maintainers     yahoo.com:compconsultant
@@ -27 +28 @@
 
 destroot.keepdirs       ${destroot}${prefix}/var/log/dspam
 
+set storage-driver "hash_drv"
+if {[variant_isset mysql5]} {
+    set storage-driver   "${storage-driver},mysql_drv"
+}
+if {[variant_isset sqlite]} {
+    set storage-driver   "${storage-driver},sqlite3_drv"
+}
+if {[variant_isset postgres]} {
+    set storage-driver   "${storage-driver},pgsql_drv"
+}
+configure.args-append \
+                    --with-storage-driver=${storage-driver}
+if {[variant_isset mysql5] || [variant_isset postgres]} {
+
+    configure.args-append \
+                    --enable-preferences-extension \
+                    --enable-virtual-users
+}
+
 variant vpopmail description {Configure dspam to work with vpopmail} {
                 configure.args-append --with-dspam-home-owner=vpopmail \
                                       --with-dspam-home-group=vchkpw \
@@ -35 +55 @@
                 depends_lib     port:vpopmail
 }
 
-variant mysql5 conflicts postgres sqlite description {Configure dspam to work with mysql5} {
+variant mysql5 description {Configure dspam to work with mysql5} {
                 depends_lib     path:bin/mysql_config5:mysql5
-                configure.args-append --with-storage-driver=mysql_drv \
-                                      --with-mysql-includes=${prefix}/include/mysql5/mysql \
-                                      --with-mysql-libraries=${prefix}/lib/mysql5/mysql \
-                                      --enable-preferences-extension \
-                                      --enable-virtual-users
+                configure.args-append --with-mysql-includes=${prefix}/include/mysql5/mysql \
+                                      --with-mysql-libraries=${prefix}/lib/mysql5/mysql
 }
 
-variant sqlite conflicts postgres mysql5 description {Configure dspam to work with sqlite} {
+variant sqlite description {Configure dspam to work with sqlite} {
                 depends_lib     port:sqlite3
-                configure.args-append --with-sqlite-libaries=${prefix}/lib
+                configure.args-append --with-sqlite-libraries=${prefix}/lib
 }
-variant postgres conflicts sqlite mysql5 description {Configure dspam to work with postgresql80} {
+variant postgres description {Configure dspam to work with postgresql80} {
                 depends_lib     port:postgresql80
-                configure.args-append --with-storage-driver=pgsql_drv \
-                                      --with-pgsql-includes=${prefix}/include/pgsql8 \
-                                      --with-pgsql-libraries=${prefix}/lib/pgsql8
+                configure.args-append --with-pgsql-includes=${prefix}/include/postgresql80 \
+                                      --with-pgsql-libraries=${prefix}/lib/postgresql80
 }
 
+variant debug description {add debug capabilities} {
+                configure.args-append --enable-debug \
+                                      --enable-verbose-debug
+}
+
 post-destroot {
         file rename ${destroot}${prefix}/etc/dspam.conf ${destroot}${prefix}/etc/dspam.conf.sample
         file mkdir ${destroot}${prefix}/var/dspam/samples