Update to 3.17.1

- Add License
- Remove the MANUAL Part: This has alredy been removed in Version 3.17.0

Changelog: https://www.claws-mail.org/NEWS

Sponsored by:	Netzkommune GmbH

4 files changed, 16 insertions, 45 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index f1e65e952328..5697ac7f7a18 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -2,11 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	claws-mail
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libetpan.so:mail/libetpan \
 		libfreetype.so:print/freetype2 \
@@ -14,7 +17,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgnutls.so:security/gnutls \
 		libgcrypt.so:security/libgcrypt \
 		libexpat.so:textproc/expat2 \
-		libfontconfig.so:x11-fonts/fontconfig
+		libfontconfig.so:x11-fonts/fontconfig \
+		libnettle.so:security/nettle
 RUN_DEPENDS=	mime-support>0:misc/mime-support
 
 USES=		compiler:c++11-lang cpe desktop-file-utils gnome pathfix \
@@ -25,8 +29,8 @@ SHEBANG_FILES=	tools/*.pl tools/*.py tools/tb2claws-mail
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	COMPFACE DEBUG DOCS ENCHANT IPV6 JPILOT LDAP \
-		MANUAL NLS STARTUP THEMES
-OPTIONS_DEFAULT=COMPFACE ENCHANT MANUAL STARTUP THEMES
+		NLS STARTUP THEMES
+OPTIONS_DEFAULT=COMPFACE ENCHANT STARTUP THEMES
 OPTIONS_SUB=	yes
 
 COMPFACE_DESC=		X-Face support
@@ -49,11 +53,6 @@ JPILOT_RUN_DEPENDS=	jpilot:palm/jpilot
 LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_USE=		openldap=yes
 
-MANUAL_DESC=		User manual (many dependencies, including texlive)
-MANUAL_CONFIGURE_ON=	--enable-manual --with-manualdir=${DOCSDIR}/manual
-MANUAL_CONFIGURE_OFF=	--disable-manual
-MANUAL_BUILD_DEPENDS=	docbook-utils>0:textproc/docbook-utils
-
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext-tools
 
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index 441db44d8c19..ae05c0a05a3d 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTVERSION=	3.16.0
+PORTVERSION=	3.17.1
 CATEGORIES?=	mail
 MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
 
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 302b2b9e8f5d..dc39bcaade46 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513513432
-SHA256 (claws-mail-3.16.0.tar.xz) = c212133d3d962129d8c7995c1c7d973faef2a8914481c0c74578217bf4c897ab
-SIZE (claws-mail-3.16.0.tar.xz) = 5913948
+TIMESTAMP = 1542407861
+SHA256 (claws-mail-3.17.1.tar.xz) = 757b5f4163fb44f772b1453d1cc0b83387bb6b67ad55cc0694bdd4eff9ea76f2
+SIZE (claws-mail-3.17.1.tar.xz) = 4746940
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 4ed509d45150..0c85a976b9d1 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -3,6 +3,7 @@ bin/sylpheed-claws
 include/claws-mail/account.h
 include/claws-mail/action.h
 include/claws-mail/adbookbase.h
+include/claws-mail/addrmerge.h
 include/claws-mail/addr_compl.h
 include/claws-mail/addrbook.h
 include/claws-mail/addrcache.h
@@ -39,6 +40,7 @@ include/claws-mail/common/pkcs5_pbkdf2.h
 include/claws-mail/common/plugin.h
 include/claws-mail/common/prefs.h
 include/claws-mail/common/progressindicator.h
+include/claws-mail/common/proxy.h
 include/claws-mail/common/quoted-printable.h
 include/claws-mail/common/session.h
 include/claws-mail/common/smtp.h
@@ -164,30 +166,10 @@ include/claws-mail/password.h
 include/claws-mail/password_gtk.h
 include/claws-mail/passwordstore.h
 include/claws-mail/pine.h
-include/claws-mail/plugins/claws-mail/archiver.h
-include/claws-mail/plugins/claws-mail/archiver_prefs.h
-include/claws-mail/plugins/claws-mail/gtkhotkey/eggaccelerators.h
-include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-error.h
-include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-info.h
-include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-key-file-registry.h
-include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-listener.h
-include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-marshal.h
-include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-registry.h
-include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-utils.h
-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/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
 include/claws-mail/plugins/pgpcore/prefs_gpg.h
-include/claws-mail/plugins/pgpcore/select-keys.h
 include/claws-mail/plugins/pgpcore/sgpgme.h
-include/claws-mail/plugins/pgpinline/pgpinline.h
-include/claws-mail/plugins/pgpmime/pgpmime.h
-include/claws-mail/plugins/smime/smime.h
-include/claws-mail/plugins/vcalendar/vcal_interface.h
 include/claws-mail/pop.h
 include/claws-mail/prefs_account.h
 include/claws-mail/prefs_actions.h
@@ -209,6 +191,7 @@ include/claws-mail/prefs_message.h
 include/claws-mail/prefs_migration.h
 include/claws-mail/prefs_msg_colors.h
 include/claws-mail/prefs_other.h
+include/claws-mail/prefs_proxy.h
 include/claws-mail/prefs_quote.h
 include/claws-mail/prefs_receive.h
 include/claws-mail/prefs_send.h
@@ -247,6 +230,7 @@ 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/dillo.so
 lib/claws-mail/plugins/pgpinline.deps
 lib/claws-mail/plugins/pgpmime.deps
 lib/claws-mail/plugins/smime.deps
@@ -284,18 +268,6 @@ share/applications/claws-mail.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README.tools
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.html
-%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
-%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.ps
-%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.txt
-%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.html
-%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
-%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.ps
-%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.txt
-%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.html
-%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
-%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
-%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
 share/icons/hicolor/128x128/apps/claws-mail.png
 share/icons/hicolor/48x48/apps/claws-mail.png
 share/icons/hicolor/64x64/apps/claws-mail.png