[105271] trunk/dports/mail

[pixilla at macports.org]

Revision: 105271
          https://trac.macports.org/changeset/105271
Author:   pixilla at macports.org
Date:     2013-04-15 10:30:59 -0700 (Mon, 15 Apr 2013)
Log Message:
-----------
mail/dovecot2:
- Update to version 2.2.0.
mail/dovecot2-antispam:
- Revbump for dovecot2 version change.
- Remove obsolete patch.
mail/dovecot2-sieve:
- Update to version 0.3.1-1751.

Modified Paths:
--------------
    trunk/dports/mail/dovecot2/Portfile
    trunk/dports/mail/dovecot2-antispam/Portfile
    trunk/dports/mail/dovecot2-sieve/Portfile

Added Paths:
-----------
    trunk/dports/mail/dovecot2/files/patch-src-doveadm-doveadm-mail.h.diff

Removed Paths:
-------------
    trunk/dports/mail/dovecot2-antispam/files/

Modified: trunk/dports/mail/dovecot2/Portfile
===================================================================
--- trunk/dports/mail/dovecot2/Portfile	2013-04-15 16:57:14 UTC (rev 105270)
+++ trunk/dports/mail/dovecot2/Portfile	2013-04-15 17:30:59 UTC (rev 105271)
@@ -7,7 +7,7 @@
 set base_name       dovecot
 # Please revbump port:dovecot2-sieve and port:dovecot2-antispam
 # on port:dovecot2 version changes.
-version             2.1.16
+version             2.2.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          mail
 maintainers         pixilla openmaintainer
@@ -39,9 +39,14 @@
 patch.pre_args      -p1
 patchfiles          patch-doc-example-config-conf.d-10-master.conf.diff
 
-checksums           rmd160  ce7bfa421b97b8dbf5ce93b24353bf52a6508542 \
-                    sha256  a61d5fa774615849f6e754232c41a7a87dd0de619f1089627c3682180fa9b447
+# Fix linking errors
+# http://comments.gmane.org/gmane.mail.imap.dovecot/71215
+# http://hg.dovecot.org/dovecot-2.2/rev/a7d0bb66639f
+patchfiles-append   patch-src-doveadm-doveadm-mail.h.diff
 
+checksums           rmd160  24d2485aeaa4a88b4b2f976e9297b4d8cf2530a6 \
+                    sha256  c457a3513f1087852686771505fe6d852c3c21a9353cece63f9efb097bc4750a
+
 post-patch {
     reinplace "s|@@default_internal_user@@|${default_internal_user}|g" \
         ${worksrcpath}/doc/example-config/conf.d/10-master.conf

Added: trunk/dports/mail/dovecot2/files/patch-src-doveadm-doveadm-mail.h.diff
===================================================================
--- trunk/dports/mail/dovecot2/files/patch-src-doveadm-doveadm-mail.h.diff	                        (rev 0)
+++ trunk/dports/mail/dovecot2/files/patch-src-doveadm-doveadm-mail.h.diff	2013-04-15 17:30:59 UTC (rev 105271)
@@ -0,0 +1,18 @@
+# HG changeset patch
+# User Timo Sirainen <tss at iki.fi>
+# Date 1365961247 -10800
+# Node ID a7d0bb66639f956329916020ca6717b8840f842d
+# Parent  4af6b464ef9badeb0aca695f84b4f695ad4f4b15
+Linking error fix.
+
+diff -r 4af6b464ef9b -r a7d0bb66639f src/doveadm/doveadm-mail.h
+--- a/src/doveadm/doveadm-mail.h	Fri Apr 12 21:19:38 2013 +0300
++++ b/src/doveadm/doveadm-mail.h	Sun Apr 14 20:40:47 2013 +0300
+@@ -150,6 +150,6 @@
+ extern struct doveadm_mail_cmd cmd_mailbox_subscribe;
+ extern struct doveadm_mail_cmd cmd_mailbox_unsubscribe;
+ extern struct doveadm_mail_cmd cmd_mailbox_status;
+-struct doveadm_mail_cmd cmd_batch;
++extern struct doveadm_mail_cmd cmd_batch;
+ 
+ #endif

Modified: trunk/dports/mail/dovecot2-antispam/Portfile
===================================================================
--- trunk/dports/mail/dovecot2-antispam/Portfile	2013-04-15 16:57:14 UTC (rev 105270)
+++ trunk/dports/mail/dovecot2-antispam/Portfile	2013-04-15 17:30:59 UTC (rev 105271)
@@ -10,7 +10,7 @@
 
 # Please revbump port:dovecot2-sieve and port:dovecot2-antispam
 # on port:dovecot2 version changes.
-revision            1
+revision            2
 
 categories          mail
 maintainers         pixilla openmaintainer
@@ -34,10 +34,6 @@
 checksums           rmd160  8a9cad15fd2a309bc163eb3a6e4b7a8f9697824e \
                     sha256  22c8b4a75096d5868beee4d950c6f55b20cf493ae6bb491d1a66cc2f4d869b44
 
-patch.pre_args      -p1
-# hg diff -r49:48 > patch-src-signature-log.c.diff
-patchfiles          patch-src-signature-log.c.diff
-
 pre-configure {
     system "cd ${worksrcpath} && ./autogen.sh"
 }

Modified: trunk/dports/mail/dovecot2-sieve/Portfile
===================================================================
--- trunk/dports/mail/dovecot2-sieve/Portfile	2013-04-15 16:57:14 UTC (rev 105270)
+++ trunk/dports/mail/dovecot2-sieve/Portfile	2013-04-15 17:30:59 UTC (rev 105271)
@@ -13,11 +13,11 @@
 # Please keep port:dovecot2 major.minor version in sync.
 # On port:dovecot2 major.minor version change please find the new version
 # of port:dovecot2-sieve.
-set dovecot2        2.1
+set dovecot2        2.2
 
 # set hg.tag to tag or rev.
 hg.tag              ${version}
-hg.tag              1685
+hg.tag              1751
 
 categories          mail
 maintainers         pixilla openmaintainer
@@ -57,8 +57,8 @@
 
 worksrcdir          dovecot-[join [split ${dovecot2} .] -]-pigeonhole-${hg.tag}
 
-checksums           rmd160  5e46e9cdcb4a6ed9d3c9abd37ef3f945be21bc27 \
-                    sha256  bf02e9229ef59d282b91449a6580ea64268644420dc8315d8ed60e903db90642
+checksums           rmd160  2347dba5dd1c681cf6afcac8c4b87a62de382e19 \
+                    sha256  5f790cb5354fc2e48854f586de9c2f09ee8b08e84302af6d90666aa0cff02de3
 
 depends_lib         port:dovecot2
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130415/b4cac4bc/attachment.html>