[129759] trunk/dports/mail/cyrus-imapd
devans at macports.org
devans at macports.org
Fri Dec 19 15:59:34 PST 2014
Revision: 129759
https://trac.macports.org/changeset/129759
Author: devans at macports.org
Date: 2014-12-19 15:59:34 -0800 (Fri, 19 Dec 2014)
Log Message:
-----------
cyrus-imapd: update to version 2.4.17, use perl5.16 instead of perl5.12, use add_users, variant descriptions (#44405, #44797).
Modified Paths:
--------------
trunk/dports/mail/cyrus-imapd/Portfile
trunk/dports/mail/cyrus-imapd/files/patch-depot-Makefile.in.diff
trunk/dports/mail/cyrus-imapd/files/patch-lib-charset.c.diff
Modified: trunk/dports/mail/cyrus-imapd/Portfile
===================================================================
--- trunk/dports/mail/cyrus-imapd/Portfile 2014-12-19 23:31:10 UTC (rev 129758)
+++ trunk/dports/mail/cyrus-imapd/Portfile 2014-12-19 23:59:34 UTC (rev 129759)
@@ -4,9 +4,8 @@
PortSystem 1.0
name cyrus-imapd
-version 2.3.18
-revision 3
-set perl_version 5.12
+version 2.4.17
+set perl_version 5.16
categories mail
platforms darwin
license BSD-old
@@ -19,10 +18,11 @@
homepage http://cyrusimap.org/
master_sites ftp://ftp.cyrusimap.org/cyrus-imapd/
-checksums rmd160 b9d351b5c73c4e87019fb8aa0efd0a8a29ac6a40 \
- sha256 7724959d49191b993ef387c31a0ea7d30f1df7d255e73dff0b7887eff679ce5a
+checksums rmd160 c28e971515130eea23067b7015047a120edba86f \
+ sha256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583
depends_build port:makedepend
+
depends_lib port:perl${perl_version} \
port:cyrus-sasl2 \
port:db44 \
@@ -31,9 +31,17 @@
patchfiles patch-depot-Makefile.in.diff \
patch-lib-charset.c.diff
+post-patch {
+ foreach dir {contrib contrib/cyrus-graphtools.1.0/cgi-bin contrib/cyrus-graphtools.1.0/script perl/imap/examples perl/sieve/scripts tools} {
+ eval reinplace "s|^#!.*perl|#!${prefix}/bin/perl${perl_version}|" [glob -d ${worksrcpath}/${dir} *.pl]
+ }
+}
+
# wrong number of arguments at (eval 1) line 41, <DATA> line 256.
configure.ccache no
+configure.perl ${prefix}/bin/perl${perl_version}
+
configure.args --mandir=${prefix}/share/man \
--sysconfdir=${prefix}/etc/cyrus \
--with-cyrus-prefix=${prefix} \
@@ -45,8 +53,6 @@
--with-openssl=${prefix} \
--with-cyrus-user=cyrus \
--with-cyrus-group=mail \
- --with-auth=unix \
- --enable-listext \
--enable-cmulocal \
--enable-netscapehack \
--with-snmp=no \
@@ -62,12 +68,9 @@
if \[ -f \${pidfile} \]; then
kill -TERM \$(cat \${pidfile})
fi"
+
post-destroot {
- set uid [nextuid]
- set gid [nextgid]
- adduser cyrus realname=Cyrus\ User uid=${uid} gid=${gid} home=${prefix}/var/imap \
- shell=/usr/bin/false passwd="\*"
- addgroup mail gid=${gid} users=cyrus
+ add_users cyrus group=cyrus home=${prefix}/var/imap shell=/usr/bin/false passwd="\*"
xinstall -m 755 -v ${worksrcpath}/tools/mkimap ${destroot}${prefix}/bin
reinplace "s|/etc/imapd.conf|${prefix}/etc/cyrus/imapd.conf|" ${destroot}${prefix}/bin/mkimap
xinstall -m 755 -v ${worksrcpath}/tools/mknewsgroups ${destroot}${prefix}/bin
@@ -88,17 +91,22 @@
eval delete [glob ${destroot}${prefix}/lib/perl5/*/*/perllocal.pod]
}
-platform powerpc { configure.args-append --build=powerpc }
+platform powerpc {
+ configure.args-append --build=powerpc
+}
-variant murder { configure.args-append --enable-murder }
+variant murder description {Enable IMAP Murder support} {
+ configure.args-append --enable-murder
+}
-platform i386 { configure.args-append --build=i386 }
+platform i386 {
+ configure.args-append --build=i386
+}
-variant snmp {
-# snmp support is currently broken
- depends_lib-append port:net-snmp
- configure.args-delete --with-snmp=no
- configure.args-append --with-snmp=yes
+variant snmp description {Use Net SNMP (currently broken)} {
+ depends_lib-append port:net-snmp
+ configure.args-delete --with-snmp=no
+ configure.args-append --with-snmp=yes
}
livecheck.type regex
Modified: trunk/dports/mail/cyrus-imapd/files/patch-depot-Makefile.in.diff
===================================================================
--- trunk/dports/mail/cyrus-imapd/files/patch-depot-Makefile.in.diff 2014-12-19 23:31:10 UTC (rev 129758)
+++ trunk/dports/mail/cyrus-imapd/files/patch-depot-Makefile.in.diff 2014-12-19 23:59:34 UTC (rev 129759)
@@ -1,6 +1,6 @@
---- depot/Makefile.in.orig Wed Jun 29 23:50:51 2005
-+++ depot/Makefile.in Wed Jun 29 23:55:49 2005
-@@ -64,10 +64,10 @@
+--- depot/Makefile.in.orig 2012-12-01 11:57:54.000000000 -0800
++++ depot/Makefile.in 2014-12-19 12:18:17.000000000 -0800
+@@ -68,10 +68,10 @@
all:
install:
Modified: trunk/dports/mail/cyrus-imapd/files/patch-lib-charset.c.diff
===================================================================
--- trunk/dports/mail/cyrus-imapd/files/patch-lib-charset.c.diff 2014-12-19 23:31:10 UTC (rev 129758)
+++ trunk/dports/mail/cyrus-imapd/files/patch-lib-charset.c.diff 2014-12-19 23:59:34 UTC (rev 129759)
@@ -1,12 +1,11 @@
-charset.c:864:13: error: void function 'mimeheader_cat' should not return a value [-Wreturn-type]
---- lib/charset.c.orig 2011-10-04 14:59:14.000000000 -0500
-+++ lib/charset.c 2014-03-30 01:45:25.000000000 -0500
-@@ -861,7 +861,7 @@
- int len;
+--- lib/charset.c.orig 2012-12-01 11:57:54.000000000 -0800
++++ lib/charset.c 2014-12-19 12:18:18.000000000 -0800
+@@ -761,7 +761,7 @@
+ struct convert_rock *input, *tobuffer;
char *res;
- if (!s) return 0;
-+ if (!s) return;
++ if (!s) return (char *) 0;
- /* set up the conversion path */
- input = table_init(0, target);
+ if (charset < 0 || charset >= chartables_num_charsets)
+ return xstrdup("X");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141219/76fff259/attachment-0001.html>
More information about the macports-changes
mailing list