diff --git a/MOVED b/MOVED index 2c015b1dadd8..a12784700437 100644 --- a/MOVED +++ b/MOVED @@ -3756,3 +3756,4 @@ lang/gcc41|lang/gcc42|2009-01-17|Abandoned upstream, superseded by gcc42 and, pr devel/apr-svn|devel/apr|2009-01-18|Only needed for FreeBSD 5.2 and below for threading math/elmer-mathlibs||2009-01-18|Removed textproc/py-wbxml|||2009-01-19|Expired: No longer supported by developers +mail/claws-mail-smime|mail/claws-mail|2009-01-19|The SMIME plugin is included in the main port via the GPGME option now diff --git a/UPDATING b/UPDATING index cf8e208228ce..7d4862dad642 100644 --- a/UPDATING +++ b/UPDATING @@ -6,6 +6,19 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20090119: + AFFECTS: users of mail/claws-mail, mail/claws-mail-smime + AUTHOR: netchild@FreeBSD.org + + The claws-mail port includes the S/MIME plugin itself now, it is not + distributed as a separate plugin anymore. It can be enabled with the + GPGME option in the port (disabled by default). If you use the S/MIME + plugin, you should remove the mail/claws-mail-smime port before + enabling GPGME and updating the mail/claws-mail port. People which + already updated mail/claws-mail with GPGME enabled and a non-working + S/MIME plugin need to deinstall mail/claws-mail-smime and reinstall + mail/claws-mail. + 20090118: AFFECTS: users of net-p2p/deluge AUTHOR: mezz@FreeBSD.org diff --git a/mail/Makefile b/mail/Makefile index 1864ccabb17f..cfac659a3546 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -57,7 +57,6 @@ SUBDIR += claws-mail-pdf_viewer SUBDIR += claws-mail-perl SUBDIR += claws-mail-rssyl - SUBDIR += claws-mail-smime SUBDIR += claws-mail-spamreport SUBDIR += claws-mail-synce SUBDIR += claws-mail-tnef diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile deleted file mode 100644 index 8d24205ed17c..000000000000 --- a/mail/claws-mail-smime/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: sylpheed-claws-smime -# Date created: 23 April 2006 -# Whom: Pawel Pekala -# -# $FreeBSD$ -# - -PORTNAME= smime -PORTVERSION= 0.7.6 -PORTREVISION= 1 -CATEGORIES= mail -MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ -PKGNAMEPREFIX= claws-mail- - -MAINTAINER= c0rn@o2.pl -COMMENT= S/MIME plugin for claws-mail - -LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme -BUILD_DEPENDS= claws-mail>=3.7.0:${PORTSDIR}/mail/claws-mail -RUN_DEPENDS= claws-mail>=3.7.0:${PORTSDIR}/mail/claws-mail - -USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262 - -PLIST_FILES=lib/claws-mail/plugins/smime.a \ - lib/claws-mail/plugins/smime.la \ - lib/claws-mail/plugins/smime.so \ - lib/claws-mail/plugins/smime.deps - -.include diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo deleted file mode 100644 index dcb97ccc3e85..000000000000 --- a/mail/claws-mail-smime/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (smime-0.7.6.tar.gz) = 5361a0aa48c246688843b47ed667b077 -SHA256 (smime-0.7.6.tar.gz) = 9dec43554a531a50b959d1d2a6478f4c22b48ff5761b7bbe0565b46dc31f6d42 -SIZE (smime-0.7.6.tar.gz) = 337459 diff --git a/mail/claws-mail-smime/pkg-descr b/mail/claws-mail-smime/pkg-descr deleted file mode 100644 index 52ed69ed792c..000000000000 --- a/mail/claws-mail-smime/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This plugin handles S/MIME signed and/or encrypted mails. You can -decrypt mails, verify signatures or sign and encrypt your own mails. diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 9a3d6aca129b..e3a4b385e657 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -7,7 +7,7 @@ PORTNAME= claws-mail PORTVERSION= 3.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news ipv6 MASTER_SITES= SF/sylpheed-claws @@ -55,7 +55,7 @@ OPTIONS= ALL "Enable all options except GNUTLS." off \ DEBUG "Enable debug support." off \ DILLO "Enable Dillo HTML viewer." off \ GNOMEPRINT "Enable extended print support (deprecated)." off \ - GPGME "Enable PGP/GnuPG support using GPGME." off \ + GPGME "Enable PGP/GnuPG/SMIME support using GPGME." off \ IPV6 "Enable ipv6 support." on \ JPILOT "Enable JPilot support." off \ LDAP "Enable LDAP support." off \ @@ -119,14 +119,14 @@ PLIST_SUB+= SA_PLUG="@comment " .if defined(WITH_GPGME) || defined(WITH_ALL) PLIST_SUB+= GPGME="" CONFIGURE_ARGS+= --enable-pgpmime-plugin --enable-pgpcore-plugin \ - --enable-pgpinline-plugin + --enable-pgpinline-plugin --enable-smime-plugin LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme \ gpg-error:${PORTSDIR}/security/libgpg-error RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg .else PLIST_SUB+= GPGME="@comment " CONFIGURE_ARGS+= --disable-pgpmime-plugin --disable-pgpcore-plugin \ - --disable-pgpinline-plugin + --disable-pgpinline-plugin --disable-smime-plugin .endif .if defined(WITH_DEBUG) || defined(WITH_ALL) CONFIGURE_ARGS+= --enable-maintainer-mode --enable-crash-dialog diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist index b168e31212a0..d8aebd98014f 100644 --- a/mail/claws-mail/pkg-plist +++ b/mail/claws-mail/pkg-plist @@ -160,6 +160,7 @@ include/claws-mail/pine.h %%GPGME%%include/claws-mail/plugins/pgpcore/sgpgme.h %%GPGME%%include/claws-mail/plugins/pgpinline/pgpinline.h %%GPGME%%include/claws-mail/plugins/pgpmime/pgpmime.h +%%GPGME%%include/claws-mail/plugins/smime/smime.h include/claws-mail/pop.h include/claws-mail/prefs_account.h include/claws-mail/prefs_actions.h @@ -233,6 +234,10 @@ include/claws-mail/wizard.h %%GPGME%%lib/claws-mail/plugins/pgpmime.deps %%GPGME%%lib/claws-mail/plugins/pgpmime.la %%GPGME%%lib/claws-mail/plugins/pgpmime.so +%%GPGME%%lib/claws-mail/plugins/smime.a +%%GPGME%%lib/claws-mail/plugins/smime.la +%%GPGME%%lib/claws-mail/plugins/smime.so +%%GPGME%%lib/claws-mail/plugins/smime.deps %%SA_PLUG%%lib/claws-mail/plugins/spamassassin.a %%SA_PLUG%%lib/claws-mail/plugins/spamassassin.la %%SA_PLUG%%lib/claws-mail/plugins/spamassassin.so @@ -322,6 +327,7 @@ share/pixmaps/claws-mail.png %%GPGME%%@dirrm include/claws-mail/plugins/pgpmime %%GPGME%%@dirrm include/claws-mail/plugins/pgpinline %%GPGME%%@dirrm include/claws-mail/plugins/pgpcore +%%GPGME%%@dirrm include/claws-mail/plugins/smime @dirrm include/claws-mail/gtk @dirrm include/claws-mail/etpan @dirrm include/claws-mail/common