[108997] trunk/dports/mail
pixilla at macports.org
pixilla at macports.org
Mon Aug 5 18:17:48 PDT 2013
Revision: 108997
https://trac.macports.org/changeset/108997
Author: pixilla at macports.org
Date: 2013-08-05 18:17:48 -0700 (Mon, 05 Aug 2013)
Log Message:
-----------
mail/dovecot2:
- Update version to 2.2.5.
- Remove obsolete patchfiles.
- Add mysql56 variant.
mail/dovecot2-antispam:
- Update version to 0.0-51.
mail/dovecot2-sieve:
- Update version to 0.4.1.
Modified Paths:
--------------
trunk/dports/mail/dovecot2/Portfile
trunk/dports/mail/dovecot2-antispam/Portfile
trunk/dports/mail/dovecot2-sieve/Portfile
Removed Paths:
-------------
trunk/dports/mail/dovecot2/files/patch-src-doveadm-doveadm-mail.h.diff
trunk/dports/mail/dovecot2/files/patch-src-lib-mail-message-parser.c.diff
Modified: trunk/dports/mail/dovecot2/Portfile
===================================================================
--- trunk/dports/mail/dovecot2/Portfile 2013-08-06 00:25:15 UTC (rev 108996)
+++ trunk/dports/mail/dovecot2/Portfile 2013-08-06 01:17:48 UTC (rev 108997)
@@ -7,8 +7,7 @@
set base_name dovecot
# Please revbump port:dovecot2-sieve and port:dovecot2-antispam
# on port:dovecot2 version changes.
-version 2.2.0
-revision 1
+version 2.2.5
set branch [join [lrange [split ${version} .] 0 1] .]
categories mail
maintainers pixilla openmaintainer
@@ -40,18 +39,9 @@
patch.pre_args -p1
patchfiles patch-doc-example-config-conf.d-10-master.conf.diff
-# 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 ca3c0140fbd04f6543ce423cb4bc0a97214127f6 \
+ sha256 15b2cd607e6533f4805f471a61dd1c8bd81675cecc6ea6361504247dd9af5cf8
-# Don't assert-crash when multipart doesn't actually have any parts.
-# http://hg.dovecot.org/dovecot-2.2/rev/b38d5ebacf25
-patchfiles-append patch-src-lib-mail-message-parser.c.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
@@ -126,7 +116,7 @@
}
variant mysql5 \
- conflicts mysql51 mysql55 mariadb percona \
+ conflicts mysql51 mysql55 mysql56 mariadb percona \
description "Enable MySQL 5.1 support" {
depends_lib-append port:mysql5
@@ -135,7 +125,7 @@
}
variant mysql51 \
- conflicts mysql5 mysql55 mariadb percona \
+ conflicts mysql5 mysql55 mysql56 mariadb percona \
description "Enable MySQL 5.1 support" {
depends_lib-append port:mysql51
@@ -152,8 +142,17 @@
configure.args-append --with-mysql
}
+variant mysql56 \
+ conflicts mysql5 mysql51 mysql55 mariadb percona \
+ description "Enable MySQL 5.5 support" {
+
+ depends_lib-append port:mysql56
+ configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql56/bin/mysql_config
+ configure.args-append --with-mysql
+}
+
variant mariadb \
- conflicts mysql5 mysql51 mysql55 percona \
+ conflicts mysql5 mysql51 mysql55 mysql56 percona \
description "Enable MariaDB (MySQL) support" {
depends_lib-append port:mariadb
@@ -162,7 +161,7 @@
}
variant percona \
- conflicts mysql5 mysql51 mysql55 mariadb \
+ conflicts mysql5 mysql51 mysql55 mysql56 mariadb \
description "Enable Percona (MySQL) support" {
depends_lib-append port:percona
configure.env-append MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
Deleted: trunk/dports/mail/dovecot2/files/patch-src-doveadm-doveadm-mail.h.diff
===================================================================
--- trunk/dports/mail/dovecot2/files/patch-src-doveadm-doveadm-mail.h.diff 2013-08-06 00:25:15 UTC (rev 108996)
+++ trunk/dports/mail/dovecot2/files/patch-src-doveadm-doveadm-mail.h.diff 2013-08-06 01:17:48 UTC (rev 108997)
@@ -1,18 +0,0 @@
-# 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
Deleted: trunk/dports/mail/dovecot2/files/patch-src-lib-mail-message-parser.c.diff
===================================================================
--- trunk/dports/mail/dovecot2/files/patch-src-lib-mail-message-parser.c.diff 2013-08-06 00:25:15 UTC (rev 108996)
+++ trunk/dports/mail/dovecot2/files/patch-src-lib-mail-message-parser.c.diff 2013-08-06 01:17:48 UTC (rev 108997)
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Timo Sirainen <tss at iki.fi>
-# Date 1366035726 -10800
-# Node ID b38d5ebacf25379869b4d5119719f773a26fa077
-# Parent fc9ef7d2251aec477d73bacfec82c0f66cc813b3
-lib-mail: Don't assert-crash when multipart doesn't actually have any parts.
-
-diff -r fc9ef7d2251a -r b38d5ebacf25 src/lib-mail/message-parser.c
---- a/src/lib-mail/message-parser.c Sun Apr 14 21:27:29 2013 +0300
-+++ b/src/lib-mail/message-parser.c Mon Apr 15 17:22:06 2013 +0300
-@@ -839,7 +839,10 @@
- }
- i_stream_skip(ctx->input, offset - ctx->input->v_offset);
-
-- if ((ctx->part->flags & MESSAGE_PART_FLAG_MULTIPART) == 0)
-+ /* multipart messages may begin with --boundary--, which makes them
-+ not have any children. */
-+ if ((ctx->part->flags & MESSAGE_PART_FLAG_MULTIPART) == 0 ||
-+ ctx->part->children == NULL)
- ctx->parse_next_block = preparsed_parse_body_more;
- else
- ctx->parse_next_block = preparsed_parse_prologue_more;
Modified: trunk/dports/mail/dovecot2-antispam/Portfile
===================================================================
--- trunk/dports/mail/dovecot2-antispam/Portfile 2013-08-06 00:25:15 UTC (rev 108996)
+++ trunk/dports/mail/dovecot2-antispam/Portfile 2013-08-06 01:17:48 UTC (rev 108997)
@@ -5,12 +5,12 @@
name dovecot2-antispam
set name_package dovecot-antispam-plugin
-hg.tag 50
+hg.tag 51
version 0.0-${hg.tag}
# Please revbump port:dovecot2-sieve and port:dovecot2-antispam
# on port:dovecot2 version changes.
-revision 2
+revision 0
categories mail
maintainers pixilla openmaintainer
@@ -31,8 +31,8 @@
depends_lib port:dovecot2
depends_build port:autoconf port:automake
-checksums rmd160 8a9cad15fd2a309bc163eb3a6e4b7a8f9697824e \
- sha256 22c8b4a75096d5868beee4d950c6f55b20cf493ae6bb491d1a66cc2f4d869b44
+checksums rmd160 08dd1cd6ae778f6d27aa5dfedb58750ca886c946 \
+ sha256 0fe2ae5d0e42e96fd6c4b0d74cbab1fdc4c67378ab556ca7f455a315c69f4331
pre-configure {
system "cd ${worksrcpath} && ./autogen.sh"
Modified: trunk/dports/mail/dovecot2-sieve/Portfile
===================================================================
--- trunk/dports/mail/dovecot2-sieve/Portfile 2013-08-06 00:25:15 UTC (rev 108996)
+++ trunk/dports/mail/dovecot2-sieve/Portfile 2013-08-06 01:17:48 UTC (rev 108997)
@@ -4,11 +4,11 @@
PortSystem 1.0
name dovecot2-sieve
-version 0.3.4
+version 0.4.1
# set hg.tag to tag or rev.
hg.tag ${version}
-hg.tag 1751
+#hg.tag 1788
# Maintainers: Please revbump port:dovecot2-sieve and port:dovecot2-antispam
# on port:dovecot2 version changes.
@@ -35,33 +35,31 @@
distname ${hg.tag}
use_bzip2 yes
+livecheck.url [lindex ${master_sites} 0]
+livecheck.type regex
+livecheck.version ${hg.tag}
if {${hg.tag} != ${version}} {
- livecheck.url [lindex ${master_sites} 0]
- livecheck.type regex
+ version ${version}-${hg.tag}
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 2347dba5dd1c681cf6afcac8c4b87a62de382e19 \
- sha256 5f790cb5354fc2e48854f586de9c2f09ee8b08e84302af6d90666aa0cff02de3
+checksums rmd160 15cdaf1766032f1f4b994d207c613e708d5e59ef \
+ sha256 78a2529a99011c20c89a116be8a95490175007c8964c526c5fb21b167b66721e
+depends_build port:libtool port:autoconf
depends_lib port:dovecot2
pre-configure {
if {![file exists "${worksrcpath}/configure"]} {
- depends_build-append port:libtool port:autoconf
system "cd ${worksrcpath} && ./autogen.sh"
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130805/c169d8c2/attachment-0001.html>
More information about the macports-changes
mailing list