[138846] trunk/dports/mail/cyrus5-imapd/Portfile

[vince at macports.org]

Revision: 138846
          https://trac.macports.org/changeset/138846
Author:   vince at macports.org
Date:     2015-07-21 04:16:20 -0700 (Tue, 21 Jul 2015)
Log Message:
-----------
cyrus5-imapd: make it work with db versions > 4x

Modified Paths:
--------------
    trunk/dports/mail/cyrus5-imapd/Portfile

Modified: trunk/dports/mail/cyrus5-imapd/Portfile
===================================================================
--- trunk/dports/mail/cyrus5-imapd/Portfile	2015-07-21 10:19:00 UTC (rev 138845)
+++ trunk/dports/mail/cyrus5-imapd/Portfile	2015-07-21 11:16:20 UTC (rev 138846)
@@ -31,17 +31,16 @@
                     patch-Makefile_in.diff
 
 # Check for any db4* installation
-if {[glob ${prefix}/include/db4*] != ""} {
-    set db_list [lsort [glob ${prefix}/include/db4*]]
+if {[glob ${prefix}/include/db*] != ""} {
+    set db_list [lsort [glob ${prefix}/include/db\[0-9\]*]]
     set current_db [lindex ${db_list} end]
-    # Caveat: this works for db44/db46/db48 but will have to be patched for db410
-    set db_ver [string index [lindex [split ${current_db} "/"] end] end]
+    set db_ver [string range [lindex [split ${current_db} "/"] end] end-1 end]
 } else {
-    depends_lib-append   port:db48
+    depends_lib-append   port:db60
 }
 
 pre-fetch {
-    ui_msg "Selected db4${db_ver}"
+    ui_msg "Selected db${db_ver}"
 }
 
 post-patch {
@@ -59,8 +58,8 @@
                     --sysconfdir=${prefix}/etc/cyrus \
                     --with-cyrus-prefix=${prefix} \
                     --with-pidfile=${prefix}/var/run/cyrus-master.pid \
-                    --with-bdb-incdir=${prefix}/include/db4${db_ver} \
-                    --with-bdb-libdir=${prefix}/lib/db4${db_ver} \
+                    --with-bdb-incdir=${prefix}/include/db${db_ver} \
+                    --with-bdb-libdir=${prefix}/lib/db${db_ver} \
                     --with-perl=${prefix}/bin/perl5 \
                     --with-sasl=${prefix} \
                     --with-openssl=${prefix} \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150721/f99e7050/attachment.html>