ports/130588: [PATCH] mail/claws-mail-smime now part of mail/claws-mail

[Pawel Pekala]

>Number:         130588
>Category:       ports
>Synopsis:       [PATCH] mail/claws-mail-smime now part of mail/claws-mail
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 15 17:00:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Pawel Pekala
>Release:        FreeBSD 7.1-RELEASE i386
>Organization:
>Environment:


System: FreeBSD 7.1-RELEASE #4: Mon Jan  5 18:15:11 CET 2009
    root at caprica.slowicza.org:/usr/obj/usr/src/sys/GENERIC



>Description:


claws-mail-smime plugin has been part of main package for
some time now. Old mail/claws-mail-smime port wiil not compile
with claws-mail WITH_GPGME (needed for smime to work at all)
due to internal API change.

My proposition is to deprecate mail/claws-mail-smime port and 
add smime part to WITH_GPGME knob of main claws-mail.


>How-To-Repeat:





>Fix:


--- claws-mail-smime.diff begins here ---
diff -urN /usr/ports/mail/claws-mail/Makefile claws-mail/Makefile
--- /usr/ports/mail/claws-mail/Makefile	2009-01-13 22:28:51.000000000 +0100
+++ claws-mail/Makefile	2009-01-15 17:12:04.000000000 +0100
@@ -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 @@
 		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 @@
 .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 -urN /usr/ports/mail/claws-mail/pkg-plist claws-mail/pkg-plist
--- /usr/ports/mail/claws-mail/pkg-plist	2009-01-12 15:45:02.000000000 +0100
+++ claws-mail/pkg-plist	2009-01-15 17:07:35.000000000 +0100
@@ -160,6 +160,7 @@
 %%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 @@
 %%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 @@
 %%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
diff -urN /usr/ports/mail/claws-mail-smime/Makefile claws-mail-smime/Makefile
--- /usr/ports/mail/claws-mail-smime/Makefile	2009-01-12 15:45:02.000000000 +0100
+++ claws-mail-smime/Makefile	2009-01-15 17:10:56.000000000 +0100
@@ -19,6 +19,9 @@
 BUILD_DEPENDS=	claws-mail>=3.7.0:${PORTSDIR}/mail/claws-mail
 RUN_DEPENDS=	claws-mail>=3.7.0:${PORTSDIR}/mail/claws-mail
 
+BROKEN=		does not compile with claws-mail 3.7.0 WITH_GPGME=on
+DEPRECATED=	SMIME support is now part of main claws-mail port (see options)
+
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:262
 
--- claws-mail-smime.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: