3 files changed, 16 insertions, 12 deletions

diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index f187c7d62356..579726bd705f 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
-PORTVERSION=	3.9.3
+PORTVERSION=	3.10.0
 CATEGORIES?=	mail
-MASTER_SITES=	SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
+MASTER_SITES=	SF/claws-mail/Claws%20Mail/${PORTVERSION}
 
 MAINTAINER=	pawel@FreeBSD.org
 
 LICENSE=	GPLv3
 
-USE_BZIP2=	yes
-USES+=		gmake iconv pkgconfig
+USES+=		gmake iconv libtool pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --disable-dbus
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
 
 CLAWS_PLUGINS=	acpi_notifier \
 		address_keeper \
@@ -61,19 +60,17 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 
 .  for p in ${CLAWS_PLUGINS_BUILD}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S|--disable-${p}-plugin||}
-PLIST_FILES+=	lib/claws-mail/plugins/${p}.a  \
-		lib/claws-mail/plugins/${p}.la \
-		lib/claws-mail/plugins/${p}.so
+PLIST_FILES+=	lib/claws-mail/plugins/${p}.so
 .  endfor
 
 do-build:
 .  for p in ${CLAWS_PLUGINS_BUILD}
-	cd ${WRKSRC}/src/plugins/${p} && ${GMAKE}
+	cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD}
 .  endfor
 
 do-install:
 .  for p in ${CLAWS_PLUGINS_BUILD}
-	cd ${WRKSRC}/src/plugins/${p} && ${GMAKE} install DESTDIR="${STAGEDIR}"
+	cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD} install DESTDIR="${STAGEDIR}"
 .  endfor
 
 .endif
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 3d47ce8904fd..cfc39e12599a 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (claws-mail-3.9.3.tar.bz2) = 53aacceab45af6c3ee1f0668956a6e3328d21ac4efcfc0aa8dfd7d7552a62372
-SIZE (claws-mail-3.9.3.tar.bz2) = 9463943
+SHA256 (claws-mail-3.10.0.tar.xz) = 04c0d4781daf5be6113016d7ec0e7caf2e8f73afb7227c8e3aa96696e27fc968
+SIZE (claws-mail-3.10.0.tar.xz) = 6668012
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index c43818d22bcd..8aba137215e4 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -24,6 +24,7 @@ include/claws-mail/addrselect.h
 include/claws-mail/advsearch.h
 include/claws-mail/alertpanel.h
 include/claws-mail/autofaces.h
+include/claws-mail/avatars.h
 include/claws-mail/browseldap.h
 include/claws-mail/claws-features.h
 include/claws-mail/codeconv.h
@@ -69,6 +70,7 @@ include/claws-mail/edittags.h
 include/claws-mail/editvcard.h
 include/claws-mail/enriched.h
 include/claws-mail/etpan/etpan-errors.h
+include/claws-mail/etpan/etpan-ssl.h
 include/claws-mail/etpan/etpan-thread-manager-types.h
 include/claws-mail/etpan/etpan-thread-manager.h
 include/claws-mail/etpan/imap-thread.h
@@ -171,6 +173,7 @@ include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-x11-listener.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/gtkhotkey.h
 include/claws-mail/plugins/claws-mail/gtkhotkey/tomboykeybinder.h
 include/claws-mail/plugins/claws-mail/ical.h
+include/claws-mail/plugins/pgpcore/autocompletion.h
 include/claws-mail/plugins/pgpcore/passphrase.h
 include/claws-mail/plugins/pgpcore/pgp_utils.h
 include/claws-mail/plugins/pgpcore/pgp_viewer.h
@@ -239,11 +242,13 @@ include/claws-mail/uri_opener.h
 include/claws-mail/vcard.h
 include/claws-mail/viewtypes.h
 include/claws-mail/wizard.h
+lib/claws-mail/plugins/libravatar.so
 lib/claws-mail/plugins/pgpinline.deps
 lib/claws-mail/plugins/pgpmime.deps
 lib/claws-mail/plugins/smime.deps
 libdata/pkgconfig/claws-mail.pc
 man/man1/claws-mail.1.gz
+share/appdata/claws-mail.appdata.xml
 share/applications/claws-mail.desktop
 %%DATADIR%%/OOo2claws-mail.pl
 %%DATADIR%%/acroread2claws-mail.pl
@@ -305,6 +310,7 @@ share/icons/hicolor/64x64/apps/claws-mail.png
 %%NLS%%share/locale/cs/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/de/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/claws-mail.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/es/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/claws-mail.mo
@@ -334,6 +340,7 @@ share/icons/hicolor/64x64/apps/claws-mail.png
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual
 @dirrmtry %%DOCSDIR%%
 @dirrmtry %%DATADIR%%
+@dirrmtry share/appdata
 @dirrmtry lib/claws-mail/plugins
 @dirrmtry lib/claws-mail
 @dirrm include/claws-mail/plugins/vcalendar