mail/dovecot2*:

- Upgrade versions.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@92302 d073be05-634f-4543-b044-5fe20cf6d1d6

mail/dovecot2-antispam/Portfile

@@ -5,9 +5,12 @@ PortSystem          1.0
 
 name                dovecot2-antispam
 set name_package    dovecot-antispam-plugin
-version             hg.5e8351bcfb29
-revision            2
-set hgcs            [join [lrange [split ${version} .] 1 1]]
+hg.tag              47
+version             0.0-${hg.tag}
+
+# Please revbump port:dovecot2-sieve and port:dovecot2-antispam
+# on port:dovecot2 version changes.
+revision            0
 categories          mail
 maintainers         pixilla
 platforms           darwin
@@ -18,19 +21,22 @@ long_description    ${description}
 homepage            http://hg.dovecot.org/${name_package}/
 master_sites        http://hg.dovecot.org/${name_package}/archive/
 use_bzip2           yes
-distfiles           ${hgcs}${extract.suffix}
-worksrcdir          ${name_package}-${hgcs}
+distfiles           ${hg.tag}${extract.suffix}
+worksrcdir          ${name_package}-${hg.tag}
 
 depends_lib         port:dovecot2
 depends_build       port:autoconf port:automake
 
 patchfiles          patch-m4-buildsys.m4.diff
 
-checksums           rmd160  88cc235c48a3ed6266ccf6268d2b57a1a873e210 \
-                    sha256  495eb6564e387c7f3b1f1136a2bb5f86084c1294411afb4d86b5a4d9c74e45b6
+checksums           rmd160  53dc787eac3f696b92a8c3c07ec85b8db0349f36 \
+                    sha256  924c297f883ffd9736747718aa861bd67a59bb2dddcff6b290cc2236eced47ed
 
 pre-configure {
     system "cd ${worksrcpath} && ./autogen.sh"
 }
 
-livecheck.type      none
+livecheck.type      regex
+livecheck.url       http://hg.dovecot.org/dovecot-antispam-plugin/log/
+livecheck.version   ${hg.tag}
+livecheck.regex     " rev (\[0-9\]+)</i><br/>"

mail/dovecot2-sieve/Portfile

@@ -5,9 +5,20 @@ PortSystem          1.0
 
 name                dovecot2-sieve
 version             0.3.0
-# Please revbump port:dovecot2-sieve on port:dovecot2 version changes.
+
+# Please revbump port:dovecot2-sieve and port:dovecot2-antispam
+# on port:dovecot2 version changes.
 revision            0
+
+# 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 hg.tag to tag or rev.
+hg.tag              ${version}
+hg.tag              1616
+
 categories          mail
 maintainers         pixilla
 platforms           darwin
@@ -17,17 +28,38 @@ description         Pigeonhole sieve and managesieve plugins for dovecot
 long_description    ${description}
 
 homepage            http://pigeonhole.dovecot.org/
-master_sites        http://www.rename-it.nl/dovecot/2.1/
-distname            dovecot-${dovecot2}-pigeonhole-${version}
+master_sites        http://hg.rename-it.nl/dovecot-${dovecot2}-pigeonhole/archive/
 
-checksums           rmd160  64692b03b60079b9ed22b069de947da7f4a32114 \
-                    sha256  2aeee8aa6dc700483b0a5a3d31f535abce71698ed1d467f11e931aeace2b0ada
+distname            ${hg.tag}
+use_bzip2           yes
+
+if {${hg.tag} != ${version}} {
+    version             ${version}-${hg.tag}
+
+    livecheck.url       [lindex ${master_sites} 0]
+    livecheck.type      regex
+    livecheck.url       http://hg.rename-it.nl/dovecot-${dovecot2}-pigeonhole/log
+    livecheck.version   ${hg.tag}
+    livecheck.regex     "\\] rev (\[0-9\]+)</i>"
+} else {
+
+    livecheck.url       [lindex ${master_sites} 0]
+    livecheck.type      regex
+    livecheck.url       http://hg.rename-it.nl/dovecot-${dovecot2}-pigeonhole/tags
+    livecheck.version   ${hg.tag}
+    livecheck.regex     "<b>(\[0-9\.\]+)</b>"
+}
+
+worksrcdir          dovecot-[join [split ${dovecot2} .] -]-pigeonhole-${hg.tag}
+
+checksums           rmd160  e11663bb12ed6a546372a2e5abc2094be8ef9c9b \
+                    sha256  46a1094e9a933a732f1fd536e99b36683ab7c8af6371cd7c1e97ef145ce2a839
 
 depends_lib         port:dovecot2
 
+pre-configure {
+    system "cd ${worksrcpath} && ./autogen.sh"
+}
+
 configure.args      --with-dovecot=${prefix}/lib/dovecot \
                     --with-managesieve=yes
-
-livecheck.url       [lindex ${master_sites} 0]
-livecheck.type      regex
-livecheck.regex     "\"dovecot-${dovecot2}-pigeonhole-((?!\\${extract.suffix}).*)\\${extract.suffix}\""

mail/dovecot2/Portfile

@@ -5,8 +5,9 @@ PortSystem          1.0
 
 name                dovecot2
 set base_name       dovecot
-# Please revbump port:dovecot2-sieve on port:dovecot2 version changes.
-version             2.1.4
+# Please revbump port:dovecot2-sieve and port:dovecot2-antispam
+# on port:dovecot2 version changes.
+version             2.1.5
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          mail
 maintainers         pixilla
@@ -38,8 +39,8 @@ add_users ${default_login_user} group=${default_login_user} realname=Dovenull
 
 patchfiles          patch-doc-example-config-conf.d-10-master.conf.diff
 
-checksums           rmd160  b5df814f3aca6611a571a3ae16a8323be76128ea \
-                    sha256  366be58966448ab3c4ad8f46bbc4bc7dcca2da475842128ae376ab123a2c7e69
+checksums           rmd160  ae79cdacffc115fc7a5aaa9d175cb82f0a77492a \
+                    sha256  94df927aa9f5edb7c86973292c42310e5a7f6c3af50a36436b66b49d31747050
 
 post-patch {
     reinplace "s|@@default_internal_user@@|${default_internal_user}|g" \