aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/anubis/Makefile12
-rw-r--r--mail/anubis/distinfo4
-rw-r--r--mail/anubis/files/patch-config.h.in23
-rw-r--r--mail/anubis/files/patch-configure.ac43
-rw-r--r--mail/anubis/files/patch-src__headers.h10
-rw-r--r--mail/anubis/pkg-plist5
-rw-r--r--mail/claws-mail/Makefile1
-rw-r--r--mail/courier-imap/Makefile2
-rw-r--r--mail/exim/Makefile1
-rw-r--r--mail/libetpan/Makefile1
-rw-r--r--mail/libvmime/Makefile44
-rw-r--r--mail/libvmime/distinfo4
-rw-r--r--mail/libvmime/files/patch-cmake__FindIconv.cmake11
-rw-r--r--mail/libvmime/files/patch-configure59
-rw-r--r--mail/libvmime/files/patch-src__mailboxField.cpp11
-rw-r--r--mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp21
-rw-r--r--mail/libvmime/files/patch-vmime__base.hpp11
-rw-r--r--mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp11
-rw-r--r--mail/libvmime/pkg-plist90
-rw-r--r--mail/mpop/Makefile1
-rw-r--r--mail/msmtp/Makefile2
-rw-r--r--mail/nullmailer/Makefile1
-rw-r--r--mail/opendkim/Makefile1
-rw-r--r--mail/wmbiff/Makefile2
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile1
25 files changed, 165 insertions, 207 deletions
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 27053a3a6ce7..89be871616cf 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= anubis
-PORTVERSION= 4.1.1
-PORTREVISION= 10
+PORTVERSION= 4.2
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= jhale@FreeBSD.org
COMMENT= Outgoing SMTP mail processor
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= NLS EXAMPLES GUILE GPGME GNUTLS GSASL \
GDBM MYSQL PGSQL PCRE PAM SOCKS LIBWRAP
@@ -23,11 +22,12 @@ GSASL_DESC= GSASL support (required for databases)
GDBM_DESC= GDBM backend
SOCKS_DESC= SOCKS proxy support
-USES= makeinfo pkgconfig shebangfix
+USES= charsetfix makeinfo pkgconfig shebangfix
+CHARSETFIX_MAKEFILEIN= gnulib.mk
SHEBANG_FILES= contrib/msg2smtp.pl
USE_RC_SUBR= anubis
USE_AUTOTOOLS= aclocal autoheader autoconf automake
-ACLOCAL_ARGS= -I m4 -I am
+ACLOCAL_ARGS= -I m4 -I gint -I am
AUTOMAKE_ARGS= --force --add-missing
INFO= anubis
diff --git a/mail/anubis/distinfo b/mail/anubis/distinfo
index 5a21c9d0aa2b..b4d82e30637c 100644
--- a/mail/anubis/distinfo
+++ b/mail/anubis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (anubis-4.1.1.tar.gz) = 93ef7a2d8bc3b50cd2e228cfe27e296ee14accadf8533bad9b2beee88a96e8fa
-SIZE (anubis-4.1.1.tar.gz) = 1104272
+SHA256 (anubis-4.2.tar.gz) = 5f3a2dd77c5ef52a593428c5b6d0042c1746eb8262c31bde9ee67455f8aad6d6
+SIZE (anubis-4.2.tar.gz) = 1623768
diff --git a/mail/anubis/files/patch-config.h.in b/mail/anubis/files/patch-config.h.in
deleted file mode 100644
index 246471ac1b43..000000000000
--- a/mail/anubis/files/patch-config.h.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./config.h.in.orig 2008-12-19 13:30:37.000000000 -0500
-+++ ./config.h.in 2011-02-09 20:52:34.000000000 -0500
-@@ -180,9 +180,6 @@
- /* Define to 1 if you have the `pam' library (-lpam). */
- #undef HAVE_LIBPAM
-
--/* Define to 1 if you have the `pam_misc' library (-lpam_misc). */
--#undef HAVE_LIBPAM_MISC
--
- /* Define to 1 if you have the `pcre' library (-lpcre). */
- #undef HAVE_LIBPCRE
-
-@@ -252,8 +249,8 @@
- /* Define to 1 if you have the <security/pam_appl.h> header file. */
- #undef HAVE_SECURITY_PAM_APPL_H
-
--/* Define to 1 if you have the <security/pam_misc.h> header file. */
--#undef HAVE_SECURITY_PAM_MISC_H
-+/* Define to 1 if you have the <security/openpam.h> header file. */
-+#undef HAVE_SECURITY_OPENPAM_H
-
- /* Define to 1 if you have the `setegid' function. */
- #undef HAVE_SETEGID
diff --git a/mail/anubis/files/patch-configure.ac b/mail/anubis/files/patch-configure.ac
index 0c40e5fe4e4d..8e3b651a964c 100644
--- a/mail/anubis/files/patch-configure.ac
+++ b/mail/anubis/files/patch-configure.ac
@@ -1,27 +1,14 @@
--- ./configure.ac.orig 2008-12-16 11:21:54.000000000 -0500
+++ ./configure.ac 2011-02-09 20:52:34.000000000 -0500
-@@ -77,7 +77,6 @@
+@@ -78,7 +78,6 @@
])
AC_CHECK_LIB(socket, socket)
-AC_CHECK_LIB(nsl, gethostbyaddr)
- AC_SUBST(INCLUDES)
+ AC_SUBST(ADD_INCLUDES)
case $build in
-@@ -143,10 +142,10 @@
- else
- AC_PATH_PROG(GPG, gpg)
- findgpgmedir() { :
-- if test -f "$1/include/gpgme.h"; then
-+ if test -f "$1/include/gpgme/gpgme.h"; then
- gpgmedir=1
- INCLUDES="$INCLUDES -I$1/include"
-- AC_MSG_CHECKING(for $1/include/gpgme.h)
-+ AC_MSG_CHECKING(for $1/include/gpgme/gpgme.h)
- AC_MSG_RESULT([yes])
- return 0
- fi
-@@ -158,7 +157,7 @@
+@@ -137,7 +136,7 @@
if test $gpgmedir; then
AC_DEFINE(HAVE_GPGME_H, 1, [Define to 1 if HAVE_GPGME_H is requested.])
else
@@ -30,15 +17,7 @@
fi
ANUBIS_GPGFILES='$(GPGFILES)'
M4_DEFS="$M4_DEFS -DWITH_GPG"
-@@ -189,6 +188,7 @@
- WITH_MYSQL=no
- WITH_POSTGRES=no
- WITH_GDBM=no
-+WITH_GSASL=no
-
- dnl Use option --with-gsasl to compile GSASL library support.
- MU_CHECK_GSASL(0.2.3, [
-@@ -199,11 +199,21 @@
+@@ -179,11 +178,21 @@
ANUBIS_BIN_ADM='$(adm_bin_programs)'
M4_DEFS="$M4_DEFS -DWITH_GSASL"
@@ -61,17 +40,7 @@
AC_ARG_WITH(mysql,
AC_HELP_STRING([--with-mysql],
-@@ -277,7 +287,8 @@
- if test $with_gnutls = yes; then
- AC_CHECK_HEADERS(gnutls/gnutls.h)
- if test $ac_cv_header_gnutls_gnutls_h != no; then
-- AM_PATH_LIBGNUTLS("1.0.0",
-+ PKG_CHECK_MODULES([LIBGNUTLS],
-+ [gnutls >= 1.0.0],
- [M4_DEFS="$M4_DEFS -DWITH_SSL -DWITH_GNUTLS"
- AC_DEFINE(USE_GNUTLS, 1,
- [Define to 1 if USE_GNUTLS is requested.])],
-@@ -327,8 +338,8 @@
+@@ -285,8 +294,8 @@
[with_pam=no])
if test "$with_pam" = "yes"; then
AC_CHECK_LIB(pam, main,, with_pam=no)
@@ -82,7 +51,7 @@
fi
if test "$with_pam" = "yes"; then
AC_MSG_RESULT([Enabling PAM support...])
-@@ -342,7 +353,6 @@
+@@ -300,7 +309,6 @@
[with_tcp_wrappers=no])
if test "$with_tcp_wrappers" = "yes"; then
AC_CHECK_LIB(wrap, main,, with_tcp_wrappers=no)
diff --git a/mail/anubis/files/patch-src__headers.h b/mail/anubis/files/patch-src__headers.h
index 3e835d0ce897..107cd74d50a5 100644
--- a/mail/anubis/files/patch-src__headers.h
+++ b/mail/anubis/files/patch-src__headers.h
@@ -1,9 +1,9 @@
--- ./src/headers.h.orig 2008-12-16 11:21:54.000000000 -0500
+++ ./src/headers.h 2011-02-09 20:52:34.000000000 -0500
-@@ -51,11 +51,11 @@
- # else
- # error POSIX Regular Expressions are required!
- # endif /* HAVE_REGEX_H and HAVE_REGCOMP */
+@@ -43,11 +43,11 @@
+ # define HAVE_PCRE
+ # endif /* HAVE_PCRE_H or HAVE_PCRE_PCRE_H */
+ # endif /* HAVE_LIBPCRE */
-# if defined(HAVE_LIBPAM) && defined(HAVE_LIBPAM_MISC)
-# if defined(HAVE_SECURITY_PAM_APPL_H) && defined(HAVE_SECURITY_PAM_MISC_H)
+# if defined(HAVE_LIBPAM)
@@ -16,7 +16,7 @@
# if defined(HAVE_LIBWRAP) && defined(HAVE_TCPD_H)
# define USE_LIBWRAP
# endif /* HAVE_LIBWRAP and HAVE_TCPD_H */
-@@ -121,7 +121,7 @@
+@@ -111,7 +111,7 @@
#ifdef HAVE_PAM
# include <security/pam_appl.h>
diff --git a/mail/anubis/pkg-plist b/mail/anubis/pkg-plist
index f6487e0d8ef4..9017250f9db0 100644
--- a/mail/anubis/pkg-plist
+++ b/mail/anubis/pkg-plist
@@ -9,7 +9,10 @@ man/man1/anubis.1.gz
%%GUILE%%share/anubis/rot-13.scm
%%NLS%%share/locale/da/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/de/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/es/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/fr/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/id/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/it/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/ms/LC_MESSAGES/anubis.mo
@@ -18,8 +21,10 @@ man/man1/anubis.1.gz
%%NLS%%share/locale/pl/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/ro/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/ru/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/sv/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/tr/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/uk/LC_MESSAGES/anubis.mo
%%NLS%%share/locale/vi/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/anubis.mo
@dirrm share/anubis
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 3f70fb467e21..e9214c8ce715 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= claws-mail
+PORTREVISION= 1
CATEGORIES= mail news ipv6
COMMENT= Lightweight and featureful GTK+ based e-mail and news client
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index d3c7440791b4..8683237fa9b1 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= courier-imap
PORTVERSION= 4.15
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= mail ipv6
MASTER_SITES= SF/courier/imap/${PORTVERSION}
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index ae86747dba11..0a738b24bae7 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,6 +3,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
MASTER_SITE_SUBDIR= exim4/:exim
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 5f865624049b..3e2442ad1ecc 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libetpan
PORTVERSION= 1.5
+PORTREVISION= 1
CATEGORIES= mail ipv6
MAINTAINER= pawel@FreeBSD.org
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index f0a8aaab4376..8b0f4807c848 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -2,38 +2,34 @@
# $FreeBSD$
PORTNAME= libvmime
-PORTVERSION= 0.9.1
-PORTREVISION= 8
+PORTVERSION= 0.9.2.s20140721
CATEGORIES= mail
-MASTER_SITES= SF/vmime/vmime/0.9
MAINTAINER= delphij@FreeBSD.org
COMMENT= All-in-one Internet mail library
-LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
-LIB_DEPENDS+= libgsasl.so:${PORTSDIR}/security/gsasl
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
-USES= iconv gmake pkgconfig tar:bzip2 libtool
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-
-CFLAGS+= -I${LOCALBASE}/include -D_GLIBCXX__PTHREADS
-CXXFLAGS+= ${CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib
+LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
+ libgsasl.so:${PORTSDIR}/security/gsasl
-.ifndef DEBUG
-CONFIGURE_ARGS+=--disable-debug
-.endif
+USE_GITHUB= yes
+GH_ACCOUNT= kisli
+GH_PROJECT= vmime
+GH_TAGNAME= ${GH_COMMIT}
+GH_COMMIT= 03a0e36
-CONFIGURE_ENV+= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" \
- LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config" libgnutls_config_args="gnutls"
-
-DOCSDIR= ${PREFIX}/share/doc/vmime
+USES= cmake:outsource compiler:c++11-lib iconv pkgconfig
+USE_LDCONFIG= yes
-.include <bsd.port.pre.mk>
+CMAKE_ARGS= -DLIB_SUFFIX:STRING="" \
+ -DVMIME_BUILD_SAMPLES:BOOL=NO \
+ -DVMIME_SHARED_PTR_USE_BOOST:BOOL=NO \
+ -DVMIME_SHARED_PTR_USE_CXX:BOOL=YES
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
+post-patch:
+ @${REINPLACE_CMD} 's,$${VMIME_INSTALL_LIBDIR}/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
+ ${WRKSRC}/CMakeLists.txt
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/libvmime/distinfo b/mail/libvmime/distinfo
index ca6f52d965c2..81b9e4fcf4ab 100644
--- a/mail/libvmime/distinfo
+++ b/mail/libvmime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvmime-0.9.1.tar.bz2) = 3b66cb76d9bc7da80ef1f271cc29d3a183b5ff8b560ef60e85ff006bffb4d1ae
-SIZE (libvmime-0.9.1.tar.bz2) = 522546
+SHA256 (libvmime-0.9.2.s20140721.tar.gz) = 42e759982bfcc00c9348eba681840788e584cdca344d9342edb1a3f1690a23a0
+SIZE (libvmime-0.9.2.s20140721.tar.gz) = 527233
diff --git a/mail/libvmime/files/patch-cmake__FindIconv.cmake b/mail/libvmime/files/patch-cmake__FindIconv.cmake
new file mode 100644
index 000000000000..280eb3ae293e
--- /dev/null
+++ b/mail/libvmime/files/patch-cmake__FindIconv.cmake
@@ -0,0 +1,11 @@
+--- cmake/FindIconv.cmake.orig 2014-06-30 22:48:42.000000000 +0200
++++ cmake/FindIconv.cmake 2014-07-22 12:50:55.000000000 +0200
+@@ -18,7 +18,7 @@
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib")
+ ELSE()
+- FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
++ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2)
+ ENDIF()
+
+ IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
diff --git a/mail/libvmime/files/patch-configure b/mail/libvmime/files/patch-configure
deleted file mode 100644
index ffe4d9c06dbf..000000000000
--- a/mail/libvmime/files/patch-configure
+++ /dev/null
@@ -1,59 +0,0 @@
---- ./configure.orig 2010-11-16 04:56:00.000000000 -0800
-+++ ./configure 2011-05-03 11:24:44.023730993 -0700
-@@ -4120,13 +4120,13 @@
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-+ CFLAGS="-g"
- else
- CFLAGS="-g"
- fi
- else
- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-+ CFLAGS=""
- else
- CFLAGS=
- fi
-@@ -4657,13 +4657,13 @@
- CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
-- CXXFLAGS="-g -O2"
-+ CXXFLAGS="-g"
- else
- CXXFLAGS="-g"
- fi
- else
- if test "$GXX" = yes; then
-- CXXFLAGS="-O2"
-+ CXXFLAGS=""
- else
- CXXFLAGS=
- fi
-@@ -15610,13 +15610,13 @@
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-+ CFLAGS="-g"
- else
- CFLAGS="-g"
- fi
- else
- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-+ CFLAGS=""
- else
- CFLAGS=
- fi
-@@ -21047,7 +21047,7 @@
- else
- # -O2
- OLD_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -O2"
-+ CXXFLAGS="$CXXFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc accepts -O2" >&5
- $as_echo_n "checking whether cc accepts -O2... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/mail/libvmime/files/patch-src__mailboxField.cpp b/mail/libvmime/files/patch-src__mailboxField.cpp
deleted file mode 100644
index 94d559aa5447..000000000000
--- a/mail/libvmime/files/patch-src__mailboxField.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mailboxField.cpp.orig 2009-09-06 05:10:27.000000000 -0700
-+++ ./src/mailboxField.cpp 2012-03-08 10:49:05.687243933 -0800
-@@ -51,7 +51,7 @@
- // Here, we cannot simply call "m_mailbox.parse()" because it
- // may have more than one address specified (even if this field
- // should contain only one). We are never too much careful...
-- ref <address> parsedAddress = address::parseNext(buffer, position, end, newPosition);
-+ ref <address> parsedAddress = mailbox::parseNext(buffer, position, end, newPosition);
-
- if (parsedAddress)
- {
diff --git a/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp b/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp
new file mode 100644
index 000000000000..a58c51e535a8
--- /dev/null
+++ b/mail/libvmime/files/patch-src__vmime__platforms__posix__posixHandler.cpp
@@ -0,0 +1,21 @@
+--- src/vmime/platforms/posix/posixHandler.cpp.orig 2014-07-22 15:24:26.000000000 +0200
++++ src/vmime/platforms/posix/posixHandler.cpp 2014-07-22 15:59:33.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <errno.h>
+
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/stat.h>
+
+ #if VMIME_HAVE_SYSCALL
+@@ -238,7 +239,9 @@
+ #elif VMIME_HAVE_SYSCALL && VMIME_HAVE_SYSCALL_GETTID
+ return static_cast <unsigned int>(::syscall(SYS_gettid));
+ #else
+- #error We have no implementation of getThreadId() for this platform!
++ long id;
++ ::syscall(SYS_thr_self, &id);
++ return static_cast <unsigned int>(id);
+ #endif
+ }
+
diff --git a/mail/libvmime/files/patch-vmime__base.hpp b/mail/libvmime/files/patch-vmime__base.hpp
deleted file mode 100644
index eae3e285d0d3..000000000000
--- a/mail/libvmime/files/patch-vmime__base.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vmime/base.hpp.orig 2010-02-06 10:12:57.000000000 -0800
-+++ ./vmime/base.hpp 2013-09-05 17:05:39.233608129 -0700
-@@ -252,7 +252,7 @@
- template <class X, class Y>
- ref <X> dynamicCast(ref <Y> y)
- {
-- return y.dynamicCast <X>();
-+ return y. template dynamicCast <X>();
- }
-
- } // vmime
diff --git a/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp b/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp
deleted file mode 100644
index b91cb20864e0..000000000000
--- a/mail/libvmime/files/patch-vmime__utility__smartPtrInt.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vmime/utility/smartPtrInt.hpp.orig 2009-09-06 05:10:27.000000000 -0700
-+++ ./vmime/utility/smartPtrInt.hpp 2013-09-12 11:22:28.695743913 -0700
-@@ -28,6 +28,8 @@
- #include "vmime/config.hpp"
- #include "vmime/utility/smartPtr.hpp"
-
-+#include <pthread.h>
-+
-
- namespace vmime {
- namespace utility {
diff --git a/mail/libvmime/pkg-plist b/mail/libvmime/pkg-plist
index 4944f6db116f..c3c4475f41da 100644
--- a/mail/libvmime/pkg-plist
+++ b/mail/libvmime/pkg-plist
@@ -8,6 +8,11 @@ include/vmime/bodyPart.hpp
include/vmime/bodyPartAttachment.hpp
include/vmime/charset.hpp
include/vmime/charsetConverter.hpp
+include/vmime/charsetConverterOptions.hpp
+include/vmime/charsetConverter_iconv.hpp
+include/vmime/charsetConverter_icu.hpp
+include/vmime/charsetConverter_idna.hpp
+include/vmime/charsetConverter_win.hpp
include/vmime/component.hpp
include/vmime/config.hpp
include/vmime/constants.hpp
@@ -15,14 +20,21 @@ include/vmime/contentDisposition.hpp
include/vmime/contentDispositionField.hpp
include/vmime/contentHandler.hpp
include/vmime/contentTypeField.hpp
+include/vmime/context.hpp
include/vmime/dateTime.hpp
include/vmime/defaultAttachment.hpp
include/vmime/disposition.hpp
+include/vmime/emailAddress.hpp
include/vmime/emptyContentHandler.hpp
include/vmime/encoding.hpp
include/vmime/exception.hpp
+include/vmime/export-shared.hpp
+include/vmime/export-static.hpp
+include/vmime/export.hpp
include/vmime/fileAttachment.hpp
+include/vmime/fileContentHandler.hpp
include/vmime/generatedMessageAttachment.hpp
+include/vmime/generationContext.hpp
include/vmime/header.hpp
include/vmime/headerField.hpp
include/vmime/headerFieldFactory.hpp
@@ -44,68 +56,104 @@ include/vmime/messageId.hpp
include/vmime/messageIdSequence.hpp
include/vmime/messageParser.hpp
include/vmime/misc/importanceHelper.hpp
+include/vmime/net/defaultTimeoutHandler.hpp
include/vmime/net/events.hpp
+include/vmime/net/fetchAttributes.hpp
include/vmime/net/folder.hpp
+include/vmime/net/folderAttributes.hpp
+include/vmime/net/folderStatus.hpp
+include/vmime/net/imap/IMAPCommand.hpp
include/vmime/net/imap/IMAPConnection.hpp
include/vmime/net/imap/IMAPFolder.hpp
+include/vmime/net/imap/IMAPFolderStatus.hpp
include/vmime/net/imap/IMAPMessage.hpp
+include/vmime/net/imap/IMAPMessagePart.hpp
include/vmime/net/imap/IMAPMessagePartContentHandler.hpp
+include/vmime/net/imap/IMAPMessageStructure.hpp
include/vmime/net/imap/IMAPParser.hpp
-include/vmime/net/imap/IMAPPart.hpp
include/vmime/net/imap/IMAPSStore.hpp
include/vmime/net/imap/IMAPServiceInfos.hpp
include/vmime/net/imap/IMAPStore.hpp
-include/vmime/net/imap/IMAPStructure.hpp
include/vmime/net/imap/IMAPTag.hpp
include/vmime/net/imap/IMAPUtils.hpp
+include/vmime/net/imap/imap.hpp
+include/vmime/net/maildir/maildir.hpp
include/vmime/net/maildir/maildirFolder.hpp
+include/vmime/net/maildir/maildirFolderStatus.hpp
include/vmime/net/maildir/maildirFormat.hpp
include/vmime/net/maildir/maildirMessage.hpp
+include/vmime/net/maildir/maildirMessagePart.hpp
+include/vmime/net/maildir/maildirMessageStructure.hpp
include/vmime/net/maildir/maildirServiceInfos.hpp
include/vmime/net/maildir/maildirStore.hpp
include/vmime/net/maildir/maildirUtils.hpp
include/vmime/net/maildir/format/courierMaildirFormat.hpp
include/vmime/net/maildir/format/kmailMaildirFormat.hpp
include/vmime/net/message.hpp
+include/vmime/net/messageSet.hpp
+include/vmime/net/pop3/POP3Command.hpp
+include/vmime/net/pop3/POP3Connection.hpp
include/vmime/net/pop3/POP3Folder.hpp
+include/vmime/net/pop3/POP3FolderStatus.hpp
include/vmime/net/pop3/POP3Message.hpp
+include/vmime/net/pop3/POP3Response.hpp
include/vmime/net/pop3/POP3SStore.hpp
include/vmime/net/pop3/POP3ServiceInfos.hpp
include/vmime/net/pop3/POP3Store.hpp
include/vmime/net/pop3/POP3Utils.hpp
+include/vmime/net/pop3/pop3.hpp
+include/vmime/net/sendmail/sendmail.hpp
include/vmime/net/sendmail/sendmailServiceInfos.hpp
include/vmime/net/sendmail/sendmailTransport.hpp
include/vmime/net/service.hpp
include/vmime/net/serviceFactory.hpp
include/vmime/net/serviceInfos.hpp
include/vmime/net/session.hpp
+include/vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp
+include/vmime/net/smtp/SMTPCommand.hpp
+include/vmime/net/smtp/SMTPCommandSet.hpp
+include/vmime/net/smtp/SMTPConnection.hpp
+include/vmime/net/smtp/SMTPExceptions.hpp
include/vmime/net/smtp/SMTPResponse.hpp
include/vmime/net/smtp/SMTPSTransport.hpp
include/vmime/net/smtp/SMTPServiceInfos.hpp
include/vmime/net/smtp/SMTPTransport.hpp
+include/vmime/net/smtp/smtp.hpp
include/vmime/net/socket.hpp
include/vmime/net/store.hpp
include/vmime/net/timeoutHandler.hpp
+include/vmime/net/tls/TLSProperties.hpp
include/vmime/net/tls/TLSSession.hpp
include/vmime/net/tls/TLSSocket.hpp
include/vmime/net/tls/TLSSecuredConnectionInfos.hpp
+include/vmime/net/tls/gnutls/TLSProperties_GnuTLS.hpp
+include/vmime/net/tls/gnutls/TLSSession_GnuTLS.hpp
+include/vmime/net/tls/gnutls/TLSSocket_GnuTLS.hpp
+include/vmime/net/tls/openssl/OpenSSLInitializer.hpp
+include/vmime/net/tls/openssl/TLSProperties_OpenSSL.hpp
+include/vmime/net/tls/openssl/TLSSession_OpenSSL.hpp
+include/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp
+include/vmime/net/tracer.hpp
include/vmime/net/transport.hpp
include/vmime/net/connectionInfos.hpp
include/vmime/net/defaultConnectionInfos.hpp
include/vmime/net/securedConnectionInfos.hpp
include/vmime/object.hpp
-include/vmime/options.hpp
include/vmime/parameter.hpp
include/vmime/parameterizedHeaderField.hpp
include/vmime/parsedMessageAttachment.hpp
include/vmime/parserHelpers.hpp
+include/vmime/parsingContext.hpp
include/vmime/path.hpp
include/vmime/plainTextPart.hpp
include/vmime/platform.hpp
include/vmime/platforms/posix/posixChildProcess.hpp
+include/vmime/platforms/posix/posixCriticalSection.hpp
include/vmime/platforms/posix/posixFile.hpp
include/vmime/platforms/posix/posixHandler.hpp
include/vmime/platforms/posix/posixSocket.hpp
+include/vmime/platforms/windows/windowsCodepages.hpp
+include/vmime/platforms/windows/windowsCriticalSection.hpp
include/vmime/platforms/windows/windowsFile.hpp
include/vmime/platforms/windows/windowsHandler.hpp
include/vmime/platforms/windows/windowsSocket.hpp
@@ -117,6 +165,8 @@ include/vmime/security/cert/certificate.hpp
include/vmime/security/cert/certificateChain.hpp
include/vmime/security/cert/certificateVerifier.hpp
include/vmime/security/cert/defaultCertificateVerifier.hpp
+include/vmime/security/cert/gnutls/X509Certificate_GnuTLS.hpp
+include/vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp
include/vmime/security/defaultAuthenticator.hpp
include/vmime/security/digest/md5/md5MessageDigest.hpp
include/vmime/security/digest/messageDigest.hpp
@@ -140,8 +190,8 @@ include/vmime/utility/encoder/binaryEncoder.hpp
include/vmime/utility/encoder/encoder.hpp
include/vmime/utility/encoder/sevenBitEncoder.hpp
include/vmime/utility/encoder/b64Encoder.hpp
-include/vmime/utility/encoder/defaultEncoder.hpp
include/vmime/utility/encoder/encoderFactory.hpp
+include/vmime/utility/encoder/noopEncoder.hpp
include/vmime/utility/encoder/uuEncoder.hpp
include/vmime/utility/encoder/qpEncoder.hpp
include/vmime/utility/encoder/eightBitEncoder.hpp
@@ -149,14 +199,30 @@ include/vmime/utility/childProcess.hpp
include/vmime/utility/datetimeUtils.hpp
include/vmime/utility/file.hpp
include/vmime/utility/filteredStream.hpp
+include/vmime/utility/inputStream.hpp
+include/vmime/utility/inputStreamAdapter.hpp
+include/vmime/utility/inputStreamByteBufferAdapter.hpp
+include/vmime/utility/inputStreamPointerAdapter.hpp
+include/vmime/utility/inputStreamSocketAdapter.hpp
+include/vmime/utility/inputStreamStringAdapter.hpp
+include/vmime/utility/inputStreamStringProxyAdapter.hpp
+include/vmime/utility/outputStream.hpp
+include/vmime/utility/outputStreamAdapter.hpp
+include/vmime/utility/outputStreamByteArrayAdapter.hpp
+include/vmime/utility/outputStreamSocketAdapter.hpp
+include/vmime/utility/outputStreamStringAdapter.hpp
+include/vmime/utility/parserInputStreamAdapter.hpp
include/vmime/utility/path.hpp
include/vmime/utility/progressListener.hpp
include/vmime/utility/random.hpp
-include/vmime/utility/smartPtr.hpp
-include/vmime/utility/smartPtrInt.hpp
+include/vmime/utility/seekableInputStream.hpp
+include/vmime/utility/seekableInputStreamRegionAdapter.hpp
include/vmime/utility/stream.hpp
+include/vmime/utility/streamUtils.hpp
include/vmime/utility/stringProxy.hpp
include/vmime/utility/stringUtils.hpp
+include/vmime/utility/sync/autoLock.hpp
+include/vmime/utility/sync/criticalSection.hpp
include/vmime/utility/url.hpp
include/vmime/utility/urlUtils.hpp
include/vmime/vmime.hpp
@@ -167,24 +233,22 @@ lib/libvmime.so
lib/libvmime.so.0
lib/libvmime.so.0.0.0
libdata/pkgconfig/vmime.pc
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-@dirrm %%DOCSDIR%%
+@dirrm include/vmime/utility/sync
@dirrm include/vmime/utility/encoder
@dirrm include/vmime/utility
@dirrm include/vmime/security/sasl
@dirrm include/vmime/security/digest/sha1
@dirrm include/vmime/security/digest/md5
@dirrm include/vmime/security/digest
+@dirrm include/vmime/security/cert/openssl
+@dirrm include/vmime/security/cert/gnutls
@dirrm include/vmime/security/cert
@dirrm include/vmime/security
@dirrm include/vmime/platforms/windows
@dirrm include/vmime/platforms/posix
@dirrm include/vmime/platforms
+@dirrm include/vmime/net/tls/openssl
+@dirrm include/vmime/net/tls/gnutls
@dirrm include/vmime/net/tls
@dirrm include/vmime/net/smtp
@dirrm include/vmime/net/sendmail
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 6e3bf3b5fe80..a2cfdd83a571 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mpop
PORTVERSION= 1.0.29
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 20fcd0dc503b..00e5f342dbdb 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= msmtp
PORTVERSION= 1.4.32
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= SF
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 44e4716870d2..044256eb79dd 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nullmailer
PORTVERSION= 1.13
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://untroubled.org/nullmailer/ \
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index cea33e8c33b6..b8c8d1f58eb7 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,6 +3,7 @@
PORTNAME= opendkim
PORTVERSION= 2.9.2
+PORTREVISION= 1
CATEGORIES= mail security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME} \
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index b5ee8dbdb77b..be0659b0a98b 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmbiff
PORTVERSION= 0.4.27
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= mail windowmaker afterstep
MASTER_SITES= SF
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 89a44c5f6361..f53339c84e5a 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= mail xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}