Fix breakage in build of smime plug-in

5 files changed, 42 insertions, 3 deletions

diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index bbf31fbd2e3..68a55bb500a 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/07/04 17:02:50 smb Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PLUGIN_NAME=	pgpcore
 PLUG_VER=	3.4.0
 .include "../../mail/claws-mail/plugins.mk"
+PKGREVISION=1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles core PGP functions
diff --git a/mail/claws-mail-pgpcore/buildlink3.mk b/mail/claws-mail-pgpcore/buildlink3.mk
new file mode 100644
index 00000000000..40423604f68
--- /dev/null
+++ b/mail/claws-mail-pgpcore/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2008/07/04 17:02:50 smb Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:=	${CLAWS_MAIL_PGPCORE_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	claws-mail-pgpcore
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclaws-mail-pgpcore}
+BUILDLINK_PACKAGES+=	claws-mail-pgpcore
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail-pgpcore
+
+.if ${CLAWS_MAIL_PGPCORE_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.4.0
+BUILDLINK_PKGSRCDIR.claws-mail-pgpcore?=	../../mail/claws-mail-pgpcore
+.endif	# CLAWS_MAIL_PGPCORE_BUILDLINK3_MK
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../security/gpgme/buildlink3.mk"
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 66f80858afb..8d4b59bec2f 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/07/04 17:02:50 smb Exp $
 
 DISTNAME=	smime-0.7.5
 PKGNAME=	claws-mail-smime-0.7.5
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
@@ -22,6 +23,7 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
+.include "../../mail/claws-mail-pgpcore/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../security/gnupg2/buildlink3.mk"
diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo
index c1fa9fe627e..18e8ff11b69 100644
--- a/mail/claws-mail-smime/distinfo
+++ b/mail/claws-mail-smime/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.5 2008/07/04 17:02:50 smb Exp $
 
 SHA1 (smime-0.7.5.tar.gz) = a40bf1c5ed22182e63c12e28ab807b2a96f34d77
 RMD160 (smime-0.7.5.tar.gz) = 26978177c5dc128f4543ee0d1b4576d1b6142624
 Size (smime-0.7.5.tar.gz) = 337417 bytes
+SHA1 (patch-aa) = 8db7d35d818ceb1bb3d936e45600c7481914042b
diff --git a/mail/claws-mail-smime/patches/patch-aa b/mail/claws-mail-smime/patches/patch-aa
new file mode 100644
index 00000000000..7f2e629b972
--- /dev/null
+++ b/mail/claws-mail-smime/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2008/07/04 17:02:50 smb Exp $
+
+--- src/smime.c.orig	2008-06-30 22:57:10.000000000 -0400
++++ src/smime.c	2008-06-30 22:57:18.000000000 -0400
+@@ -19,7 +19,7 @@
+  */
+ 
+ #ifdef HAVE_CONFIG_H
+-#  include "config.h"
++#  include "pluginconfig.h"
+ #endif
+ 
+ #ifdef USE_GPGME