aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorKoop Mast <kwm@rainbow-runner.nl>2018-10-29 21:59:18 +0800
committerKoop Mast <kwm@rainbow-runner.nl>2018-10-29 21:59:18 +0800
commit69c75d6a8c207c2e17eeb0961899858fde46a27c (patch)
treeb7a5d1dd43a57b1019aa7278400c80cf945f97f1 /mail
parentf76b73611cebe6a2afcca50b799b5709d67a8d3c (diff)
parent33a87ba88c9ae39b8fc5bf4b143db51d983d92e5 (diff)
downloadfreebsd-ports-gnome-69c75d6a8c207c2e17eeb0961899858fde46a27c.tar.gz
freebsd-ports-gnome-69c75d6a8c207c2e17eeb0961899858fde46a27c.tar.zst
freebsd-ports-gnome-69c75d6a8c207c2e17eeb0961899858fde46a27c.zip
Merge branch 'master' into gnome-3.28
Diffstat (limited to 'mail')
-rw-r--r--mail/Makefile4
-rw-r--r--mail/avenger/Makefile16
-rw-r--r--mail/avenger/distinfo5
-rw-r--r--mail/avenger/files/patch-Makefile.in6
-rw-r--r--mail/bmf/Makefile33
-rw-r--r--mail/bmf/distinfo5
-rw-r--r--mail/bmf/files/patch-Makefile.in31
-rw-r--r--mail/bmf/files/patch-configure21
-rw-r--r--mail/bmf/pkg-plist4
-rw-r--r--mail/cyrus-imapd30/Makefile1
-rw-r--r--mail/dovecot/Makefile2
-rw-r--r--mail/dovecot22/Makefile2
-rw-r--r--mail/heirloom-mailx/Makefile3
-rw-r--r--mail/heirloom-mailx/files/patch-mailx.114
-rw-r--r--mail/heirloom-mailx/files/patch-mailx.1.html15
-rw-r--r--mail/isync/Makefile18
-rw-r--r--mail/isync/files/patch-src_socket.c11
-rw-r--r--mail/mailscanner/Makefile5
-rw-r--r--mail/mailscanner/distinfo6
-rw-r--r--mail/mailscanner/pkg-plist31
-rw-r--r--mail/milter-callback/Makefile10
-rw-r--r--mail/nextcloud-mail/Makefile2
-rw-r--r--mail/nextcloud-mail/distinfo6
-rw-r--r--mail/nextcloud-mail/pkg-plist35
-rw-r--r--mail/opendkim/Makefile12
-rw-r--r--mail/opendkim/files/patch-configure.ac50
-rw-r--r--mail/opendkim/files/patch-libopendkim__tests__Makefile.in2
-rw-r--r--mail/opendkim/files/patch-libopendkim_dkim-canon.c4
-rw-r--r--mail/opendkim/files/patch-opendkim__tests__Makefile.in2
-rw-r--r--mail/opendkim/files/patch-opendkim_opendkim-crypto.c30
-rw-r--r--mail/opensmtpd/pkg-descr2
-rw-r--r--mail/p5-Mail-Box-IMAP4/Makefile28
-rw-r--r--mail/p5-Mail-Box-IMAP4/distinfo3
-rw-r--r--mail/p5-Mail-Box-IMAP4/pkg-descr8
-rw-r--r--mail/p5-Mail-Box-IMAP4/pkg-plist27
-rw-r--r--mail/p5-Mail-Box-POP3/Makefile26
-rw-r--r--mail/p5-Mail-Box-POP3/distinfo3
-rw-r--r--mail/p5-Mail-Box-POP3/pkg-descr7
-rw-r--r--mail/p5-Mail-Box-POP3/pkg-plist13
-rw-r--r--mail/p5-Mail-Box/Makefile38
-rw-r--r--mail/p5-Mail-Box/distinfo5
-rw-r--r--mail/p5-Mail-Box/pkg-plist240
-rw-r--r--mail/p5-Mail-DKIM/Makefile5
-rw-r--r--mail/p5-Mail-DKIM/distinfo6
-rw-r--r--mail/p5-Mail-Message/Makefile29
-rw-r--r--mail/p5-Mail-Message/distinfo3
-rw-r--r--mail/p5-Mail-Message/pkg-descr15
-rw-r--r--mail/p5-Mail-Message/pkg-plist178
-rw-r--r--mail/p5-Mail-Transport/Makefile24
-rw-r--r--mail/p5-Mail-Transport/distinfo3
-rw-r--r--mail/p5-Mail-Transport/pkg-descr9
-rw-r--r--mail/p5-Mail-Transport/pkg-plist24
-rw-r--r--mail/panda-cclient/Makefile9
-rw-r--r--mail/panda-cclient/files/patch-Makefile128
-rw-r--r--mail/panda-cclient/files/patch-src_osdep_unix_Makefile22
-rw-r--r--mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h (renamed from mail/panda-cclient/files/patch-src_osdep_unix_os_bsi.h)0
-rw-r--r--mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c63
-rw-r--r--mail/phplist/Makefile2
-rw-r--r--mail/phplist/distinfo4
-rw-r--r--mail/phplist/pkg-plist2
-rw-r--r--mail/postfix-current/Makefile2
-rw-r--r--mail/postfix-current/files/patch-makedefs13
-rw-r--r--mail/postfix-current/files/patch-src_util_sys__defs.h2
-rw-r--r--mail/postfix/Makefile2
-rw-r--r--mail/postfix/files/patch-makedefs13
-rw-r--r--mail/postfix/files/patch-src_util_sys__defs.h2
-rw-r--r--mail/roundcube-umich/Makefile6
-rw-r--r--mail/roundcube-umich/pkg-descr2
-rw-r--r--mail/rspamd-devel/Makefile2
-rw-r--r--mail/rspamd/Makefile3
-rw-r--r--mail/rspamd/distinfo6
-rw-r--r--mail/rspamd/pkg-plist2
-rw-r--r--mail/rubygem-mail/Makefile7
-rw-r--r--mail/rubygem-mail/distinfo6
-rw-r--r--mail/sendmail/Makefile2
-rw-r--r--mail/spamilter/Makefile21
-rw-r--r--mail/sympa/Makefile16
-rw-r--r--mail/sympa/distinfo6
-rw-r--r--mail/sympa/pkg-plist11
-rw-r--r--mail/thunderbird/Makefile2
-rw-r--r--mail/thunderbird/files/patch-bug147426528
-rw-r--r--mail/thunderbird/files/patch-bug150048412
-rw-r--r--mail/up-imapproxy/Makefile13
-rw-r--r--mail/up-imapproxy/distinfo5
-rw-r--r--mail/up-imapproxy/files/patch-Makefile.in11
-rw-r--r--mail/up-imapproxy/files/patch-OpenSSL-1.154
-rw-r--r--mail/up-imapproxy/files/patch-configure.in18
-rw-r--r--mail/up-imapproxy/files/patch-src_main.c12
-rw-r--r--mail/up-imapproxy/files/patch-ssl35
89 files changed, 1039 insertions, 587 deletions
diff --git a/mail/Makefile b/mail/Makefile
index a9937ffd90c1..2e180320cc66 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -379,7 +379,9 @@
SUBDIR += p5-Mail-Audit
SUBDIR += p5-Mail-Audit-Attach
SUBDIR += p5-Mail-Box
+ SUBDIR += p5-Mail-Box-IMAP4
SUBDIR += p5-Mail-Box-IMAP4-SSL
+ SUBDIR += p5-Mail-Box-POP3
SUBDIR += p5-Mail-Box-Parser-C
SUBDIR += p5-Mail-Bulkmail
SUBDIR += p5-Mail-CheckUser
@@ -402,6 +404,7 @@
SUBDIR += p5-Mail-MailStats
SUBDIR += p5-Mail-Mbox-MessageParser
SUBDIR += p5-Mail-MboxParser
+ SUBDIR += p5-Mail-Message
SUBDIR += p5-Mail-OpenDKIM
SUBDIR += p5-Mail-OpenRelay-Simple
SUBDIR += p5-Mail-POP3Client
@@ -416,6 +419,7 @@
SUBDIR += p5-Mail-Sendmail
SUBDIR += p5-Mail-Spool
SUBDIR += p5-Mail-Tools
+ SUBDIR += p5-Mail-Transport
SUBDIR += p5-Mail-Transport-Dbx
SUBDIR += p5-Mail-Verify
SUBDIR += p5-Mail-Verp
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 1e91ecfcbd38..1f22101abd81 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -2,17 +2,18 @@
# $FreeBSD$
PORTNAME= avenger
-PORTVERSION= 0.8.4
-PORTREVISION= 1
+PORTVERSION= 0.8.5
CATEGORIES= mail
MASTER_SITES= http://www.mailavenger.org/dist/
MAINTAINER= ports@FreeBSD.org
COMMENT= Anti-spam SMTP server
-LICENSE= GPLv2+ # though COPYING is GPLv3
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
USES= bdb ssl
+
GNU_CONFIGURE= yes
USERS= ${PORTNAME}
@@ -26,9 +27,9 @@ CONFIGURE_ARGS= --enable-ssl=${OPENSSLBASE} \
--with-db=${LOCALBASE} \
--with-etcdir=${ETCDIR}
-OPTIONS_DEFINE= SASL DOCS
+OPTIONS_DEFINE= DOCS SASL
-SASL_CONFIGURE_ON= --enable-sasl
+SASL_CONFIGURE_ENABLE= sasl
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
post-patch:
@@ -45,9 +46,10 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/etc/pf.os ${STAGEDIR}${PREFIX}/share
@${MKDIR} ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/etc/smtp-filter.pf ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/etc/avsendmail.m4 ${STAGEDIR}${DATADIR}
+ (cd ${WRKSRC}/etc ; ${INSTALL_DATA} smtp-filter.pf avsendmail.m4 \
+ ${STAGEDIR}${DATADIR})
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/avenger/distinfo b/mail/avenger/distinfo
index eb8bab653607..8ecedbd7fdfb 100644
--- a/mail/avenger/distinfo
+++ b/mail/avenger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (avenger-0.8.4.tar.gz) = cd6be345687fa0e6be056a575865b937f8ebcb486cb4f8da2d74bf4c4bdd64ce
-SIZE (avenger-0.8.4.tar.gz) = 890192
+TIMESTAMP = 1540694687
+SHA256 (avenger-0.8.5.tar.gz) = b0fc3e2e03ed010e95e561367fce7b087968df7ea6056251eba95cad14d26d37
+SIZE (avenger-0.8.5.tar.gz) = 910358
diff --git a/mail/avenger/files/patch-Makefile.in b/mail/avenger/files/patch-Makefile.in
index 78bae428e241..0d9b942f656d 100644
--- a/mail/avenger/files/patch-Makefile.in
+++ b/mail/avenger/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- ./Makefile.in.orig 2013-03-08 21:13:45.000000000 +0100
-+++ ./Makefile.in 2013-03-08 21:16:55.000000000 +0100
-@@ -287,9 +287,9 @@
+--- Makefile.in.orig 2018-10-09 06:38:27 UTC
++++ Makefile.in
+@@ -386,9 +386,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
LYNX = lynx
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index ef0471594da3..32d06b73c613 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= bmf
-PORTVERSION= 0.9.4
-PORTREVISION= 3
+PORTVERSION= 0.84
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
@@ -14,9 +14,13 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
HAS_CONFIGURE= yes
+ALL_TARGET= apps
+BINARY_ALIAS= gcc=${CC} g++=${CXX}
+CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-OPTIONS_DEFINE= BDB MYSQL DEBUG DOCS
-OPTIONS_DEFAULT=BDB
+OPTIONS_DEFINE= BDB DEBUG DOCS MANPAGES MYSQL
+OPTIONS_DEFAULT=BDB MANPAGES
+OPTIONS_SUB= yes
BDB_USES= bdb
BDB_CONFIGURE_WITH= libdb
@@ -26,19 +30,22 @@ BDB_CONFIGURE_ENV= DB_LIBNAME=-l${BDB_LIB_NAME}
DEBUG_CONFIGURE_ON= --debug=yes
-MYSQL_USE= MYSQL=client
-MYSQL_CONFIGURE_WITH= mysql
+MANPAGES_ALL_TARGET= docs
+MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto
-post-patch:
- @${REINPLACE_CMD} -e 's|@@CC|${CC}|;s|@@CXX|${CXX}|' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's/: checkroot/: /g' ${WRKSRC}/Makefile.in
+MYSQL_CONFIGURE_WITH= mysql
+MYSQL_CFLAGS= -I${LOCALBASE}/include/mysql
+MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
+MYSQL_USES= mysql
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmf
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmfconv
+do-install:
+ (cd ${WRKSRC} ; ${INSTALL_PROGRAM} bmf bmfconv ${STAGEDIR}${PREFIX}/bin)
-post-install-DOCS-on:
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+do-install-MANPAGES-on:
+ cd ${WRKSRC} && ${INSTALL_MAN} bmf.1 bmfconv.1 ${STAGEDIR}${PREFIX}/man/man1
+
.include <bsd.port.mk>
diff --git a/mail/bmf/distinfo b/mail/bmf/distinfo
index 5eea1ca64a41..0fa67ec1fa60 100644
--- a/mail/bmf/distinfo
+++ b/mail/bmf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bmf-0.9.4.tar.gz) = 7eed21802f95df2321ac4c958f99e14d2809852a5708700b633e1abb032c9ce1
-SIZE (bmf-0.9.4.tar.gz) = 36740
+TIMESTAMP = 1540059041
+SHA256 (bmf-0.84.tar.gz) = 28df6d808c4c6fef0e646cc736283fccecd02c4e6fa09f5fd095bb9d63004038
+SIZE (bmf-0.84.tar.gz) = 40101
diff --git a/mail/bmf/files/patch-Makefile.in b/mail/bmf/files/patch-Makefile.in
index cbc40b2466f2..e17dcc4140ac 100644
--- a/mail/bmf/files/patch-Makefile.in
+++ b/mail/bmf/files/patch-Makefile.in
@@ -1,17 +1,20 @@
---- ./Makefile.in.orig 2002-10-20 22:27:56.000000000 +0200
-+++ ./Makefile.in 2014-01-03 01:50:13.000000000 +0100
-@@ -1,11 +1,11 @@
- # Makefile for bmf
+--- Makefile.in.orig 2002-10-09 16:41:56 UTC
++++ Makefile.in
+@@ -28,7 +28,7 @@ bmf.o: bmf.c
+ $(CC) $(CFLAGS) -DPACKAGE=\"bmf\" -DVERSION=\"$(VERSION)\" -c $<
--BINDIR=/usr/bin
--MANDIR=/usr/share/man
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man
+ bmf.1: bmf.xml
+- xsltproc --docbook db2man/docbook.xsl bmf.xml
++ xmlto --skip-validation man bmf.xml
- VERSION=0.9.4
+ bmfconv: bmfconv.o dbmysql.o dbdb.o dbtext.o dbh.o lex.o vec.o str.o
+ $(CC) -o $@ bmfconv.o dbmysql.o dbdb.o dbtext.o dbh.o lex.o vec.o str.o $(LDFLAGS)
+@@ -37,7 +37,7 @@ bmfconv.o: bmfconv.c
+ $(CC) $(CFLAGS) -DPACKAGE=\"bmfconv\" -DVERSION=\"$(VERSION)\" -c $<
--CC=@CC@
-+CC?=@CC@
- CFLAGS=@CFLAGS@
- LDFLAGS=@LDFLAGS@
- SYSLIBS=@SYSLIBS@
+ bmfconv.1: bmfconv.xml
+- xsltproc --docbook db2man/docbook.xsl bmfconv.xml
++ xmlto man bmfconv.xml
+
+ install: checkroot bmf bmf.1 bmfconv bmfconv.1
+ [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
diff --git a/mail/bmf/files/patch-configure b/mail/bmf/files/patch-configure
index 8cef82f1c790..b2bc98418c00 100644
--- a/mail/bmf/files/patch-configure
+++ b/mail/bmf/files/patch-configure
@@ -1,21 +1,18 @@
---- ./configure.orig 2002-10-19 11:44:49.000000000 +0200
-+++ ./configure 2014-01-03 01:50:13.000000000 +0100
-@@ -127,16 +127,16 @@
- CCDBG="-DNDEBUG"
+--- configure.orig 2002-10-09 16:29:26 UTC
++++ configure
+@@ -129,15 +129,15 @@ case "$UNAME_S" in
LDDBG=""
fi
-- CC=gcc
-+ CC=@@CC
- CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall"
-- CXX=g++
-+ CXX=@@CXX
+ CC=gcc
+- CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall"
++ CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall $CFLAGS"
+ CXX=g++
CXXFLAGS=${CFLAGS}
AR=ar
ARFLAGS="-rc"
-- LD=gcc
+ LD=gcc
- LDFLAGS="$LDDBG"
-+ LD=@@CC
-+ LDFLAGS="${LDFLAGS}"
++ LDFLAGS="$LDDBG $LDFLAGS"
SYSLIBS=""
- LIBDB_LIB=""
+ LIBDB_LIB="${DB_LIBNAME}"
diff --git a/mail/bmf/pkg-plist b/mail/bmf/pkg-plist
index b20a589b46a7..9c27c2ac4e14 100644
--- a/mail/bmf/pkg-plist
+++ b/mail/bmf/pkg-plist
@@ -1,5 +1,5 @@
bin/bmf
bin/bmfconv
-man/man1/bmf.1.gz
-man/man1/bmfconv.1.gz
+%%MANPAGES%%man/man1/bmf.1.gz
+%%MANPAGES%%man/man1/bmfconv.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index 5f296f23fd29..d5280dedc6b2 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.0.8
+PORTREVISION= 1
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index dc7b55ca1862..9deef42bc432 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dovecot
PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= https://www.dovecot.org/releases/2.3/
diff --git a/mail/dovecot22/Makefile b/mail/dovecot22/Makefile
index b0f8a97ba56d..84b1603be81c 100644
--- a/mail/dovecot22/Makefile
+++ b/mail/dovecot22/Makefile
@@ -13,7 +13,7 @@
PORTNAME= dovecot
PORTVERSION= 2.2.36
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail ipv6
MASTER_SITES= https://www.dovecot.org/releases/2.2/
PKGNAMESUFFIX= 22
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 7cca18a93deb..760172153b81 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mailx
PORTVERSION= 12.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail ipv6
MASTER_SITES= SF/heirloom/heirloom-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= heirloom-
@@ -18,6 +18,7 @@ CONFLICTS= mailx-[0-9]*
MAKE_JOBS_UNSAFE= yes
USES= iconv localbase ssl tar:bzip2
+CPPFLAGS+= -DOPENSSL_NO_SSL2
MAKE_ARGS= PREFIX="${PREFIX}" \
SYSCONFDIR="${PREFIX}/etc" \
SENDMAIL="/usr/sbin/sendmail" \
diff --git a/mail/heirloom-mailx/files/patch-mailx.1 b/mail/heirloom-mailx/files/patch-mailx.1
new file mode 100644
index 000000000000..51b14d50260c
--- /dev/null
+++ b/mail/heirloom-mailx/files/patch-mailx.1
@@ -0,0 +1,14 @@
+--- mailx.1.orig 2007-10-01 06:00:39.000000000 -0700
++++ mailx.1 2018-10-14 19:36:55.360353000 -0700
+@@ -2683,11 +2683,6 @@
+ to verify SSL/TLS server certificates.
+ Only applicable if SSL/TLS support is built using OpenSSL.
+ .TP
+-.B ssl-v2-allow
+-Accept SSLv2 connections.
+-These are normally not allowed
+-because this protocol version is insecure.
+-.TP
+ .B stealthmua
+ Inhibits the generation of
+ the \fI`Message-Id:'\fR and \fI`User-Agent:'\fR
diff --git a/mail/heirloom-mailx/files/patch-mailx.1.html b/mail/heirloom-mailx/files/patch-mailx.1.html
new file mode 100644
index 000000000000..276cce658606
--- /dev/null
+++ b/mail/heirloom-mailx/files/patch-mailx.1.html
@@ -0,0 +1,15 @@
+--- mailx.1.html.orig 2008-07-28 15:33:37.000000000 -0700
++++ mailx.1.html 2018-10-14 19:38:44.077272000 -0700
+@@ -2953,12 +2953,6 @@
+ Only applicable if SSL/TLS support is built using OpenSSL.
+ </TD></TR>
+ <TR valign=top><TD colspan=2>
+-<B>ssl-v2-allow</B> </TD></TR><TR valign=top><TD width=6%>&nbsp;</TD><TD>
+-Accept SSLv2 connections.
+-These are normally not allowed
+-because this protocol version is insecure.
+-</TD></TR>
+-<TR valign=top><TD colspan=2>
+ <B>stealthmua</B> </TD></TR><TR valign=top><TD width=6%>&nbsp;</TD><TD>
+ Inhibits the generation of
+ the <I>&#39;Message-Id:&#39;</I> and <I>&#39;User-Agent:&#39;</I>
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 7c4084908f13..4f9dc0f0a0cf 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -3,6 +3,7 @@
PORTNAME= isync
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
@@ -11,26 +12,31 @@ COMMENT= Maintain local copies of remote IMAP folders w/synchronized flags
LICENSE= GPLv2
-BROKEN_mips= fails to compile: util.c:523: \#pragma GCC diagnostic not allowed inside functions
-BROKEN_mips64= fails to compile: util.c:523: \#pragma GCC diagnostic not allowed inside functions
-BROKEN_powerpc64= fails to compile: util.c:523: \#pragma GCC diagnostic not allowed inside functions
-
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
USES= alias bdb cpe perl5 ssl
USE_PERL5= build
-CPE_VENDOR= oswald_buddenhagen
+
GNU_CONFIGURE= yes
+CPE_VENDOR= oswald_buddenhagen
+
CONFIGURE_ARGS= --with-sasl=${LOCALBASE} \
--with-ssl=${OPENSSLLIB:H}
+MAKE_ARGS+= SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
+
CPPFLAGS+= -I${BDB_INCLUDE_DIR}
LDFLAGS+= -L${BDB_LIB_DIR}
+.include <bsd.port.pre.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|\$$(docdir)/examples|\$$(sysconfdir)|g' \
${WRKSRC}/src/Makefile.in ${WRKSRC}/src/compat/Makefile.in
@${REINPLACE_CMD} -e 's|-ansi||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+ @${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/util.c
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/isync/files/patch-src_socket.c b/mail/isync/files/patch-src_socket.c
index 4dbed8220aa8..f29ef7ff04a7 100644
--- a/mail/isync/files/patch-src_socket.c
+++ b/mail/isync/files/patch-src_socket.c
@@ -1,4 +1,4 @@
---- src/socket.c.orig 2017-08-13 23:04:40 UTC
+--- src/socket.c.orig 2017-10-01 08:42:35 UTC
+++ src/socket.c
@@ -40,7 +40,7 @@
# include <openssl/ssl.h>
@@ -9,3 +9,12 @@
# define X509_OBJECT_get0_X509(o) ((o)->data.x509)
# define X509_STORE_get0_objects(o) ((o)->objs)
# endif
+@@ -270,6 +270,8 @@ socket_start_tls( conn_t *conn, void (*c
+
+ init_wakeup( &conn->ssl_fake, ssl_fake_cb, conn );
+ conn->ssl = SSL_new( ((server_conf_t *)conn->conf)->SSLContext );
++ if (ssl_return( "set server name", conn, SSL_set_tlsext_host_name( conn->ssl, conn->conf->host ) ) < 0)
++ return;
+ SSL_set_fd( conn->ssl, conn->fd );
+ SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER );
+ socket_expect_read( conn, 1 );
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index c6347a4a32c8..8f593e7322a6 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= MailScanner
-PORTVERSION= 5.1.1
+PORTVERSION= 5.1.2
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://s3.amazonaws.com/msv5/release/
DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix
@@ -160,6 +161,8 @@ do-build:
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
${WRKSRC}/usr/lib/${PORTNAME}/wrapper/*
+ @${REINPLACE_CMD} -e 's,/usr$$,&/local,' \
+ ${WRKSRC}/etc/${PORTNAME}/virus.scanners.conf
@${FIND} ${WRKSRC} \( -name "*.bak" -or -name "*.orig" \) -delete
do-install:
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 251b08ef6f14..1c7275519835 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536610693
-SHA256 (MailScanner-5.1.1-1.nix.tar.gz) = d49ab24270fc047baabf6491110e61508feec9de56d4b372b35f318337180541
-SIZE (MailScanner-5.1.1-1.nix.tar.gz) = 658275
+TIMESTAMP = 1540495845
+SHA256 (MailScanner-5.1.2-1.nix.tar.gz) = 086406f8631d5293c533f904ef9ed3de1864df1f1ce6bbbc6f5572d2f6644c1a
+SIZE (MailScanner-5.1.2-1.nix.tar.gz) = 663063
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 9fbaf67c189c..624a568d5a43 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -251,6 +251,34 @@ sbin/ms-upgrade-conf
@sample %%DATADIR%%/reports/en/stored.filename.message.txt.sample
@sample %%DATADIR%%/reports/en/stored.size.message.txt.sample
@sample %%DATADIR%%/reports/en/stored.virus.message.txt.sample
+@sample %%DATADIR%%/reports/en_uk/deleted.content.message.txt.sample
+@sample %%DATADIR%%/reports/en_uk/deleted.filename.message.txt.sample
+@sample %%DATADIR%%/reports/en_uk/deleted.size.message.txt.sample
+@sample %%DATADIR%%/reports/en_uk/deleted.virus.message.txt.sample
+@sample %%DATADIR%%/reports/en_uk/disinfected.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/inline.sig.html.sample
+@sample %%DATADIR%%/reports/en_uk/inline.sig.txt.sample
+@sample %%DATADIR%%/reports/en_uk/inline.spam.warning.txt.sample
+@sample %%DATADIR%%/reports/en_uk/inline.warning.html.sample
+@sample %%DATADIR%%/reports/en_uk/inline.warning.txt.sample
+@sample %%DATADIR%%/reports/en_uk/languages.conf.sample
+@sample %%DATADIR%%/reports/en_uk/languages.conf.strings.sample
+@sample %%DATADIR%%/reports/en_uk/recipient.mcp.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/recipient.spam.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/rejection.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.content.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.error.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.filename.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.mcp.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.size.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.spam.rbl.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.spam.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.spam.sa.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/sender.virus.report.txt.sample
+@sample %%DATADIR%%/reports/en_uk/stored.content.message.txt.sample
+@sample %%DATADIR%%/reports/en_uk/stored.filename.message.txt.sample
+@sample %%DATADIR%%/reports/en_uk/stored.size.message.txt.sample
+@sample %%DATADIR%%/reports/en_uk/stored.virus.message.txt.sample
@sample %%DATADIR%%/reports/es/deleted.content.message.txt.sample
@sample %%DATADIR%%/reports/es/deleted.filename.message.txt.sample
@sample %%DATADIR%%/reports/es/deleted.size.message.txt.sample
@@ -512,13 +540,14 @@ lib/MailScanner/wrapper/bitdefender-autoupdate
lib/MailScanner/wrapper/bitdefender-wrapper
lib/MailScanner/wrapper/clamav-autoupdate
lib/MailScanner/wrapper/clamav-wrapper
+lib/MailScanner/wrapper/drweb-wrapper
lib/MailScanner/wrapper/esets-wrapper
lib/MailScanner/wrapper/f-secure-autoupdate
lib/MailScanner/wrapper/f-secure-wrapper
lib/MailScanner/wrapper/generic-autoupdate
lib/MailScanner/wrapper/generic-wrapper
+lib/MailScanner/wrapper/kaspersky-wrapper
lib/MailScanner/systemd/ms-milter
lib/MailScanner/systemd/ms-systemd
lib/MailScanner/wrapper/sophos-autoupdate
lib/MailScanner/wrapper/sophos-wrapper
-
diff --git a/mail/milter-callback/Makefile b/mail/milter-callback/Makefile
index 6cd57b5e393a..88dbd24b5d94 100644
--- a/mail/milter-callback/Makefile
+++ b/mail/milter-callback/Makefile
@@ -12,10 +12,6 @@ COMMENT= Milter to perform a envelope-from sender verification on target MX
LICENSE= GPLv3
-BROKEN_mips= fails to build: error: nested functions are disabled, use -fnested-functions to re-enable
-BROKEN_mips64= fails to build: error: nested functions are disabled, use -fnested-functions to re-enable
-BROKEN_powerpc64= fails to build: error: nested functions are disabled, use -fnested-functions to re-enable
-
LIB_DEPENDS= libspf2.so:mail/libspf2
USES= tar:xz
@@ -30,6 +26,12 @@ SRC_FILES= cache.c commonprocs.c cpit.c dealwithmxes.c detectlamespf.c \
CFLAGS+= -DFREEBSD -DHAVE_NS_TYPE -DWITH_SPF -I${LOCALBASE}/include \
-I${WRKSRC} -std=gnu99
+CFLAGS_mips= -fnested-functions
+CFLAGS_mips64= -fnested-functions
+CFLAGS_powerpc= -fnested-functions
+CFLAGS_powerpcspe= -fnested-functions
+CFLAGS_powerpc64= -fnested-functions
+CFLAGS_sparc64= -fnested-functions
LDFLAGS+= -lmilter -lthr -L${LOCALBASE}/lib -lspf2
do-build:
diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile
index 81f316ddc6a1..bff38f58a7eb 100644
--- a/mail/nextcloud-mail/Makefile
+++ b/mail/nextcloud-mail/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mail
-PORTVERSION= 0.10.0
+PORTVERSION= 0.11.0
DISTVERSIONPREFIX= v
CATEGORIES= mail
MASTER_SITES= https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
diff --git a/mail/nextcloud-mail/distinfo b/mail/nextcloud-mail/distinfo
index f5c0e47fcea3..b1f9508161dc 100644
--- a/mail/nextcloud-mail/distinfo
+++ b/mail/nextcloud-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535966351
-SHA256 (nextcloud/mail-v0.10.0/mail.tar.gz) = 78e28c17cb8b3d989dc1c4c197724cf978eeefeb3b7d88b61d5433efdf991e3f
-SIZE (nextcloud/mail-v0.10.0/mail.tar.gz) = 2025469
+TIMESTAMP = 1539943303
+SHA256 (nextcloud/mail-v0.11.0/mail.tar.gz) = 3a6ef12e92fe925e90b9ad14d519f1af15a132452ec383ef451aa47cec6d8f8d
+SIZE (nextcloud/mail-v0.11.0/mail.tar.gz) = 2033880
diff --git a/mail/nextcloud-mail/pkg-plist b/mail/nextcloud-mail/pkg-plist
index 5c41ebb02663..ef7a75b9d54c 100644
--- a/mail/nextcloud-mail/pkg-plist
+++ b/mail/nextcloud-mail/pkg-plist
@@ -2,7 +2,6 @@
%%WWWDIR%%/COPYING
%%WWWDIR%%/README.md
%%WWWDIR%%/appinfo/app.php
-%%WWWDIR%%/appinfo/database.xml
%%WWWDIR%%/appinfo/info.xml
%%WWWDIR%%/appinfo/routes.php
%%WWWDIR%%/css/mail.scss
@@ -241,6 +240,9 @@
%%WWWDIR%%/lib/IMAP/Sync/Synchronizer.php
%%WWWDIR%%/lib/Mailbox.php
%%WWWDIR%%/lib/Migration/FixCollectedAddresses.php
+%%WWWDIR%%/lib/Migration/Version0100Date20180825194217.php
+%%WWWDIR%%/lib/Migration/Version0110Date20180825195812.php
+%%WWWDIR%%/lib/Migration/Version0110Date20180825201241.php
%%WWWDIR%%/lib/Model/ConvertAddresses.php
%%WWWDIR%%/lib/Model/IMAPMessage.php
%%WWWDIR%%/lib/Model/IMessage.php
@@ -379,12 +381,17 @@
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/simple-high.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/simple-highest.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/simple-low.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css1-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css1.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css2-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css2.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css21-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css21.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css3-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css3.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/importance.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/multiple-properties.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/preserve-merging-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/preserve-merging.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/selectors/active.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/selectors/adjacent.csst
@@ -417,8 +424,26 @@
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/selectors/universal-shorthand.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/selectors/universal.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/selectors/visited.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/background-general-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/background-general.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/background-noopt-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/background-noopt.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-color-general-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-color-general.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-color-noopt-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-color-noopt.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-radius-general-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-radius-general.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-radius-noopt-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-radius-noopt.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-style-general-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-style-general.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-style-noopt-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-style-noopt.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-width-general-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-width-general.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-width-noopt-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/border-width-noopt.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/bugshorthand1.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/bugshorthand2.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/bugshorthand3.csst
@@ -427,11 +452,17 @@
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/font-noopt.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/font-weight-general.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/font-weight-noopt.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/margin-general-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/margin-general.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/margin-noopt-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/margin-noopt.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/padding-general-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/padding-general.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/padding-noopt-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/shorthands/padding-noopt.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/special/atmedia-decimals.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/special/background-image-rtl.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/special/complex-gradient-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/special/complex-gradient.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/special/cursor.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/special/font-face-atmedia-2.csst
@@ -450,6 +481,7 @@
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/colors.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/font-family.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/important.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/left-right-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/number-float.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/number-leadingzero.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/number-missingunit.csst
@@ -457,6 +489,7 @@
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/number-signed.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/number-trailingzero.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/number-zero.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/quoted-strings-rtl.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/quoted-strings.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/values/transition-duration.csst
%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/vendor-prefixed/webkit-gradient.csst
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index cf7afb254941..9abe740f48e0 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opendkim
PORTVERSION= 2.10.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= mail security
MASTER_SITES= SF/${PORTNAME} \
SF/${PORTNAME}/Previous%20Releases \
@@ -20,12 +20,9 @@ LICENSE_GROUPS_SENDMAIL=FSF OSI
LICENSE_NAME_SENDMAIL= Sendmail Open Source License
LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BROKEN_SSL= openssl-devel
-BROKEN_SSL_REASON_openssl-devel= checking for library containing SSL_library_init... no
-
GNU_CONFIGURE= yes
NO_OPTIONS_SORT=yes
-USES= libtool perl5 pkgconfig shebangfix ssl
+USES= autoreconf libtool perl5 pkgconfig shebangfix ssl
USE_PERL5= run
SHEBANG_FILES= opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
reprrd/opendkim-reprrdimport*
@@ -158,10 +155,9 @@ LDFLAGS+= -lpthread
.endif
pre-configure:
- ${REINPLACE_CMD} -e '/LIBLUA_LIBS/s/lua5\.[0-9]/lua-${LUA_VER}/' \
- -e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/' \
+ ${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \
-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \
- ${WRKSRC}/configure
+ ${WRKSRC}/configure.ac
post-patch-LCOV-on:
${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/
diff --git a/mail/opendkim/files/patch-configure.ac b/mail/opendkim/files/patch-configure.ac
new file mode 100644
index 000000000000..ee6e16d590b4
--- /dev/null
+++ b/mail/opendkim/files/patch-configure.ac
@@ -0,0 +1,50 @@
+--- configure.ac.orig 2015-05-12 18:43:09 UTC
++++ configure.ac
+@@ -860,26 +860,28 @@ then
+ AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ AC_MSG_ERROR([libcrypto not found]))
+
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- [
+- if test x"$enable_shared" = x"yes"
+- then
+- AC_MSG_ERROR([Cannot build shared opendkim
+- against static openssl libraries.
+- Configure with --disable-shared
+- to get this working or obtain a
+- shared libssl library for
+- opendkim to use.])
+- fi
+
+- # avoid caching issue - last result of SSL_library_init
+- # shouldn't be cached for this next check
+- unset ac_cv_search_SSL_library_init
+- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- AC_MSG_ERROR([libssl not found]), [-ldl])
+- ]
+- )
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++ [[SSL_library_init();]])],
++ [od_have_ossl="yes";],
++ [od_have_ossl="no";])
++ if test x"$od_have_ossl" = x"no"
++ then
++ if test x"$enable_shared" = x"yes"
++ then
++ AC_MSG_ERROR([Cannot build shared opendkim
++ against static openssl libraries.
++ Configure with --disable-shared
++ to get this working or obtain a
++ shared libssl library for
++ opendkim to use.])
++ fi
++
++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++ AC_MSG_ERROR([libssl not found]), [-ldl])
++ fi
+
+ AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+ AC_DEFINE([HAVE_SHA256], 1,
diff --git a/mail/opendkim/files/patch-libopendkim__tests__Makefile.in b/mail/opendkim/files/patch-libopendkim__tests__Makefile.in
index 242cdb388596..57f3b1b80fd1 100644
--- a/mail/opendkim/files/patch-libopendkim__tests__Makefile.in
+++ b/mail/opendkim/files/patch-libopendkim__tests__Makefile.in
@@ -1,6 +1,6 @@
--- libopendkim/tests/Makefile.in.orig 2015-05-12 18:43:48 UTC
+++ libopendkim/tests/Makefile.in
-@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_set
+@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
END { for (dir in files) print dir, files[dir] }'
am__base_list = \
diff --git a/mail/opendkim/files/patch-libopendkim_dkim-canon.c b/mail/opendkim/files/patch-libopendkim_dkim-canon.c
index 6f5f5439580a..cda4b276cb22 100644
--- a/mail/opendkim/files/patch-libopendkim_dkim-canon.c
+++ b/mail/opendkim/files/patch-libopendkim_dkim-canon.c
@@ -1,6 +1,6 @@
---- libopendkim/dkim-canon.c.orig 2015-08-26 08:37:01 UTC
+--- libopendkim/dkim-canon.c.orig 2015-05-11 03:56:13 UTC
+++ libopendkim/dkim-canon.c
-@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dst
+@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dstring *dstr, dk
}
/* skip all spaces before first word */
diff --git a/mail/opendkim/files/patch-opendkim__tests__Makefile.in b/mail/opendkim/files/patch-opendkim__tests__Makefile.in
index 8134aca9b561..b5318fd1a63b 100644
--- a/mail/opendkim/files/patch-opendkim__tests__Makefile.in
+++ b/mail/opendkim/files/patch-opendkim__tests__Makefile.in
@@ -1,6 +1,6 @@
--- opendkim/tests/Makefile.in.orig 2015-05-12 18:43:49 UTC
+++ opendkim/tests/Makefile.in
-@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_set
+@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
END { for (dir in files) print dir, files[dir] }'
am__base_list = \
diff --git a/mail/opendkim/files/patch-opendkim_opendkim-crypto.c b/mail/opendkim/files/patch-opendkim_opendkim-crypto.c
new file mode 100644
index 000000000000..ea07bcc30c2e
--- /dev/null
+++ b/mail/opendkim/files/patch-opendkim_opendkim-crypto.c
@@ -0,0 +1,30 @@
+--- opendkim/opendkim-crypto.c.orig 2013-02-25 21:02:41 UTC
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ {
+ assert(pthread_setspecific(id_key, ptr) == 0);
+
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER))
++ OPENSSL_thread_stop();
++#else
+ ERR_remove_state(0);
++#endif
+
+ free(ptr);
+
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ if (crypto_init_done)
+ {
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER))
++ OPENSSL_thread_stop();
++#else
+ CRYPTO_cleanup_all_ex_data();
+ CONF_modules_free();
+ EVP_cleanup();
+ ERR_free_strings();
+ ERR_remove_state(0);
++#endif
+
+ if (nmutexes > 0)
+ {
diff --git a/mail/opensmtpd/pkg-descr b/mail/opensmtpd/pkg-descr
index e5cefc4f46e5..dd22836635ac 100644
--- a/mail/opensmtpd/pkg-descr
+++ b/mail/opensmtpd/pkg-descr
@@ -3,4 +3,4 @@ defined by RFC 5321, with some additional standard extensions. It
allows ordinary machines to exchange e-mails with other systems
speaking the SMTP protocol.
-WWW: http://www.OpenSMTPD.org/
+WWW: https://www.OpenSMTPD.org/
diff --git a/mail/p5-Mail-Box-IMAP4/Makefile b/mail/p5-Mail-Box-IMAP4/Makefile
new file mode 100644
index 000000000000..e776cb55fe0a
--- /dev/null
+++ b/mail/p5-Mail-Box-IMAP4/Makefile
@@ -0,0 +1,28 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= Mail-Box-IMAP4
+PORTVERSION= 3.003
+CATEGORIES= mail perl5
+MASTER_SITES= CPAN
+PKGNAMEPREFIX= p5-
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Handle IMAP4 folders as client
+
+LICENSE= ART10 GPLv1+
+LICENSE_COMB= dual
+
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+ p5-Mail-Box>=3:mail/p5-Mail-Box \
+ p5-Mail-IMAPClient>=0:mail/p5-Mail-IMAPClient \
+ p5-Mail-Message>=3:mail/p5-Mail-Message \
+ p5-Mail-Transport>=3:mail/p5-Mail-Transport
+
+USES= perl5
+USE_PERL5= configure
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Box-IMAP4/distinfo b/mail/p5-Mail-Box-IMAP4/distinfo
new file mode 100644
index 000000000000..d9edeb72f31d
--- /dev/null
+++ b/mail/p5-Mail-Box-IMAP4/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1539194728
+SHA256 (Mail-Box-IMAP4-3.003.tar.gz) = 15600a571043a55e84df3e00c6ffb82a22881f201042cf7894cbb2d41e7bdd96
+SIZE (Mail-Box-IMAP4-3.003.tar.gz) = 42724
diff --git a/mail/p5-Mail-Box-IMAP4/pkg-descr b/mail/p5-Mail-Box-IMAP4/pkg-descr
new file mode 100644
index 000000000000..ef12872aca54
--- /dev/null
+++ b/mail/p5-Mail-Box-IMAP4/pkg-descr
@@ -0,0 +1,8 @@
+Maintain a folder which has its messages stored on a remote server. The
+communication between the client application and the server is implemented using
+the IMAP4 protocol. This class uses Mail::Transport::IMAP4 to hide the transport
+of information, and focusses solely on the correct handling of messages within a
+IMAP4 folder. More than one IMAP4 folder can be handled by one single IMAP4
+connection.
+
+WWW: https://metacpan.org/release/Mail-Box-IMAP4
diff --git a/mail/p5-Mail-Box-IMAP4/pkg-plist b/mail/p5-Mail-Box-IMAP4/pkg-plist
new file mode 100644
index 000000000000..ef630a9b4084
--- /dev/null
+++ b/mail/p5-Mail-Box-IMAP4/pkg-plist
@@ -0,0 +1,27 @@
+%%SITE_PERL%%/Mail/Box/IMAP4.pm
+%%SITE_PERL%%/Mail/Box/IMAP4.pod
+%%SITE_PERL%%/Mail/Box/IMAP4/Head.pm
+%%SITE_PERL%%/Mail/Box/IMAP4/Head.pod
+%%SITE_PERL%%/Mail/Box/IMAP4/Message.pm
+%%SITE_PERL%%/Mail/Box/IMAP4/Message.pod
+%%SITE_PERL%%/Mail/Server/IMAP4.pm
+%%SITE_PERL%%/Mail/Server/IMAP4.pod
+%%SITE_PERL%%/Mail/Server/IMAP4/Fetch.pm
+%%SITE_PERL%%/Mail/Server/IMAP4/Fetch.pod
+%%SITE_PERL%%/Mail/Server/IMAP4/List.pm
+%%SITE_PERL%%/Mail/Server/IMAP4/List.pod
+%%SITE_PERL%%/Mail/Server/IMAP4/Search.pm
+%%SITE_PERL%%/Mail/Server/IMAP4/Search.pod
+%%SITE_PERL%%/Mail/Server/IMAP4/User.pm
+%%SITE_PERL%%/Mail/Server/IMAP4/User.pod
+%%SITE_PERL%%/Mail/Transport/IMAP4.pm
+%%SITE_PERL%%/Mail/Transport/IMAP4.pod
+%%PERL5_MAN3%%/Mail::Box::IMAP4.3.gz
+%%PERL5_MAN3%%/Mail::Box::IMAP4::Head.3.gz
+%%PERL5_MAN3%%/Mail::Box::IMAP4::Message.3.gz
+%%PERL5_MAN3%%/Mail::Server::IMAP4.3.gz
+%%PERL5_MAN3%%/Mail::Server::IMAP4::Fetch.3.gz
+%%PERL5_MAN3%%/Mail::Server::IMAP4::List.3.gz
+%%PERL5_MAN3%%/Mail::Server::IMAP4::Search.3.gz
+%%PERL5_MAN3%%/Mail::Server::IMAP4::User.3.gz
+%%PERL5_MAN3%%/Mail::Transport::IMAP4.3.gz
diff --git a/mail/p5-Mail-Box-POP3/Makefile b/mail/p5-Mail-Box-POP3/Makefile
new file mode 100644
index 000000000000..ff3a09041bbb
--- /dev/null
+++ b/mail/p5-Mail-Box-POP3/Makefile
@@ -0,0 +1,26 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= Mail-Box-POP3
+PORTVERSION= 3.004
+CATEGORIES= mail perl5
+MASTER_SITES= CPAN
+PKGNAMEPREFIX= p5-
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Handle POP3 folders as client
+
+LICENSE= ART10 GPLv1+
+LICENSE_COMB= dual
+
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Box>=3:mail/p5-Mail-Box \
+ p5-Mail-Message>=3:mail/p5-Mail-Message \
+ p5-Mail-Transport>=3:mail/p5-Mail-Transport
+
+USES= perl5
+USE_PERL5= configure
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Box-POP3/distinfo b/mail/p5-Mail-Box-POP3/distinfo
new file mode 100644
index 000000000000..2b71d7807059
--- /dev/null
+++ b/mail/p5-Mail-Box-POP3/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1539194186
+SHA256 (Mail-Box-POP3-3.004.tar.gz) = da92bbf67f2ba2d319f709fda43980816052b66444061afe92026902c094b568
+SIZE (Mail-Box-POP3-3.004.tar.gz) = 31599
diff --git a/mail/p5-Mail-Box-POP3/pkg-descr b/mail/p5-Mail-Box-POP3/pkg-descr
new file mode 100644
index 000000000000..9c99ce002cb6
--- /dev/null
+++ b/mail/p5-Mail-Box-POP3/pkg-descr
@@ -0,0 +1,7 @@
+Maintain a folder which has its messages stored on a remote server. The
+communication between the client application and the server is implemented using
+the POP3 protocol. This class uses Mail::Transport::POP3 to hide the transport
+of information, and focusses solely on the correct handling of messages within a
+POP3 folder.
+
+WWW: https://metacpan.org/release/Mail-Box-POP3
diff --git a/mail/p5-Mail-Box-POP3/pkg-plist b/mail/p5-Mail-Box-POP3/pkg-plist
new file mode 100644
index 000000000000..6e46289694c0
--- /dev/null
+++ b/mail/p5-Mail-Box-POP3/pkg-plist
@@ -0,0 +1,13 @@
+%%SITE_PERL%%/Mail/Box/POP3.pm
+%%SITE_PERL%%/Mail/Box/POP3.pod
+%%SITE_PERL%%/Mail/Box/POP3/Message.pm
+%%SITE_PERL%%/Mail/Box/POP3/Message.pod
+%%SITE_PERL%%/Mail/Box/POP3/Test.pm
+%%SITE_PERL%%/Mail/Box/POP3s.pm
+%%SITE_PERL%%/Mail/Box/POP3s.pod
+%%SITE_PERL%%/Mail/Transport/POP3.pm
+%%SITE_PERL%%/Mail/Transport/POP3.pod
+%%PERL5_MAN3%%/Mail::Box::POP3.3.gz
+%%PERL5_MAN3%%/Mail::Box::POP3::Message.3.gz
+%%PERL5_MAN3%%/Mail::Box::POP3s.3.gz
+%%PERL5_MAN3%%/Mail::Transport::POP3.3.gz
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 2cda29e54609..95cbad04e93b 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Mail-Box
-PORTVERSION= 2.109
-PORTREVISION= 2
+PORTVERSION= 3.005
CATEGORIES= mail perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MARKOV
@@ -12,29 +11,22 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Perl module implementing a modern mail folder management
-COMMON_DEPENDS= \
- p5-MIME-Tools>=0:mail/p5-MIME-Tools \
- p5-MIME-Types>=0:mail/p5-MIME-Types \
- p5-Mail-Tools>=0:mail/p5-Mail-Tools \
- p5-Devel-GlobalDestruction>=0.09:devel/p5-Devel-GlobalDestruction \
- p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
- p5-File-Remove>=0.20:devel/p5-File-Remove \
- p5-HTML-Format>=2.01:textproc/p5-HTML-Format \
- p5-HTML-Tree>=3.13:www/p5-HTML-Tree \
- p5-IO-stringy>=0:devel/p5-IO-stringy \
- p5-Mail-IMAPClient>=2.2.8:mail/p5-Mail-IMAPClient \
- p5-Mail-Transport-Dbx>=0.04:mail/p5-Mail-Transport-Dbx \
- p5-Object-Realize-Later>=0.14:devel/p5-Object-Realize-Later \
- p5-TimeDate>=0:devel/p5-TimeDate \
- p5-URI>=1.23:net/p5-URI \
- p5-User-Identity>=0.90:devel/p5-User-Identity
-BUILD_DEPENDS= ${COMMON_DEPENDS}
-RUN_DEPENDS= ${COMMON_DEPENDS}
-TEST_DEPENDS= p5-Test-Pod>=1.00:devel/p5-Test-Pod
+LICENSE= ART10 GPLv1+
+LICENSE_COMB= dual
+LICENSE_FILE_ART10= ${WRKSRC}/LICENSE
+
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Devel-GlobalDestruction>=0.09:devel/p5-Devel-GlobalDestruction \
+ p5-File-Remove>=0.20:devel/p5-File-Remove \
+ p5-IO-stringy>=0:devel/p5-IO-stringy \
+ p5-Mail-Message>=3.005:mail/p5-Mail-Message \
+ p5-Mail-Transport>=3.0:mail/p5-Mail-Transport \
+ p5-Object-Realize-Later>=0.19:devel/p5-Object-Realize-Later \
+ p5-TimeDate>=0:devel/p5-TimeDate
USES= perl5
USE_PERL5= configure
-CONFIGURE_ARGS= </dev/null
-CONFIGURE_ENV+= MAILBOX_INSTALL_OPTIONALS=n
+
+NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Box/distinfo b/mail/p5-Mail-Box/distinfo
index 17994abe0ee1..3fd933c4144c 100644
--- a/mail/p5-Mail-Box/distinfo
+++ b/mail/p5-Mail-Box/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Mail-Box-2.109.tar.gz) = 80f4cca2b70b14fc8666c41e7118306ebc9858d75f61885fc33aa18b7ce2888b
-SIZE (Mail-Box-2.109.tar.gz) = 625892
+TIMESTAMP = 1536950616
+SHA256 (Mail-Box-3.005.tar.gz) = 75a4a683d7a6a7fea68057bce180e9da8042e3962d2b1fb49e8cd6b2a32c7b80
+SIZE (Mail-Box-3.005.tar.gz) = 340343
diff --git a/mail/p5-Mail-Box/pkg-plist b/mail/p5-Mail-Box/pkg-plist
index 755405b3d4b1..e3677ddbed34 100644
--- a/mail/p5-Mail-Box/pkg-plist
+++ b/mail/p5-Mail-Box/pkg-plist
@@ -1,30 +1,19 @@
%%SITE_PERL%%/Mail/Box-Cookbook.pod
%%SITE_PERL%%/Mail/Box-Index.pod
%%SITE_PERL%%/Mail/Box-Overview.pod
+%%SITE_PERL%%/Mail/Box-Shorts.pod
%%SITE_PERL%%/Mail/Box.pm
%%SITE_PERL%%/Mail/Box.pod
%%SITE_PERL%%/Mail/Box/Collection.pm
%%SITE_PERL%%/Mail/Box/Collection.pod
-%%SITE_PERL%%/Mail/Box/Dbx.pm
-%%SITE_PERL%%/Mail/Box/Dbx.pod
-%%SITE_PERL%%/Mail/Box/Dbx/Message.pm
-%%SITE_PERL%%/Mail/Box/Dbx/Message.pod
%%SITE_PERL%%/Mail/Box/Dir.pm
%%SITE_PERL%%/Mail/Box/Dir.pod
%%SITE_PERL%%/Mail/Box/Dir/Message.pm
%%SITE_PERL%%/Mail/Box/Dir/Message.pod
-%%SITE_PERL%%/Mail/Box/FastScalar.pm
-%%SITE_PERL%%/Mail/Box/FastScalar.pod
%%SITE_PERL%%/Mail/Box/File.pm
%%SITE_PERL%%/Mail/Box/File.pod
%%SITE_PERL%%/Mail/Box/File/Message.pm
%%SITE_PERL%%/Mail/Box/File/Message.pod
-%%SITE_PERL%%/Mail/Box/IMAP4.pm
-%%SITE_PERL%%/Mail/Box/IMAP4.pod
-%%SITE_PERL%%/Mail/Box/IMAP4/Head.pm
-%%SITE_PERL%%/Mail/Box/IMAP4/Head.pod
-%%SITE_PERL%%/Mail/Box/IMAP4/Message.pm
-%%SITE_PERL%%/Mail/Box/IMAP4/Message.pod
%%SITE_PERL%%/Mail/Box/Identity.pm
%%SITE_PERL%%/Mail/Box/Identity.pod
%%SITE_PERL%%/Mail/Box/Locker.pm
@@ -71,22 +60,13 @@
%%SITE_PERL%%/Mail/Box/Net.pod
%%SITE_PERL%%/Mail/Box/Net/Message.pm
%%SITE_PERL%%/Mail/Box/Net/Message.pod
-%%SITE_PERL%%/Mail/Box/POP3.pm
-%%SITE_PERL%%/Mail/Box/POP3.pod
-%%SITE_PERL%%/Mail/Box/POP3/Message.pm
-%%SITE_PERL%%/Mail/Box/POP3/Message.pod
-%%SITE_PERL%%/Mail/Box/POP3s.pm
-%%SITE_PERL%%/Mail/Box/POP3s.pod
-%%SITE_PERL%%/Mail/Box/Parser.pm
-%%SITE_PERL%%/Mail/Box/Parser.pod
-%%SITE_PERL%%/Mail/Box/Parser/Perl.pm
-%%SITE_PERL%%/Mail/Box/Parser/Perl.pod
%%SITE_PERL%%/Mail/Box/Search.pm
%%SITE_PERL%%/Mail/Box/Search.pod
%%SITE_PERL%%/Mail/Box/Search/Grep.pm
%%SITE_PERL%%/Mail/Box/Search/Grep.pod
%%SITE_PERL%%/Mail/Box/Search/SpamAssassin.pm
%%SITE_PERL%%/Mail/Box/Search/SpamAssassin.pod
+%%SITE_PERL%%/Mail/Box/Test.pm
%%SITE_PERL%%/Mail/Box/Thread/Manager.pm
%%SITE_PERL%%/Mail/Box/Thread/Manager.pod
%%SITE_PERL%%/Mail/Box/Thread/Node.pm
@@ -97,169 +77,28 @@
%%SITE_PERL%%/Mail/Box/Tie/ARRAY.pod
%%SITE_PERL%%/Mail/Box/Tie/HASH.pm
%%SITE_PERL%%/Mail/Box/Tie/HASH.pod
-%%SITE_PERL%%/Mail/Message.pm
-%%SITE_PERL%%/Mail/Message.pod
-%%SITE_PERL%%/Mail/Message/Body.pm
-%%SITE_PERL%%/Mail/Message/Body.pod
-%%SITE_PERL%%/Mail/Message/Body/Construct.pm
-%%SITE_PERL%%/Mail/Message/Body/Construct.pod
%%SITE_PERL%%/Mail/Message/Body/Delayed.pm
%%SITE_PERL%%/Mail/Message/Body/Delayed.pod
-%%SITE_PERL%%/Mail/Message/Body/Encode.pm
-%%SITE_PERL%%/Mail/Message/Body/Encode.pod
-%%SITE_PERL%%/Mail/Message/Body/File.pm
-%%SITE_PERL%%/Mail/Message/Body/File.pod
-%%SITE_PERL%%/Mail/Message/Body/Lines.pm
-%%SITE_PERL%%/Mail/Message/Body/Lines.pod
-%%SITE_PERL%%/Mail/Message/Body/Multipart.pm
-%%SITE_PERL%%/Mail/Message/Body/Multipart.pod
-%%SITE_PERL%%/Mail/Message/Body/Nested.pm
-%%SITE_PERL%%/Mail/Message/Body/Nested.pod
-%%SITE_PERL%%/Mail/Message/Body/String.pm
-%%SITE_PERL%%/Mail/Message/Body/String.pod
-%%SITE_PERL%%/Mail/Message/Construct.pm
-%%SITE_PERL%%/Mail/Message/Construct.pod
-%%SITE_PERL%%/Mail/Message/Construct/Bounce.pm
-%%SITE_PERL%%/Mail/Message/Construct/Bounce.pod
-%%SITE_PERL%%/Mail/Message/Construct/Build.pm
-%%SITE_PERL%%/Mail/Message/Construct/Build.pod
-%%SITE_PERL%%/Mail/Message/Construct/Forward.pm
-%%SITE_PERL%%/Mail/Message/Construct/Forward.pod
-%%SITE_PERL%%/Mail/Message/Construct/Read.pm
-%%SITE_PERL%%/Mail/Message/Construct/Read.pod
-%%SITE_PERL%%/Mail/Message/Construct/Rebuild.pm
-%%SITE_PERL%%/Mail/Message/Construct/Rebuild.pod
-%%SITE_PERL%%/Mail/Message/Construct/Reply.pm
-%%SITE_PERL%%/Mail/Message/Construct/Reply.pod
-%%SITE_PERL%%/Mail/Message/Construct/Text.pm
-%%SITE_PERL%%/Mail/Message/Construct/Text.pod
-%%SITE_PERL%%/Mail/Message/Convert.pm
-%%SITE_PERL%%/Mail/Message/Convert.pod
-%%SITE_PERL%%/Mail/Message/Convert/EmailSimple.pm
-%%SITE_PERL%%/Mail/Message/Convert/EmailSimple.pod
-%%SITE_PERL%%/Mail/Message/Convert/Html.pm
-%%SITE_PERL%%/Mail/Message/Convert/Html.pod
-%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatPS.pm
-%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatPS.pod
-%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatText.pm
-%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatText.pod
-%%SITE_PERL%%/Mail/Message/Convert/MailInternet.pm
-%%SITE_PERL%%/Mail/Message/Convert/MailInternet.pod
-%%SITE_PERL%%/Mail/Message/Convert/MimeEntity.pm
-%%SITE_PERL%%/Mail/Message/Convert/MimeEntity.pod
-%%SITE_PERL%%/Mail/Message/Convert/TextAutoformat.pm
-%%SITE_PERL%%/Mail/Message/Convert/TextAutoformat.pod
%%SITE_PERL%%/Mail/Message/Dummy.pm
%%SITE_PERL%%/Mail/Message/Dummy.pod
-%%SITE_PERL%%/Mail/Message/Field.pm
-%%SITE_PERL%%/Mail/Message/Field.pod
-%%SITE_PERL%%/Mail/Message/Field/AddrGroup.pm
-%%SITE_PERL%%/Mail/Message/Field/AddrGroup.pod
-%%SITE_PERL%%/Mail/Message/Field/Address.pm
-%%SITE_PERL%%/Mail/Message/Field/Address.pod
-%%SITE_PERL%%/Mail/Message/Field/Addresses.pm
-%%SITE_PERL%%/Mail/Message/Field/Addresses.pod
-%%SITE_PERL%%/Mail/Message/Field/Attribute.pm
-%%SITE_PERL%%/Mail/Message/Field/Attribute.pod
-%%SITE_PERL%%/Mail/Message/Field/Date.pm
-%%SITE_PERL%%/Mail/Message/Field/Date.pod
-%%SITE_PERL%%/Mail/Message/Field/Fast.pm
-%%SITE_PERL%%/Mail/Message/Field/Fast.pod
-%%SITE_PERL%%/Mail/Message/Field/Flex.pm
-%%SITE_PERL%%/Mail/Message/Field/Flex.pod
-%%SITE_PERL%%/Mail/Message/Field/Full.pm
-%%SITE_PERL%%/Mail/Message/Field/Full.pod
-%%SITE_PERL%%/Mail/Message/Field/Structured.pm
-%%SITE_PERL%%/Mail/Message/Field/Structured.pod
-%%SITE_PERL%%/Mail/Message/Field/URIs.pm
-%%SITE_PERL%%/Mail/Message/Field/URIs.pod
-%%SITE_PERL%%/Mail/Message/Field/Unstructured.pm
-%%SITE_PERL%%/Mail/Message/Field/Unstructured.pod
-%%SITE_PERL%%/Mail/Message/Head.pm
-%%SITE_PERL%%/Mail/Message/Head.pod
-%%SITE_PERL%%/Mail/Message/Head/Complete.pm
-%%SITE_PERL%%/Mail/Message/Head/Complete.pod
%%SITE_PERL%%/Mail/Message/Head/Delayed.pm
%%SITE_PERL%%/Mail/Message/Head/Delayed.pod
-%%SITE_PERL%%/Mail/Message/Head/FieldGroup.pm
-%%SITE_PERL%%/Mail/Message/Head/FieldGroup.pod
-%%SITE_PERL%%/Mail/Message/Head/ListGroup.pm
-%%SITE_PERL%%/Mail/Message/Head/ListGroup.pod
-%%SITE_PERL%%/Mail/Message/Head/Partial.pm
-%%SITE_PERL%%/Mail/Message/Head/Partial.pod
-%%SITE_PERL%%/Mail/Message/Head/ResentGroup.pm
-%%SITE_PERL%%/Mail/Message/Head/ResentGroup.pod
-%%SITE_PERL%%/Mail/Message/Head/SpamGroup.pm
-%%SITE_PERL%%/Mail/Message/Head/SpamGroup.pod
%%SITE_PERL%%/Mail/Message/Head/Subset.pm
%%SITE_PERL%%/Mail/Message/Head/Subset.pod
-%%SITE_PERL%%/Mail/Message/Part.pm
-%%SITE_PERL%%/Mail/Message/Part.pod
-%%SITE_PERL%%/Mail/Message/Replace/MailHeader.pm
-%%SITE_PERL%%/Mail/Message/Replace/MailHeader.pod
-%%SITE_PERL%%/Mail/Message/Replace/MailInternet.pm
-%%SITE_PERL%%/Mail/Message/Replace/MailInternet.pod
-%%SITE_PERL%%/Mail/Message/TransferEnc.pm
-%%SITE_PERL%%/Mail/Message/TransferEnc.pod
-%%SITE_PERL%%/Mail/Message/TransferEnc/Base64.pm
-%%SITE_PERL%%/Mail/Message/TransferEnc/Base64.pod
-%%SITE_PERL%%/Mail/Message/TransferEnc/Binary.pm
-%%SITE_PERL%%/Mail/Message/TransferEnc/Binary.pod
-%%SITE_PERL%%/Mail/Message/TransferEnc/EightBit.pm
-%%SITE_PERL%%/Mail/Message/TransferEnc/EightBit.pod
-%%SITE_PERL%%/Mail/Message/TransferEnc/QuotedPrint.pm
-%%SITE_PERL%%/Mail/Message/TransferEnc/QuotedPrint.pod
-%%SITE_PERL%%/Mail/Message/TransferEnc/SevenBit.pm
-%%SITE_PERL%%/Mail/Message/TransferEnc/SevenBit.pod
%%SITE_PERL%%/Mail/Message/Wrapper/SpamAssassin.pm
%%SITE_PERL%%/Mail/Message/Wrapper/SpamAssassin.pod
-%%SITE_PERL%%/Mail/Reporter.pm
-%%SITE_PERL%%/Mail/Reporter.pod
%%SITE_PERL%%/Mail/Server.pm
%%SITE_PERL%%/Mail/Server.pod
-%%SITE_PERL%%/Mail/Server/IMAP4.pm
-%%SITE_PERL%%/Mail/Server/IMAP4.pod
-%%SITE_PERL%%/Mail/Server/IMAP4/Fetch.pm
-%%SITE_PERL%%/Mail/Server/IMAP4/Fetch.pod
-%%SITE_PERL%%/Mail/Server/IMAP4/List.pm
-%%SITE_PERL%%/Mail/Server/IMAP4/List.pod
-%%SITE_PERL%%/Mail/Server/IMAP4/Search.pm
-%%SITE_PERL%%/Mail/Server/IMAP4/Search.pod
-%%SITE_PERL%%/Mail/Transport.pm
-%%SITE_PERL%%/Mail/Transport.pod
-%%SITE_PERL%%/Mail/Transport/Exim.pm
-%%SITE_PERL%%/Mail/Transport/Exim.pod
-%%SITE_PERL%%/Mail/Transport/IMAP4.pm
-%%SITE_PERL%%/Mail/Transport/IMAP4.pod
-%%SITE_PERL%%/Mail/Transport/Mailx.pm
-%%SITE_PERL%%/Mail/Transport/Mailx.pod
-%%SITE_PERL%%/Mail/Transport/POP3.pm
-%%SITE_PERL%%/Mail/Transport/POP3.pod
-%%SITE_PERL%%/Mail/Transport/Qmail.pm
-%%SITE_PERL%%/Mail/Transport/Qmail.pod
-%%SITE_PERL%%/Mail/Transport/Receive.pm
-%%SITE_PERL%%/Mail/Transport/Receive.pod
-%%SITE_PERL%%/Mail/Transport/SMTP.pm
-%%SITE_PERL%%/Mail/Transport/SMTP.pod
-%%SITE_PERL%%/Mail/Transport/Send.pm
-%%SITE_PERL%%/Mail/Transport/Send.pod
-%%SITE_PERL%%/Mail/Transport/Sendmail.pm
-%%SITE_PERL%%/Mail/Transport/Sendmail.pod
%%PERL5_MAN3%%/Mail::Box-Cookbook.3.gz
%%PERL5_MAN3%%/Mail::Box-Index.3.gz
%%PERL5_MAN3%%/Mail::Box-Overview.3.gz
+%%PERL5_MAN3%%/Mail::Box-Shorts.3.gz
%%PERL5_MAN3%%/Mail::Box.3.gz
%%PERL5_MAN3%%/Mail::Box::Collection.3.gz
-%%PERL5_MAN3%%/Mail::Box::Dbx.3.gz
-%%PERL5_MAN3%%/Mail::Box::Dbx::Message.3.gz
%%PERL5_MAN3%%/Mail::Box::Dir.3.gz
%%PERL5_MAN3%%/Mail::Box::Dir::Message.3.gz
-%%PERL5_MAN3%%/Mail::Box::FastScalar.3.gz
%%PERL5_MAN3%%/Mail::Box::File.3.gz
%%PERL5_MAN3%%/Mail::Box::File::Message.3.gz
-%%PERL5_MAN3%%/Mail::Box::IMAP4.3.gz
-%%PERL5_MAN3%%/Mail::Box::IMAP4::Head.3.gz
-%%PERL5_MAN3%%/Mail::Box::IMAP4::Message.3.gz
%%PERL5_MAN3%%/Mail::Box::Identity.3.gz
%%PERL5_MAN3%%/Mail::Box::Locker.3.gz
%%PERL5_MAN3%%/Mail::Box::Locker::DotLock.3.gz
@@ -283,11 +122,6 @@
%%PERL5_MAN3%%/Mail::Box::Message::Destructed.3.gz
%%PERL5_MAN3%%/Mail::Box::Net.3.gz
%%PERL5_MAN3%%/Mail::Box::Net::Message.3.gz
-%%PERL5_MAN3%%/Mail::Box::POP3.3.gz
-%%PERL5_MAN3%%/Mail::Box::POP3::Message.3.gz
-%%PERL5_MAN3%%/Mail::Box::POP3s.3.gz
-%%PERL5_MAN3%%/Mail::Box::Parser.3.gz
-%%PERL5_MAN3%%/Mail::Box::Parser::Perl.3.gz
%%PERL5_MAN3%%/Mail::Box::Search.3.gz
%%PERL5_MAN3%%/Mail::Box::Search::Grep.3.gz
%%PERL5_MAN3%%/Mail::Box::Search::SpamAssassin.3.gz
@@ -296,77 +130,9 @@
%%PERL5_MAN3%%/Mail::Box::Tie.3.gz
%%PERL5_MAN3%%/Mail::Box::Tie::ARRAY.3.gz
%%PERL5_MAN3%%/Mail::Box::Tie::HASH.3.gz
-%%PERL5_MAN3%%/Mail::Message.3.gz
-%%PERL5_MAN3%%/Mail::Message::Body.3.gz
-%%PERL5_MAN3%%/Mail::Message::Body::Construct.3.gz
%%PERL5_MAN3%%/Mail::Message::Body::Delayed.3.gz
-%%PERL5_MAN3%%/Mail::Message::Body::Encode.3.gz
-%%PERL5_MAN3%%/Mail::Message::Body::File.3.gz
-%%PERL5_MAN3%%/Mail::Message::Body::Lines.3.gz
-%%PERL5_MAN3%%/Mail::Message::Body::Multipart.3.gz
-%%PERL5_MAN3%%/Mail::Message::Body::Nested.3.gz
-%%PERL5_MAN3%%/Mail::Message::Body::String.3.gz
-%%PERL5_MAN3%%/Mail::Message::Construct.3.gz
-%%PERL5_MAN3%%/Mail::Message::Construct::Bounce.3.gz
-%%PERL5_MAN3%%/Mail::Message::Construct::Build.3.gz
-%%PERL5_MAN3%%/Mail::Message::Construct::Forward.3.gz
-%%PERL5_MAN3%%/Mail::Message::Construct::Read.3.gz
-%%PERL5_MAN3%%/Mail::Message::Construct::Rebuild.3.gz
-%%PERL5_MAN3%%/Mail::Message::Construct::Reply.3.gz
-%%PERL5_MAN3%%/Mail::Message::Construct::Text.3.gz
-%%PERL5_MAN3%%/Mail::Message::Convert.3.gz
-%%PERL5_MAN3%%/Mail::Message::Convert::EmailSimple.3.gz
-%%PERL5_MAN3%%/Mail::Message::Convert::Html.3.gz
-%%PERL5_MAN3%%/Mail::Message::Convert::HtmlFormatPS.3.gz
-%%PERL5_MAN3%%/Mail::Message::Convert::HtmlFormatText.3.gz
-%%PERL5_MAN3%%/Mail::Message::Convert::MailInternet.3.gz
-%%PERL5_MAN3%%/Mail::Message::Convert::MimeEntity.3.gz
-%%PERL5_MAN3%%/Mail::Message::Convert::TextAutoformat.3.gz
%%PERL5_MAN3%%/Mail::Message::Dummy.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::AddrGroup.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Address.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Addresses.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Attribute.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Date.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Fast.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Flex.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Full.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Structured.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::URIs.3.gz
-%%PERL5_MAN3%%/Mail::Message::Field::Unstructured.3.gz
-%%PERL5_MAN3%%/Mail::Message::Head.3.gz
-%%PERL5_MAN3%%/Mail::Message::Head::Complete.3.gz
%%PERL5_MAN3%%/Mail::Message::Head::Delayed.3.gz
-%%PERL5_MAN3%%/Mail::Message::Head::FieldGroup.3.gz
-%%PERL5_MAN3%%/Mail::Message::Head::ListGroup.3.gz
-%%PERL5_MAN3%%/Mail::Message::Head::Partial.3.gz
-%%PERL5_MAN3%%/Mail::Message::Head::ResentGroup.3.gz
-%%PERL5_MAN3%%/Mail::Message::Head::SpamGroup.3.gz
%%PERL5_MAN3%%/Mail::Message::Head::Subset.3.gz
-%%PERL5_MAN3%%/Mail::Message::Part.3.gz
-%%PERL5_MAN3%%/Mail::Message::Replace::MailHeader.3.gz
-%%PERL5_MAN3%%/Mail::Message::Replace::MailInternet.3.gz
-%%PERL5_MAN3%%/Mail::Message::TransferEnc.3.gz
-%%PERL5_MAN3%%/Mail::Message::TransferEnc::Base64.3.gz
-%%PERL5_MAN3%%/Mail::Message::TransferEnc::Binary.3.gz
-%%PERL5_MAN3%%/Mail::Message::TransferEnc::EightBit.3.gz
-%%PERL5_MAN3%%/Mail::Message::TransferEnc::QuotedPrint.3.gz
-%%PERL5_MAN3%%/Mail::Message::TransferEnc::SevenBit.3.gz
%%PERL5_MAN3%%/Mail::Message::Wrapper::SpamAssassin.3.gz
-%%PERL5_MAN3%%/Mail::Reporter.3.gz
%%PERL5_MAN3%%/Mail::Server.3.gz
-%%PERL5_MAN3%%/Mail::Server::IMAP4.3.gz
-%%PERL5_MAN3%%/Mail::Server::IMAP4::Fetch.3.gz
-%%PERL5_MAN3%%/Mail::Server::IMAP4::List.3.gz
-%%PERL5_MAN3%%/Mail::Server::IMAP4::Search.3.gz
-%%PERL5_MAN3%%/Mail::Transport.3.gz
-%%PERL5_MAN3%%/Mail::Transport::Exim.3.gz
-%%PERL5_MAN3%%/Mail::Transport::IMAP4.3.gz
-%%PERL5_MAN3%%/Mail::Transport::Mailx.3.gz
-%%PERL5_MAN3%%/Mail::Transport::POP3.3.gz
-%%PERL5_MAN3%%/Mail::Transport::Qmail.3.gz
-%%PERL5_MAN3%%/Mail::Transport::Receive.3.gz
-%%PERL5_MAN3%%/Mail::Transport::SMTP.3.gz
-%%PERL5_MAN3%%/Mail::Transport::Send.3.gz
-%%PERL5_MAN3%%/Mail::Transport::Sendmail.3.gz
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index bbcce9c9ee43..d7a9df384931 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Mail-DKIM
-PORTVERSION= 0.53
+PORTVERSION= 0.54
CATEGORIES= mail perl5
MASTER_SITES= CPAN \
http://jason.long.name/dkimproxy/
@@ -22,10 +22,11 @@ RUN_DEPENDS= p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
TEST_DEPENDS= p5-Test-RequiresInternet>=0:devel/p5-Test-RequiresInternet \
p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
-NO_ARCH= yes
USES= perl5 shebangfix
USE_PERL5= configure
+NO_ARCH= yes
+
SHEBANG_FILES= scripts/*.pl
post-install:
diff --git a/mail/p5-Mail-DKIM/distinfo b/mail/p5-Mail-DKIM/distinfo
index 7fb36a95e112..c419bea82951 100644
--- a/mail/p5-Mail-DKIM/distinfo
+++ b/mail/p5-Mail-DKIM/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527522880
-SHA256 (Mail-DKIM-0.53.tar.gz) = 7c44099e201f69a594b81605488e317c79d6436dab43e3289d8c61bda67315ab
-SIZE (Mail-DKIM-0.53.tar.gz) = 160492
+TIMESTAMP = 1539625278
+SHA256 (Mail-DKIM-0.54.tar.gz) = b72f78c80f7aa1bdb2a80986b45f9225a8fa0b7c91644590b102a78eb31c3dca
+SIZE (Mail-DKIM-0.54.tar.gz) = 160493
diff --git a/mail/p5-Mail-Message/Makefile b/mail/p5-Mail-Message/Makefile
new file mode 100644
index 000000000000..3876a3f3dd92
--- /dev/null
+++ b/mail/p5-Mail-Message/Makefile
@@ -0,0 +1,29 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= Mail-Message
+PORTVERSION= 3.007
+CATEGORIES= mail perl5
+MASTER_SITES= CPAN
+PKGNAMEPREFIX= p5-
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= General message object
+
+LICENSE= ART10 GPLv1+
+LICENSE_COMB= dual
+
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy \
+ p5-MIME-Types>=1.004:mail/p5-MIME-Types \
+ p5-Mail-Tools>=2.17:mail/p5-Mail-Tools \
+ p5-TimeDate>=0:devel/p5-TimeDate \
+ p5-URI>=1.23:net/p5-URI \
+ p5-User-Identity>=0.94:devel/p5-User-Identity
+
+USES= perl5
+USE_PERL5= configure
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Message/distinfo b/mail/p5-Mail-Message/distinfo
new file mode 100644
index 000000000000..2f1b86700562
--- /dev/null
+++ b/mail/p5-Mail-Message/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1537133905
+SHA256 (Mail-Message-3.007.tar.gz) = 7601dc5d1bedc0b6338b8b8c0ce5360aa75e112cbc48bc22eb0d085e2232eec2
+SIZE (Mail-Message-3.007.tar.gz) = 257554
diff --git a/mail/p5-Mail-Message/pkg-descr b/mail/p5-Mail-Message/pkg-descr
new file mode 100644
index 000000000000..ccd76deb85c1
--- /dev/null
+++ b/mail/p5-Mail-Message/pkg-descr
@@ -0,0 +1,15 @@
+A Mail::Message object is a container for MIME-encoded message information, as
+defined by RFC2822. Everything what is not specificaly related to storing the
+messages in mailboxes (folders) is implemented in this class. Methods which are
+related to folders is implemented in the Mail::Box::Message extension.
+
+The main methods are get(), to get information from a message header field, and
+decoded() to get the intended content of a message. But there are many more
+which can assist your program.
+
+Complex message handling, like construction of replies and forwards, are
+implemented in separate packages which are autoloaded into this class. This
+means you can simply use these methods as if they are part of this class. Those
+package add functionality to all kinds of message objects.
+
+WWW: https://metacpan.org/release/Mail-Message
diff --git a/mail/p5-Mail-Message/pkg-plist b/mail/p5-Mail-Message/pkg-plist
new file mode 100644
index 000000000000..0c693b25ade8
--- /dev/null
+++ b/mail/p5-Mail-Message/pkg-plist
@@ -0,0 +1,178 @@
+%%SITE_PERL%%/Mail/Box/FastScalar.pm
+%%SITE_PERL%%/Mail/Box/FastScalar.pod
+%%SITE_PERL%%/Mail/Box/Parser.pm
+%%SITE_PERL%%/Mail/Box/Parser.pod
+%%SITE_PERL%%/Mail/Box/Parser/Perl.pm
+%%SITE_PERL%%/Mail/Box/Parser/Perl.pod
+%%SITE_PERL%%/Mail/Message.pm
+%%SITE_PERL%%/Mail/Message.pod
+%%SITE_PERL%%/Mail/Message/Body.pm
+%%SITE_PERL%%/Mail/Message/Body.pod
+%%SITE_PERL%%/Mail/Message/Body/Construct.pm
+%%SITE_PERL%%/Mail/Message/Body/Construct.pod
+%%SITE_PERL%%/Mail/Message/Body/Encode.pm
+%%SITE_PERL%%/Mail/Message/Body/Encode.pod
+%%SITE_PERL%%/Mail/Message/Body/File.pm
+%%SITE_PERL%%/Mail/Message/Body/File.pod
+%%SITE_PERL%%/Mail/Message/Body/Lines.pm
+%%SITE_PERL%%/Mail/Message/Body/Lines.pod
+%%SITE_PERL%%/Mail/Message/Body/Multipart.pm
+%%SITE_PERL%%/Mail/Message/Body/Multipart.pod
+%%SITE_PERL%%/Mail/Message/Body/Nested.pm
+%%SITE_PERL%%/Mail/Message/Body/Nested.pod
+%%SITE_PERL%%/Mail/Message/Body/String.pm
+%%SITE_PERL%%/Mail/Message/Body/String.pod
+%%SITE_PERL%%/Mail/Message/Construct.pm
+%%SITE_PERL%%/Mail/Message/Construct.pod
+%%SITE_PERL%%/Mail/Message/Construct/Bounce.pm
+%%SITE_PERL%%/Mail/Message/Construct/Bounce.pod
+%%SITE_PERL%%/Mail/Message/Construct/Build.pm
+%%SITE_PERL%%/Mail/Message/Construct/Build.pod
+%%SITE_PERL%%/Mail/Message/Construct/Forward.pm
+%%SITE_PERL%%/Mail/Message/Construct/Forward.pod
+%%SITE_PERL%%/Mail/Message/Construct/Read.pm
+%%SITE_PERL%%/Mail/Message/Construct/Read.pod
+%%SITE_PERL%%/Mail/Message/Construct/Rebuild.pm
+%%SITE_PERL%%/Mail/Message/Construct/Rebuild.pod
+%%SITE_PERL%%/Mail/Message/Construct/Reply.pm
+%%SITE_PERL%%/Mail/Message/Construct/Reply.pod
+%%SITE_PERL%%/Mail/Message/Construct/Text.pm
+%%SITE_PERL%%/Mail/Message/Construct/Text.pod
+%%SITE_PERL%%/Mail/Message/Convert.pm
+%%SITE_PERL%%/Mail/Message/Convert.pod
+%%SITE_PERL%%/Mail/Message/Convert/EmailSimple.pm
+%%SITE_PERL%%/Mail/Message/Convert/EmailSimple.pod
+%%SITE_PERL%%/Mail/Message/Convert/Html.pm
+%%SITE_PERL%%/Mail/Message/Convert/Html.pod
+%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatPS.pm
+%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatPS.pod
+%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatText.pm
+%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatText.pod
+%%SITE_PERL%%/Mail/Message/Convert/MailInternet.pm
+%%SITE_PERL%%/Mail/Message/Convert/MailInternet.pod
+%%SITE_PERL%%/Mail/Message/Convert/MimeEntity.pm
+%%SITE_PERL%%/Mail/Message/Convert/MimeEntity.pod
+%%SITE_PERL%%/Mail/Message/Convert/TextAutoformat.pm
+%%SITE_PERL%%/Mail/Message/Convert/TextAutoformat.pod
+%%SITE_PERL%%/Mail/Message/Field.pm
+%%SITE_PERL%%/Mail/Message/Field.pod
+%%SITE_PERL%%/Mail/Message/Field/AddrGroup.pm
+%%SITE_PERL%%/Mail/Message/Field/AddrGroup.pod
+%%SITE_PERL%%/Mail/Message/Field/Address.pm
+%%SITE_PERL%%/Mail/Message/Field/Address.pod
+%%SITE_PERL%%/Mail/Message/Field/Addresses.pm
+%%SITE_PERL%%/Mail/Message/Field/Addresses.pod
+%%SITE_PERL%%/Mail/Message/Field/Attribute.pm
+%%SITE_PERL%%/Mail/Message/Field/Attribute.pod
+%%SITE_PERL%%/Mail/Message/Field/AuthResults.pm
+%%SITE_PERL%%/Mail/Message/Field/AuthResults.pod
+%%SITE_PERL%%/Mail/Message/Field/DKIM.pm
+%%SITE_PERL%%/Mail/Message/Field/DKIM.pod
+%%SITE_PERL%%/Mail/Message/Field/Date.pm
+%%SITE_PERL%%/Mail/Message/Field/Date.pod
+%%SITE_PERL%%/Mail/Message/Field/Fast.pm
+%%SITE_PERL%%/Mail/Message/Field/Fast.pod
+%%SITE_PERL%%/Mail/Message/Field/Flex.pm
+%%SITE_PERL%%/Mail/Message/Field/Flex.pod
+%%SITE_PERL%%/Mail/Message/Field/Full.pm
+%%SITE_PERL%%/Mail/Message/Field/Full.pod
+%%SITE_PERL%%/Mail/Message/Field/Structured.pm
+%%SITE_PERL%%/Mail/Message/Field/Structured.pod
+%%SITE_PERL%%/Mail/Message/Field/URIs.pm
+%%SITE_PERL%%/Mail/Message/Field/URIs.pod
+%%SITE_PERL%%/Mail/Message/Field/Unstructured.pm
+%%SITE_PERL%%/Mail/Message/Field/Unstructured.pod
+%%SITE_PERL%%/Mail/Message/Head.pm
+%%SITE_PERL%%/Mail/Message/Head.pod
+%%SITE_PERL%%/Mail/Message/Head/Complete.pm
+%%SITE_PERL%%/Mail/Message/Head/Complete.pod
+%%SITE_PERL%%/Mail/Message/Head/FieldGroup.pm
+%%SITE_PERL%%/Mail/Message/Head/FieldGroup.pod
+%%SITE_PERL%%/Mail/Message/Head/ListGroup.pm
+%%SITE_PERL%%/Mail/Message/Head/ListGroup.pod
+%%SITE_PERL%%/Mail/Message/Head/Partial.pm
+%%SITE_PERL%%/Mail/Message/Head/Partial.pod
+%%SITE_PERL%%/Mail/Message/Head/ResentGroup.pm
+%%SITE_PERL%%/Mail/Message/Head/ResentGroup.pod
+%%SITE_PERL%%/Mail/Message/Head/SpamGroup.pm
+%%SITE_PERL%%/Mail/Message/Head/SpamGroup.pod
+%%SITE_PERL%%/Mail/Message/Part.pm
+%%SITE_PERL%%/Mail/Message/Part.pod
+%%SITE_PERL%%/Mail/Message/Replace/MailHeader.pm
+%%SITE_PERL%%/Mail/Message/Replace/MailHeader.pod
+%%SITE_PERL%%/Mail/Message/Replace/MailInternet.pm
+%%SITE_PERL%%/Mail/Message/Replace/MailInternet.pod
+%%SITE_PERL%%/Mail/Message/Test.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/Base64.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/Base64.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/Binary.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/Binary.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/EightBit.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/EightBit.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/QuotedPrint.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/QuotedPrint.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/SevenBit.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/SevenBit.pod
+%%SITE_PERL%%/Mail/Reporter.pm
+%%SITE_PERL%%/Mail/Reporter.pod
+%%PERL5_MAN3%%/Mail::Box::FastScalar.3.gz
+%%PERL5_MAN3%%/Mail::Box::Parser.3.gz
+%%PERL5_MAN3%%/Mail::Box::Parser::Perl.3.gz
+%%PERL5_MAN3%%/Mail::Message.3.gz
+%%PERL5_MAN3%%/Mail::Message::Body.3.gz
+%%PERL5_MAN3%%/Mail::Message::Body::Construct.3.gz
+%%PERL5_MAN3%%/Mail::Message::Body::Encode.3.gz
+%%PERL5_MAN3%%/Mail::Message::Body::File.3.gz
+%%PERL5_MAN3%%/Mail::Message::Body::Lines.3.gz
+%%PERL5_MAN3%%/Mail::Message::Body::Multipart.3.gz
+%%PERL5_MAN3%%/Mail::Message::Body::Nested.3.gz
+%%PERL5_MAN3%%/Mail::Message::Body::String.3.gz
+%%PERL5_MAN3%%/Mail::Message::Construct.3.gz
+%%PERL5_MAN3%%/Mail::Message::Construct::Bounce.3.gz
+%%PERL5_MAN3%%/Mail::Message::Construct::Build.3.gz
+%%PERL5_MAN3%%/Mail::Message::Construct::Forward.3.gz
+%%PERL5_MAN3%%/Mail::Message::Construct::Read.3.gz
+%%PERL5_MAN3%%/Mail::Message::Construct::Rebuild.3.gz
+%%PERL5_MAN3%%/Mail::Message::Construct::Reply.3.gz
+%%PERL5_MAN3%%/Mail::Message::Construct::Text.3.gz
+%%PERL5_MAN3%%/Mail::Message::Convert.3.gz
+%%PERL5_MAN3%%/Mail::Message::Convert::EmailSimple.3.gz
+%%PERL5_MAN3%%/Mail::Message::Convert::Html.3.gz
+%%PERL5_MAN3%%/Mail::Message::Convert::HtmlFormatPS.3.gz
+%%PERL5_MAN3%%/Mail::Message::Convert::HtmlFormatText.3.gz
+%%PERL5_MAN3%%/Mail::Message::Convert::MailInternet.3.gz
+%%PERL5_MAN3%%/Mail::Message::Convert::MimeEntity.3.gz
+%%PERL5_MAN3%%/Mail::Message::Convert::TextAutoformat.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::AddrGroup.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Address.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Addresses.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Attribute.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::AuthResults.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::DKIM.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Date.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Fast.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Flex.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Full.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Structured.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::URIs.3.gz
+%%PERL5_MAN3%%/Mail::Message::Field::Unstructured.3.gz
+%%PERL5_MAN3%%/Mail::Message::Head.3.gz
+%%PERL5_MAN3%%/Mail::Message::Head::Complete.3.gz
+%%PERL5_MAN3%%/Mail::Message::Head::FieldGroup.3.gz
+%%PERL5_MAN3%%/Mail::Message::Head::ListGroup.3.gz
+%%PERL5_MAN3%%/Mail::Message::Head::Partial.3.gz
+%%PERL5_MAN3%%/Mail::Message::Head::ResentGroup.3.gz
+%%PERL5_MAN3%%/Mail::Message::Head::SpamGroup.3.gz
+%%PERL5_MAN3%%/Mail::Message::Part.3.gz
+%%PERL5_MAN3%%/Mail::Message::Replace::MailHeader.3.gz
+%%PERL5_MAN3%%/Mail::Message::Replace::MailInternet.3.gz
+%%PERL5_MAN3%%/Mail::Message::TransferEnc.3.gz
+%%PERL5_MAN3%%/Mail::Message::TransferEnc::Base64.3.gz
+%%PERL5_MAN3%%/Mail::Message::TransferEnc::Binary.3.gz
+%%PERL5_MAN3%%/Mail::Message::TransferEnc::EightBit.3.gz
+%%PERL5_MAN3%%/Mail::Message::TransferEnc::QuotedPrint.3.gz
+%%PERL5_MAN3%%/Mail::Message::TransferEnc::SevenBit.3.gz
+%%PERL5_MAN3%%/Mail::Reporter.3.gz
diff --git a/mail/p5-Mail-Transport/Makefile b/mail/p5-Mail-Transport/Makefile
new file mode 100644
index 000000000000..e7331ae5396e
--- /dev/null
+++ b/mail/p5-Mail-Transport/Makefile
@@ -0,0 +1,24 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= Mail-Transport
+PORTVERSION= 3.003
+CATEGORIES= mail perl5
+MASTER_SITES= CPAN
+PKGNAMEPREFIX= p5-
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Use Mail Transfer Agents (MTAs)
+
+LICENSE= ART10 GPLv1+
+LICENSE_COMB= dual
+
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= p5-Mail-Message>=3:mail/p5-Mail-Message
+
+USES= perl5
+USE_PERL5= configure
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Transport/distinfo b/mail/p5-Mail-Transport/distinfo
new file mode 100644
index 000000000000..28f095a351e8
--- /dev/null
+++ b/mail/p5-Mail-Transport/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1537133707
+SHA256 (Mail-Transport-3.003.tar.gz) = d7845063364175a6bd62bacf886c73a91742a5406918f378b19671312f576151
+SIZE (Mail-Transport-3.003.tar.gz) = 16234
diff --git a/mail/p5-Mail-Transport/pkg-descr b/mail/p5-Mail-Transport/pkg-descr
new file mode 100644
index 000000000000..523db4b80e0c
--- /dev/null
+++ b/mail/p5-Mail-Transport/pkg-descr
@@ -0,0 +1,9 @@
+Mail::Transport extends Mail::Transport implement sending and/or receiving of
+messages, using various protocols.
+
+Mail::Transport::Send extends this class, and offers general functionality for
+send protocols, like SMTP. Mail::Transport::Receive also extends this class, and
+offers receive method. Some transport protocols will implement both sending and
+receiving.
+
+WWW: https://metacpan.org/release/Mail-Transport
diff --git a/mail/p5-Mail-Transport/pkg-plist b/mail/p5-Mail-Transport/pkg-plist
new file mode 100644
index 000000000000..1435f80e5a6e
--- /dev/null
+++ b/mail/p5-Mail-Transport/pkg-plist
@@ -0,0 +1,24 @@
+%%SITE_PERL%%/Mail/Transport.pm
+%%SITE_PERL%%/Mail/Transport.pod
+%%SITE_PERL%%/Mail/Transport/Exim.pm
+%%SITE_PERL%%/Mail/Transport/Exim.pod
+%%SITE_PERL%%/Mail/Transport/Mailx.pm
+%%SITE_PERL%%/Mail/Transport/Mailx.pod
+%%SITE_PERL%%/Mail/Transport/Qmail.pm
+%%SITE_PERL%%/Mail/Transport/Qmail.pod
+%%SITE_PERL%%/Mail/Transport/Receive.pm
+%%SITE_PERL%%/Mail/Transport/Receive.pod
+%%SITE_PERL%%/Mail/Transport/SMTP.pm
+%%SITE_PERL%%/Mail/Transport/SMTP.pod
+%%SITE_PERL%%/Mail/Transport/Send.pm
+%%SITE_PERL%%/Mail/Transport/Send.pod
+%%SITE_PERL%%/Mail/Transport/Sendmail.pm
+%%SITE_PERL%%/Mail/Transport/Sendmail.pod
+%%PERL5_MAN3%%/Mail::Transport.3.gz
+%%PERL5_MAN3%%/Mail::Transport::Exim.3.gz
+%%PERL5_MAN3%%/Mail::Transport::Mailx.3.gz
+%%PERL5_MAN3%%/Mail::Transport::Qmail.3.gz
+%%PERL5_MAN3%%/Mail::Transport::Receive.3.gz
+%%PERL5_MAN3%%/Mail::Transport::SMTP.3.gz
+%%PERL5_MAN3%%/Mail::Transport::Send.3.gz
+%%PERL5_MAN3%%/Mail::Transport::Sendmail.3.gz
diff --git a/mail/panda-cclient/Makefile b/mail/panda-cclient/Makefile
index a612b766ea8c..7536683223cc 100644
--- a/mail/panda-cclient/Makefile
+++ b/mail/panda-cclient/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cclient
PORTVERSION= 20130621
+PORTREVISION= 1
CATEGORIES= mail devel ipv6
PKGNAMEPREFIX= panda-
@@ -33,12 +34,6 @@ USES+= ssl
PKGMESSAGE= pkg-message-ssl
.endif
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN= Does not build with openssl-devel
-.endif
-
USE_LDCONFIG= yes
ALL_TARGET= bsf
.if ! ${PORT_OPTIONS:MSSL}
@@ -113,4 +108,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/c-client/OSCFLAGS ${STAGEDIR}${PREFIX}/include/c-client
${INSTALL_DATA} ${PORTREV_H} ${STAGEDIR}${PREFIX}/include/c-client
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/panda-cclient/files/patch-Makefile b/mail/panda-cclient/files/patch-Makefile
index 1e10918790a8..b2e152746329 100644
--- a/mail/panda-cclient/files/patch-Makefile
+++ b/mail/panda-cclient/files/patch-Makefile
@@ -1,78 +1,50 @@
-*** Makefile.orig Wed May 9 00:50:45 2007
---- Makefile Mon Jul 23 16:02:26 2007
-***************
-*** 294,300 ****
-
- # Make the IMAP Toolkit
-
-! all: c-client SPECIALS rebuild bundled
-
- c-client:
- @echo Not processed yet. In a first-time build, you must specify
---- 294,300 ----
-
- # Make the IMAP Toolkit
-
-! all: c-client SPECIALS rebuild
-
- c-client:
- @echo Not processed yet. In a first-time build, you must specify
-***************
-*** 559,567 ****
- @echo + In order to rectify this problem, you MUST build with:
- @echo ++ SSLTYPE=$(SSLTYPE).nopwd
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- @echo
-- @echo Do you want to continue this build anyway? Type y or n please:
-- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac'
-
- nounenc:
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
---- 559,564 ----
-***************
-*** 582,590 ****
- @echo ++ SSLTYPE=nopwd
- @echo + You must also have OpenSSL or equivalent installed.
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- @echo
-- @echo Do you want to continue this build anyway? Type y or n please:
-- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac'
-
- nonossl:
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
---- 579,584 ----
-***************
-*** 659,665 ****
- $(TOOLS)/$@ "$(LN)" src/tmail tmail
- $(LN) $(TOOLS)/$@ .
-
-! build: OSTYPE rebuild rebuildclean bundled
-
- OSTYPE:
- @$(MAKE) ip$(IP)
---- 653,659 ----
- $(TOOLS)/$@ "$(LN)" src/tmail tmail
- $(LN) $(TOOLS)/$@ .
-
-! build: OSTYPE rebuild rebuildclean
-
- OSTYPE:
- @$(MAKE) ip$(IP)
-***************
-*** 679,686 ****
- @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
- @echo Rebuilding c-client for `$(CAT) OSTYPE`...
- @$(TOUCH) SPECIALS
-! $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
-! CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
-
- rebuildclean:
- $(SH) -c '$(RM) rebuild || true'
---- 673,679 ----
- @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
- @echo Rebuilding c-client for `$(CAT) OSTYPE`...
- @$(TOUCH) SPECIALS
-! $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
-
- rebuildclean:
- $(SH) -c '$(RM) rebuild || true'
+--- Makefile.orig 2013-06-21 21:29:17 UTC
++++ Makefile
+@@ -295,7 +295,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
+
+ # Make the IMAP Toolkit
+
+-all: c-client SPECIALS rebuild bundled
++all: c-client SPECIALS rebuild
+
+ c-client:
+ @echo Not processed yet. In a first-time build, you must specify
+@@ -587,9 +587,6 @@ sslunix sslsco:
+ @echo + In order to rectify this problem, you MUST build with:
+ @echo ++ SSLTYPE=$(SSLTYPE).nopwd
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+- @echo
+- @echo Do you want to continue this build anyway? Type y or n please:
+- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac'
+
+ nounenc:
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+@@ -610,9 +607,6 @@ sslnone:
+ @echo ++ SSLTYPE=nopwd
+ @echo + You must also have OpenSSL or equivalent installed.
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+- @echo
+- @echo Do you want to continue this build anyway? Type y or n please:
+- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac'
+
+ nonossl:
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+@@ -687,7 +681,7 @@ an ua:
+ $(TOOLS)/$@ "$(LN)" src/tmail tmail
+ $(LN) $(TOOLS)/$@ .
+
+-build: OSTYPE rebuild rebuildclean bundled
++build: OSTYPE rebuild rebuildclean
+
+ OSTYPE:
+ @$(MAKE) ip$(IP)
+@@ -707,8 +701,7 @@ rebuild:
+ @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
+ @echo Rebuilding c-client for `$(CAT) OSTYPE`...
+ @$(TOUCH) SPECIALS
+- $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
+- CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
++ $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
+
+ rebuildclean:
+ $(SH) -c '$(RM) rebuild || true'
diff --git a/mail/panda-cclient/files/patch-src_osdep_unix_Makefile b/mail/panda-cclient/files/patch-src_osdep_unix_Makefile
index a86ec16f592d..f9b3effab3e0 100644
--- a/mail/panda-cclient/files/patch-src_osdep_unix_Makefile
+++ b/mail/panda-cclient/files/patch-src_osdep_unix_Makefile
@@ -1,5 +1,5 @@
---- src/osdep/unix/Makefile.orig 2013-06-21 23:29:17.000000000 +0200
-+++ src/osdep/unix/Makefile 2014-12-01 22:35:23.000000000 +0100
+--- src/osdep/unix/Makefile.orig 2013-06-21 21:29:17 UTC
++++ src/osdep/unix/Makefile
@@ -30,9 +30,9 @@
EXTRAAUTHENTICATORS=
@@ -13,7 +13,7 @@
# The optimization level here for GCC ports is set here for a reason. It's
-@@ -56,13 +56,13 @@
+@@ -56,13 +56,13 @@ GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-si
# Extended flags needed for SSL. You may need to modify.
@@ -30,7 +30,7 @@
# Older versions of MIT Kerberos also have a libcrypto. If so, you may need
# to use this instead
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ AFSLDFLAGS=-L$(AFSLIB)/afs -L$(AFSLIB) -
# AFSLDFLAGS may also need -L/usr/ucblib -lucb
DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
DCELDFLAGS= -ldce
@@ -39,7 +39,7 @@
# Build parameters normally set by the individual port
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ EMPTYPROTO=unixproto
# Commands possibly overriden by the individual port
ARRC=ar rc
@@ -48,7 +48,7 @@
LN=ln -s
RANLIB=ranlib
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
@@ -57,7 +57,7 @@
CAT=cat
MAKE=make
-@@ -173,6 +173,10 @@
+@@ -173,6 +173,10 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
@@ -68,7 +68,7 @@
# Here if no make argument established
missing: osdep.h
-@@ -261,13 +265,14 @@
+@@ -261,13 +265,14 @@ bsd: # BSD UNIX
BASECFLAGS="-g -Dconst="
bsf: # FreeBSD
@@ -85,7 +85,7 @@
bsi: # BSD/i386
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -863,23 +868,31 @@
+@@ -863,23 +868,31 @@ vu2: # VAX Ultrix 2.3, etc.
# Build it!
@@ -120,7 +120,7 @@
# Dependencies
-@@ -914,7 +927,7 @@
+@@ -914,7 +927,7 @@ utf8aux.o: mail.h misc.h osdep.h utf8.h
# OS-dependent
@@ -129,7 +129,7 @@
osdep.h env_unix.h tcp_unix.h \
osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
-@@ -928,12 +941,19 @@
+@@ -928,12 +941,19 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
write.c sslstdio.c \
strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
OSCFLAGS
diff --git a/mail/panda-cclient/files/patch-src_osdep_unix_os_bsi.h b/mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h
index ade4d1289237..ade4d1289237 100644
--- a/mail/panda-cclient/files/patch-src_osdep_unix_os_bsi.h
+++ b/mail/panda-cclient/files/patch-src_osdep_unix_os__bsi.h
diff --git a/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c b/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c
new file mode 100644
index 000000000000..15f471074d0b
--- /dev/null
+++ b/mail/panda-cclient/files/patch-src_osdep_unix_ssl__unix.c
@@ -0,0 +1,63 @@
+--- src/osdep/unix/ssl_unix.c.orig 2013-06-21 21:29:17 UTC
++++ src/osdep/unix/ssl_unix.c
+@@ -22,6 +22,10 @@
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
++
++/* Patch for OPENSSL_VERSION_NUMBER >= 0x10100000 obtained from
++ * openembedded/meta-openembedded (on GitHub)
++ */
+
+ #define crypt ssl_private_crypt
+ #define STRING OPENSSL_STRING
+@@ -241,8 +245,16 @@ static char *ssl_start_work (SSLSTREAM *
+ /* disable certificate validation? */
+ if (flags & NET_NOVALIDATECERT)
+ SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+- else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++ else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++ X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++ X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++ SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ /* set default paths to CAs... */
++ }
+ SSL_CTX_set_default_verify_paths (stream->context);
+ /* ...unless a non-standard path desired */
+ if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -280,6 +292,7 @@ static char *ssl_start_work (SSLSTREAM *
+ if (SSL_write (stream->con,"",0) < 0)
+ return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ /* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ if (!(flags & NET_NOVALIDATECERT) &&
+ (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ host))) {
+@@ -289,6 +302,7 @@ static char *ssl_start_work (SSLSTREAM *
+ sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+ return ssl_last_error = cpystr (tmp);
+ }
++#endif
+ return NIL;
+ }
+
+@@ -327,6 +341,7 @@ static int ssl_open_verify (int ok,X509_
+ * Returns: NIL if validated, else string of error message
+ */
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+ int i,n;
+@@ -356,6 +371,7 @@ static char *ssl_validate_cert (X509 *ce
+ else ret = "Unable to locate common name in certificate";
+ return ret;
+ }
++#endif
+
+ /* Case-independent wildcard pattern match
+ * Accepts: base string
diff --git a/mail/phplist/Makefile b/mail/phplist/Makefile
index f58f22e7d974..2e93c135d9a5 100644
--- a/mail/phplist/Makefile
+++ b/mail/phplist/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= phplist
-PORTVERSION= 3.3.4
+PORTVERSION= 3.3.5
CATEGORIES= mail www
MASTER_SITES= SF
diff --git a/mail/phplist/distinfo b/mail/phplist/distinfo
index 7bc9d8fa1a88..6aac798eab10 100644
--- a/mail/phplist/distinfo
+++ b/mail/phplist/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1487150232
-SHA256 (phplist-3.3.4.tgz) = 086772ff396d53fc400820cc4666219cf117245185f9f61347ad175035727cde
-SIZE (phplist-3.3.4.tgz) = 13520961
+SHA256 (phplist-3.3.5.tgz) = 1b5a560ccfe92a1d4674e4c42e9762425d94627170417819d8cb51ff0ebbb285
+SIZE (phplist-3.3.5.tgz) = 13516808
diff --git a/mail/phplist/pkg-plist b/mail/phplist/pkg-plist
index 73a53771eb67..8c62f2a1b668 100644
--- a/mail/phplist/pkg-plist
+++ b/mail/phplist/pkg-plist
@@ -29,6 +29,7 @@ bin/phplist
%%WWWDIR%%/lists/admin/actions/markread.php
%%WWWDIR%%/lists/admin/actions/mclicks.php
%%WWWDIR%%/lists/admin/actions/mergeduplicatelists.php
+%%WWWDIR%%/lists/admin/actions/msgbounces.php
%%WWWDIR%%/lists/admin/actions/msgsent.php
%%WWWDIR%%/lists/admin/actions/msgstatus.php
%%WWWDIR%%/lists/admin/actions/mviews.php
@@ -61,6 +62,7 @@ bin/phplist
%%WWWDIR%%/lists/admin/catlists.php
%%WWWDIR%%/lists/admin/checkbouncerules.php
%%WWWDIR%%/lists/admin/checki18n.php
+%%WWWDIR%%/lists/admin/checkprerequisites.php
%%WWWDIR%%/lists/admin/class.image.inc
%%WWWDIR%%/lists/admin/class.phplistmailer.php
%%WWWDIR%%/lists/admin/community.php
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index e0ec4ce4ffdb..c7fc8fb79283 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
DISTVERSION= 3.4-20180904
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH= 5
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \
diff --git a/mail/postfix-current/files/patch-makedefs b/mail/postfix-current/files/patch-makedefs
index a8f16850a94d..2fe16c393bb3 100644
--- a/mail/postfix-current/files/patch-makedefs
+++ b/mail/postfix-current/files/patch-makedefs
@@ -1,6 +1,6 @@
---- makedefs.orig 2018-03-07 00:46:20 UTC
+--- makedefs.orig 2018-08-12 21:35:37 UTC
+++ makedefs
-@@ -296,6 +296,15 @@ case "$SYSTEM.$RELEASE" in
+@@ -298,6 +298,24 @@ case "$SYSTEM.$RELEASE" in
: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
: ${PLUGIN_LD="${CC} -shared"}
;;
@@ -13,6 +13,15 @@
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
+ : ${PLUGIN_LD="${CC} -shared"}
+ ;;
++ FreeBSD.13*) SYSTYPE=FREEBSD13
++ : ${CC=cc}
++ : ${SHLIB_SUFFIX=.so}
++ : ${SHLIB_CFLAGS=-fPIC}
++ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'}
++ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
++ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
++ : ${PLUGIN_LD="${CC} -shared"}
++ ;;
DragonFly.*) SYSTYPE=DRAGONFLY
;;
OpenBSD.2*) SYSTYPE=OPENBSD2
diff --git a/mail/postfix-current/files/patch-src_util_sys__defs.h b/mail/postfix-current/files/patch-src_util_sys__defs.h
index 3780d6944995..16f18c9c8388 100644
--- a/mail/postfix-current/files/patch-src_util_sys__defs.h
+++ b/mail/postfix-current/files/patch-src_util_sys__defs.h
@@ -5,7 +5,7 @@
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
|| defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
- || defined(FREEBSD11) \
-+ || defined(FREEBSD11) || defined(FREEBSD12) \
++ || defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|| defined(OPENBSD5) || defined(OPENBSD6) \
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 034947a80c23..1902a937e8e0 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
DISTVERSION= 3.3.1
-PORTREVISION?= 1
+PORTREVISION?= 2
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \
diff --git a/mail/postfix/files/patch-makedefs b/mail/postfix/files/patch-makedefs
index 5abe3f061e08..79ad6ebfc061 100644
--- a/mail/postfix/files/patch-makedefs
+++ b/mail/postfix/files/patch-makedefs
@@ -1,6 +1,6 @@
---- makedefs.orig 2016-05-15 16:39:11 UTC
+--- makedefs.orig 2018-02-03 17:20:46 UTC
+++ makedefs
-@@ -272,6 +272,24 @@ case "$SYSTEM.$RELEASE" in
+@@ -287,6 +287,33 @@ case "$SYSTEM.$RELEASE" in
: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
: ${PLUGIN_LD="${CC} -shared"}
;;
@@ -22,6 +22,15 @@
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
+ : ${PLUGIN_LD="${CC} -shared"}
+ ;;
++ FreeBSD.13*) SYSTYPE=FREEBSD13
++ : ${CC=cc}
++ : ${SHLIB_SUFFIX=.so}
++ : ${SHLIB_CFLAGS=-fPIC}
++ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'}
++ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
++ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
++ : ${PLUGIN_LD="${CC} -shared"}
++ ;;
DragonFly.*) SYSTYPE=DRAGONFLY
;;
OpenBSD.2*) SYSTYPE=OPENBSD2
diff --git a/mail/postfix/files/patch-src_util_sys__defs.h b/mail/postfix/files/patch-src_util_sys__defs.h
index d1633b6c2ab0..0c32afed3712 100644
--- a/mail/postfix/files/patch-src_util_sys__defs.h
+++ b/mail/postfix/files/patch-src_util_sys__defs.h
@@ -4,7 +4,7 @@
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
|| defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
-+ || defined(FREEBSD11) || defined(FREEBSD12) \
++ || defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|| defined(OPENBSD5) || defined(OPENBSD6) \
diff --git a/mail/roundcube-umich/Makefile b/mail/roundcube-umich/Makefile
index 1018ac380f27..1c188c4c8696 100644
--- a/mail/roundcube-umich/Makefile
+++ b/mail/roundcube-umich/Makefile
@@ -11,16 +11,18 @@ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Theme for RoundCube Web Mail
+LICENSE= GPLv3+ # same as roundcube's
+
RUN_DEPENDS= roundcube${PHP_PKGNAMESUFFIX}>=0.2:mail/roundcube@${PHP_FLAVOR}
-USES= php:flavors
+USES= php:flavors
NO_BUILD= yes
NO_ARCH= yes
WWWDIR?= ${PREFIX}/www/roundcube/skins/umich
post-patch:
- ${FIND} ${WRKSRC} -type f -name '*.orig' -delete
+ @${FIND} ${WRKSRC} -type f -name '*.orig' -delete
do-install:
@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/mail/roundcube-umich/pkg-descr b/mail/roundcube-umich/pkg-descr
index 4ca42541d4ae..fde670c4517a 100644
--- a/mail/roundcube-umich/pkg-descr
+++ b/mail/roundcube-umich/pkg-descr
@@ -4,4 +4,4 @@ optimal usability in mind. Light color blocks and borders delineate application
areas without drawing too much attention or drawing focus away from the
content.
-WWW: http://www.roundcubeforum.net
+WWW: https://www.roundcubeforum.net/
diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index e477dc356634..ed8d81b05e44 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rspamd
PORTVERSION= 1.8.0.a1.20180920
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
PKGNAMESUFFIX= -devel
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 4067b275ff9e..23771787ba92 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= rspamd
-PORTVERSION= 1.8.0
+PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= mail
MAINTAINER= vsevolod@FreeBSD.org
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 8edf4cde80cb..9270ae700ef3 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537810481
-SHA256 (vstakhov-rspamd-1.8.0_GH0.tar.gz) = 3d83fbe240c61cf457bbbd74b9fee68c74ed5edd3480e6da358b0db7d4f732be
-SIZE (vstakhov-rspamd-1.8.0_GH0.tar.gz) = 4261319
+TIMESTAMP = 1539719662
+SHA256 (vstakhov-rspamd-1.8.1_GH0.tar.gz) = cd25dab6fbd2b20b3bf0c871b133d08a5107696e012c798c6e93cd9e53537555
+SIZE (vstakhov-rspamd-1.8.1_GH0.tar.gz) = 4286637
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index 7f8624e54e78..e8ae63308321 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -80,6 +80,7 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
%%ETCDIR%%/scores.d/statistics_group.conf
%%ETCDIR%%/scores.d/subject_group.conf
%%ETCDIR%%/scores.d/surbl_group.conf
+%%ETCDIR%%/scores.d/whitelist_group.conf
@sample %%ETCDIR%%/settings.conf.sample
@sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample
@sample %%ETCDIR%%/statistic.conf.sample
@@ -434,6 +435,7 @@ man/man8/rspamd.8.gz
%%DATADIR%%/lua/asn.lua
%%DATADIR%%/lua/bayes_expiry.lua
%%DATADIR%%/lua/clickhouse.lua
+%%DATADIR%%/lua/clustering.lua
%%DATADIR%%/lua/dcc.lua
%%DATADIR%%/lua/dkim_signing.lua
%%DATADIR%%/lua/dmarc.lua
diff --git a/mail/rubygem-mail/Makefile b/mail/rubygem-mail/Makefile
index e7159390b10e..4bfda5c87ac8 100644
--- a/mail/rubygem-mail/Makefile
+++ b/mail/rubygem-mail/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mail
-PORTVERSION= 2.7.0
+PORTVERSION= 2.7.1
PORTEPOCH= 2
CATEGORIES= mail rubygems
MASTER_SITES= RG
@@ -15,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
RUN_DEPENDS= rubygem-mini_mime>=0.1.1:mail/rubygem-mini_mime
-NO_ARCH= yes
-USE_RUBY= yes
USES= gem
+USE_RUBY= yes
+
+NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/mail/rubygem-mail/distinfo b/mail/rubygem-mail/distinfo
index 18f9e63a7d8b..e1af302d579e 100644
--- a/mail/rubygem-mail/distinfo
+++ b/mail/rubygem-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509542748
-SHA256 (rubygem/mail-2.7.0.gem) = 1f2ae391ca04b0a3c78905ce5b2ebc951332ee211781dd7e7b3569fd958bbe81
-SIZE (rubygem/mail-2.7.0.gem) = 385024
+TIMESTAMP = 1539714926
+SHA256 (rubygem/mail-2.7.1.gem) = ec2a3d489f7510b90d8eaa3f6abaad7038cf1d663cdf8ee66d0214a0bdf99c03
+SIZE (rubygem/mail-2.7.1.gem) = 389120
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index c56f6be59901..e51a62507634 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sendmail
PORTVERSION= 8.15.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
DISTNAME= ${PORTNAME}.${PORTVERSION}
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index f3ff3e2ce08b..227dbd004ad1 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -26,15 +26,15 @@ DOCSFILES= Changelog INSTALL LICENSE docs/docs.html docs/docs.txt \
conf/db.rcpt conf/db.rdnsbl conf/db.sndr \
conf/policy.html conf/spamilter.rc
-PLIST_FILES+= bin/dnsblchk bin/dnsblupd bin/ipfwmtad bin/mxlookup \
- bin/spamilter \
+PLIST_FILES+= bin/dnsblchk bin/dnsblupd bin/mxlookup bin/spamilter \
bin/spamilter-system-report bin/spamilter-user-report
PORTDOCS= Changelog INSTALL LICENSE docs.html docs.txt db.rcpt \
db.rdnsbl db.sndr policy.html spamilter.rc
-OPTIONS_DEFINE= SMTP_AFTER_POP3 PAM LIBSPF DOCS
+OPTIONS_DEFINE= SMTP_AFTER_POP3 PAM LIBSPF IPFWMTAD DOCS
SMTP_AFTER_POP3_DESC= SMTP after POP3
LIBSPF_DESC= build with libspf
+IPFWMTAD_DESC= build ipfwmtad (requires openssl)
SMTP_AFTER_POP3_CONFIGURE_ON= --with-popauth
PAM_CONFIGURE_ON= --with-pam
@@ -42,9 +42,16 @@ LIBSPF_BUILD_DEPENDS= ${LOCALBASE}/lib/libspf.a:mail/libspf
LIBSPF_CONFIGURE_ON= --with-libspf ${LOCALBASE}
LIBSPF_CFLAGS= -I${LOCALBASE}/include
LIBSPF_LDFLAGS= -L${LOCALBASE}/lib
+IPFWMTAD_PLIST_FILES= bin/ipfwmtad
+IPFWMTAD_USES= ssl
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MIPFWMTAD}
+BROKEN_FreeBSD_12= option IPFWMTAD needs old openssl
+BROKEN_FreeBSD_13= option IPFWMTAD needs old openssl
+.endif
+
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
CONFIGURE_ARGS+= --sendmail-dir "${MILTERBASE}"
@@ -61,6 +68,14 @@ pre-configure:
-e "s=/usr/local/=${PREFIX}/=" \
${WRKSRC}/Makefile.tmpl
+.if ! ${PORT_OPTIONS:MIPFWMTAD}
+post-configure:
+ ${REINPLACE_CMD} \
+ -e 's| install-ipfwmtad $$| |' \
+ -e 's| ipfwmtad $$| |' \
+ ${WRKSRC}/Makefile
+.endif
+
post-install:
.for i in ${BINFILES}
${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 967ac4fea8a4..759c6ecc5af2 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sympa
-DISTVERSION= 6.2.34
+DISTVERSION= 6.2.36
CATEGORIES= mail
MAINTAINER= dgeo@centrale-marseille.fr
@@ -46,6 +46,9 @@ RUN_DEPENDS= \
p5-CGI>=0:www/p5-CGI \
p5-Data-Password>=0:security/p5-Data-Password
+# Shebang is corrected by configure script
+USES= autoreconf cpe fakeroot perl5 shebangfix gettext
+
# Ignore alpha/beta versions
PORTSCOUT= limit:^[0-9]+(\.[0-9]+)*$$
@@ -53,11 +56,8 @@ PORTDOCS= NEWS.md
USERS= sympa
GROUPS= sympa
-# Shebang is corrected by configure script
-USES= autoreconf cpe fakeroot perl5 shebangfix gettext
-
SHEBANG_FILES= po/sympa/xgettext.pl \
- po/sympa/add-lang.pl \
+ po/sympa/add-lang.pl
GNU_CONFIGURE= yes
ICONSDIR?= www/icons
@@ -102,11 +102,9 @@ CONFLICTS= sympa-5*
OPTIONS_DEFINE= FASTCGI APACHE DOCS EXAMPLES
OPTIONS_DEFAULT=APACHE
OPTIONS_RADIO= DATABASE
-OPTIONS_RADIO_DATABASE= PGSQL SYBASE MYSQL
+OPTIONS_RADIO_DATABASE= PGSQL MYSQL
OPTIONS_SUB= yes
-SYBASE_DESC= Sybase database
-
.ifdef DB_TYPE
DB_TYPE:= ${DB_TYPE:tu}
. for option in ${OPTIONS_RADIO_DATABASE}
@@ -126,8 +124,6 @@ PGSQL_SUB_LIST= REQ_PGSQL=postgresql
PGSQL_SUB_LIST_OFF= REQ_PGSQL=""
PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg
PGSQL_VARS= DB_TYPE=Pg
-SYBASE_RUN_DEPENDS= p5-DBD-Sybase>=0:databases/p5-DBD-Sybase
-SYBASE_VARS= DB_TYPE=sybase
MYSQL_SUB_LIST= REQ_MYSQL=mysql
MYSQL_SUB_LIST_OFF= REQ_MYSQL=""
MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index 9be1ee8fbf72..e832c57b6667 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530890631
-SHA256 (sympa-community-sympa-6.2.34_GH0.tar.gz) = 39bc2b925d16eecc877c15cf037fa05230ffb64dd0041b7bb681b3d634cf4bcb
-SIZE (sympa-community-sympa-6.2.34_GH0.tar.gz) = 10575166
+TIMESTAMP = 1537729703
+SHA256 (sympa-community-sympa-6.2.36_GH0.tar.gz) = ff6a298808cb7527a672c706aa309349f88aefc1fd902f0a37752e33080ea4d1
+SIZE (sympa-community-sympa-6.2.36_GH0.tar.gz) = 10778302
diff --git a/mail/sympa/pkg-plist b/mail/sympa/pkg-plist
index 642012b79b7f..0ad9fce9745e 100644
--- a/mail/sympa/pkg-plist
+++ b/mail/sympa/pkg-plist
@@ -32,7 +32,6 @@ libexec/sympa/Sympa/DatabaseDriver/Oracle.pm
libexec/sympa/Sympa/DatabaseDriver/Oracle/St.pm
libexec/sympa/Sympa/DatabaseDriver/PostgreSQL.pm
libexec/sympa/Sympa/DatabaseDriver/SQLite.pm
-libexec/sympa/Sympa/DatabaseDriver/Sybase.pm
libexec/sympa/Sympa/DatabaseManager.pm
libexec/sympa/Sympa/Datasource.pm
libexec/sympa/Sympa/Family.pm
@@ -172,7 +171,6 @@ libexec/sympa/archived.pl
libexec/sympa/bounced.pl
@(sympa,sympa,4755) libexec/sympa/bouncequeue
libexec/sympa/bulk.pl
-libexec/sympa/create_db.Sybase
@(sympa,sympa,4755) libexec/sympa/familyqueue
libexec/sympa/init_comment.pl
libexec/sympa/ldap_alias_manager.pl
@@ -233,7 +231,6 @@ man/man3/Sympa::DatabaseDriver::Oracle.3Sympa.gz
man/man3/Sympa::DatabaseDriver::Oracle::St.3Sympa.gz
man/man3/Sympa::DatabaseDriver::PostgreSQL.3Sympa.gz
man/man3/Sympa::DatabaseDriver::SQLite.3Sympa.gz
-man/man3/Sympa::DatabaseDriver::Sybase.3Sympa.gz
man/man3/Sympa::DatabaseManager.3Sympa.gz
man/man3/Sympa::HTMLDecorator.3Sympa.gz
man/man3/Sympa::HTMLSanitizer.3Sympa.gz
@@ -834,6 +831,10 @@ share/locale/zh_TW/LC_MESSAGES/sympa.mo
%%DATADIR%%/static/js/jqplot/jquery.jqplot.css
%%DATADIR%%/static/js/jqplot/jquery.jqplot.min.js
%%DATADIR%%/static/js/jquery-migrate.js
+%%DATADIR%%/static/js/jquery-minicolors/jquery.minicolors.css
+%%DATADIR%%/static/js/jquery-minicolors/jquery.minicolors.js
+%%DATADIR%%/static/js/jquery-minicolors/jquery.minicolors.min.js
+%%DATADIR%%/static/js/jquery-minicolors/jquery.minicolors.png
%%DATADIR%%/static/js/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
%%DATADIR%%/static/js/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png
%%DATADIR%%/static/js/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png
@@ -1148,12 +1149,8 @@ share/locale/zh_TW/LC_MESSAGES/sympa.mo
%%DATADIR%%/static/fonts/foundation-icons/svgs/fi-yen.svg
%%DATADIR%%/static/fonts/foundation-icons/svgs/fi-zoom-in.svg
%%DATADIR%%/static/fonts/foundation-icons/svgs/fi-zoom-out.svg
-%%DATADIR%%/static/icons/crosshairs.png
%%DATADIR%%/static/icons/favicon_sympa.png
-%%DATADIR%%/static/icons/h.png
%%DATADIR%%/static/icons/logo_sympa.png
-%%DATADIR%%/static/icons/position.png
-%%DATADIR%%/static/icons/sv.png
%%DATADIR%%/static/js/sympa.js
@dir %%ETCDIR%%/create_list_templates
@dir %%ETCDIR%%/custom_actions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 4292becb3c20..d2936b97ee68 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,7 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 60.2.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/mail/thunderbird/files/patch-bug1474265 b/mail/thunderbird/files/patch-bug1474265
new file mode 100644
index 000000000000..6b51d9320131
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1474265
@@ -0,0 +1,28 @@
+commit 1e7aec82f43d
+Author: Martin Stransky <stransky@redhat.com>
+Date: Mon Jul 9 13:18:59 2018 +0200
+
+ Bug 1474265 - Add missing semicolon at DBusRemoteClient.cpp. r=jhorak, a=jcristau
+
+ MozReview-Commit-ID: HIz4gZOzfOE
+
+ --HG--
+ extra : source : f1f6e434d3a86d729a39aabf00e8c057c794bed5
+ extra : intermediate-source : f27de60fff477d7b61b5509fc2c9c9c098f5b953
+---
+ widget/xremoteclient/DBusRemoteClient.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git widget/xremoteclient/DBusRemoteClient.cpp widget/xremoteclient/DBusRemoteClient.cpp
+index 1919ad027a14..6b242f075913 100644
+--- widget/xremoteclient/DBusRemoteClient.cpp
++++ widget/xremoteclient/DBusRemoteClient.cpp
+@@ -142,7 +142,7 @@ DBusRemoteClient::GetRemoteDestinationName(const char *aProgram,
+ (bool (*)(const char *, DBusError *))
+ dlsym(RTLD_DEFAULT, "dbus_validate_bus_name");
+ if (!sDBusValidateBusName) {
+- return false
++ return false;
+ }
+
+ if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) {
diff --git a/mail/thunderbird/files/patch-bug1500484 b/mail/thunderbird/files/patch-bug1500484
new file mode 100644
index 000000000000..f69ae8ed266b
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1500484
@@ -0,0 +1,12 @@
+Drop unused header breaking build on non-Linux
+
+--- widget/gtk/nsClipboardWayland.cpp
++++ widget/gtk/nsClipboardWayland.cpp
+@@ -29,7 +29,6 @@
+
+ #include <gtk/gtk.h>
+ #include <poll.h>
+-#include <sys/epoll.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <fcntl.h>
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 2280a7442674..c7c35a0eee51 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -2,12 +2,9 @@
# $FreeBSD$
PORTNAME= imapproxy
-PORTVERSION= 1.2.7
-PORTREVISION= 5
+DISTVERSION= 1.2.8-pre20171105
CATEGORIES= mail
-MASTER_SITES= SF/squirrelmail/imap_proxy/${PORTVERSION}
PKGNAMEPREFIX= up-
-DISTNAME= squirrelmail-imap_proxy-${PORTVERSION}
MAINTAINER= brnrd@FreeBSD.org
COMMENT= Caching IMAP proxy server
@@ -17,6 +14,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf tar:bzip2 ncurses pathfix ssl
+USE_GITHUB= yes
+GH_ACCOUNT= rlaager
+GH_PROJECT= ${PORTNAME}-pkg
+GH_TAGNAME= upstream/1.2.8_svn20171105
+
OPTIONS_DEFINE= DOVECOT DOCS
DOVECOT_DESC= Use with dovecot2
@@ -32,6 +34,9 @@ SUB_FILES= pkg-message
DOCS= ChangeLog README README.debian README.known_issues README.ssl
SBIN= in.imapproxyd pimpstat
+post-patch:
+ ${MKDIR} ${WRKSRC}/bin
+
do-install:
.for i in ${SBIN}
(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/sbin)
diff --git a/mail/up-imapproxy/distinfo b/mail/up-imapproxy/distinfo
index beab3faa1a08..adfbe270ced6 100644
--- a/mail/up-imapproxy/distinfo
+++ b/mail/up-imapproxy/distinfo
@@ -1,2 +1,3 @@
-SHA256 (squirrelmail-imap_proxy-1.2.7.tar.bz2) = dd8ad40e3e457bd76fc9f19ef1c0d89911e3e3cc722415d1183f765dcac1ae48
-SIZE (squirrelmail-imap_proxy-1.2.7.tar.bz2) = 111651
+TIMESTAMP = 1539772291
+SHA256 (rlaager-imapproxy-pkg-1.2.8-pre20171105-upstream-1.2.8_svn20171105_GH0.tar.gz) = b4c9cbb7a370d1371dfc36f4670e0dfda8fea6dc8b19d4c7af74fa81a8000751
+SIZE (rlaager-imapproxy-pkg-1.2.8-pre20171105-upstream-1.2.8_svn20171105_GH0.tar.gz) = 146395
diff --git a/mail/up-imapproxy/files/patch-Makefile.in b/mail/up-imapproxy/files/patch-Makefile.in
deleted file mode 100644
index 70c96bd173a8..000000000000
--- a/mail/up-imapproxy/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2016-02-05 10:05:31 UTC
-+++ Makefile.in
-@@ -70,7 +70,7 @@ $(XYD_BIN): $(XYD_OBJ)
- $(CC) -o $@ $(XYD_OBJ) $(LDFLAGS) $(XYD_LIB)
-
- $(TAT_BIN): $(TAT_OBJ)
-- $(CC) -o $@ $(TAT_OBJ) $(TAT_LIB)
-+ $(CC) -o $@ $(TAT_OBJ) $(LDFLAGS) $(TAT_LIB)
-
- clean:
- rm -f ./src/core $(XYD_OBJ) $(TAT_OBJ) $(XYD_BIN) $(TAT_BIN)
diff --git a/mail/up-imapproxy/files/patch-OpenSSL-1.1 b/mail/up-imapproxy/files/patch-OpenSSL-1.1
new file mode 100644
index 000000000000..5bd80f31a9dd
--- /dev/null
+++ b/mail/up-imapproxy/files/patch-OpenSSL-1.1
@@ -0,0 +1,54 @@
+--- src/imapcommon.c.orig 2017-11-05 07:29:47 UTC
++++ src/imapcommon.c
+@@ -554,16 +554,24 @@ extern ICD_Struct *Get_Server_conn( char
+ unsigned int Expiration;
+ struct addrinfo *useai;
+
+- EVP_MD_CTX mdctx;
++ EVP_MD_CTX *mdctx;
+ int md_len;
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ EVP_MD_CTX mdctx_;
++#define EVP_MD_CTX_new(x) &mdctx_
++#define EVP_MD_CTX_free(x)
++#endif
++
+ Expiration = PC_Struct.cache_expiration_time;
+ memset( &Server, 0, sizeof Server );
+
+ /* need to md5 the passwd regardless, so do that now */
+- EVP_DigestInit(&mdctx, EVP_md5());
+- EVP_DigestUpdate(&mdctx, Password, strlen(Password));
+- EVP_DigestFinal(&mdctx, md5pw, &md_len);
++ mdctx = EVP_MD_CTX_new();
++ EVP_DigestInit(mdctx, EVP_md5());
++ EVP_DigestUpdate(mdctx, Password, strlen(Password));
++ EVP_DigestFinal(mdctx, md5pw, &md_len);
++ EVP_MD_CTX_free(mdctx);
+
+ /* see if we have a reusable connection available */
+ ICC_Active = NULL;
+--- src/main.c.orig 2017-11-05 07:29:47 UTC
++++ src/main.c
+@@ -460,7 +460,7 @@ int main( int argc, char *argv[] )
+ /* Set up OpenSSL thread protection */
+ ssl_thread_setup(fn);
+
+-#ifndef HAVE_RAND_EGD
++#ifndef OPENSSL_NO_EGD
+ if ( RAND_egd( ( RAND_file_name( f_randfile, sizeof( f_randfile ) ) == f_randfile ) ? f_randfile : "/.rnd" ) )
+ #endif
+ {
+@@ -1574,9 +1574,9 @@ static int verify_callback(int ok, X509_
+ verify_error = X509_V_ERR_CERT_CHAIN_TOO_LONG;
+ }
+ }
+- switch (ctx->error) {
++ switch (err) {
+ case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
+- X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, sizeof(buf));
++ X509_NAME_oneline(X509_get_issuer_name(err_cert), buf, sizeof(buf));
+ syslog(LOG_NOTICE, "issuer= %s", buf);
+ break;
+ case X509_V_ERR_CERT_NOT_YET_VALID:
diff --git a/mail/up-imapproxy/files/patch-configure.in b/mail/up-imapproxy/files/patch-configure.in
deleted file mode 100644
index 7b04b589be61..000000000000
--- a/mail/up-imapproxy/files/patch-configure.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.in.orig 2008-01-28 13:15:08.000000000 +0000
-+++ configure.in 2010-06-14 10:07:34.000000000 +0000
-@@ -16,8 +16,3 @@
- dnl Check for BSD sockets
--AC_CHECK_FUNC(connect, ,
-- AC_CHECK_LIB(nsl, gethostbyname, ,)
-- AC_CHECK_LIB(socket, connect, ,
-- AC_ERROR([Can't compile without BSD sockets!!!])
-- )
--)
-+AC_CHECK_FUNC([socket], , [AC_CHECK_LIB(socket, socket, , exit)])
-
-@@ -131,3 +126,4 @@
-
--
-+eval expanded_sysconfdir="\"$sysconfdir\""
-+AC_DEFINE_UNQUOTED(DEFAULT_CONFIG_FILE, "$expanded_sysconfdir/imapproxyd.conf", [default location of config file])
- AC_CONFIG_HEADER(config.h)
diff --git a/mail/up-imapproxy/files/patch-src_main.c b/mail/up-imapproxy/files/patch-src_main.c
deleted file mode 100644
index e78a949c8169..000000000000
--- a/mail/up-imapproxy/files/patch-src_main.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/main.c.orig 2016-01-29 18:11:40 UTC
-+++ src/main.c
-@@ -473,7 +473,9 @@ int main( int argc, char *argv[] )
- ssl_thread_setup(fn);
-
- /* Need to seed PRNG, too! */
-+#ifndef OPENSSL_NO_EGD
- if ( RAND_egd( ( RAND_file_name( f_randfile, sizeof( f_randfile ) ) == f_randfile ) ? f_randfile : "/.rnd" ) )
-+#endif
- {
- /* Not an EGD, so read and write it. */
- if ( RAND_load_file( f_randfile, -1 ) )
diff --git a/mail/up-imapproxy/files/patch-ssl b/mail/up-imapproxy/files/patch-ssl
deleted file mode 100644
index dafbb0f2aaa3..000000000000
--- a/mail/up-imapproxy/files/patch-ssl
+++ /dev/null
@@ -1,35 +0,0 @@
---- include/imapproxy.h Tue Apr 20 23:55:23 2004
-+++ include/imapproxy.h Sun Dec 10 11:28:42 2006
-@@ -107,6 +107,7 @@
-
- #if HAVE_LIBSSL
- #include <openssl/ssl.h>
-+#include <openssl/md5.h>
- #include <openssl/rand.h>
- #include <limits.h>
- #endif
---- config.h.in Tue Apr 20 10:26:46 2004
-+++ config.h.in Sun Dec 10 11:27:13 2006
-@@ -27,7 +27,7 @@
- #undef HAVE_LIBSOCKET
-
- /* Define to 1 if you have the `ssl' library (-lssl). */
--#undef HAVE_LIBSSL
-+#define HAVE_LIBSSL 1
-
- /* Define to 1 if you have the <memory.h> header file. */
- #undef HAVE_MEMORY_H
---- src/threads.c 2008-01-28 14:15:08.000000000 +0100
-+++ src/threads.c 2008-02-25 13:50:40.000000000 +0100
-@@ -51,7 +51,10 @@
-
- #define OPENSSL_THREAD_DEFINES
- #include <openssl/opensslconf.h>
--#if defined(OPENSSL_THREADS)
-+#if defined(THREADS)
-+#define OPENSSL_THREADS
-+#endif
-+#if defined(OPENSSL_THREADS)
-
-
- #include <stdio.h>