From 40f60974335e7769d460060f3b9e8f2f1cfc8f1f Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Wed, 8 Sep 2010 11:46:09 +0000
Subject: -use mail/gmime24, it has been there before -no need to define
 _NETBSD_SOURCE -- _XOPEN_SOURCE=520 should be  sufficient for getaddrinfo(3),
 and more portable -ltdl is unused apparently

---
 mail/balsa/Makefile         |  6 ++----
 mail/balsa/distinfo         |  4 ++--
 mail/balsa/patches/patch-ag | 11 ++++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'mail')

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 7bf6e1a2bfc..0723597b089 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2010/09/07 19:12:02 adam Exp $
+# $NetBSD: Makefile,v 1.73 2010/09/08 11:46:09 drochner Exp $
 
 DISTNAME=	balsa-2.4.8
 CATEGORIES=	mail gnome
@@ -41,11 +41,9 @@ BUILDLINK_TRANSFORM+=		rm:-DGTK_DISABLE_DEPRECATED
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.9
-.include "../../mail/gmime/buildlink3.mk"
+.include "../../mail/gmime24/buildlink3.mk"
 .include "../../mail/libesmtp/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index f93b2295bfc..72f7629b3a2 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2010/09/07 19:12:02 adam Exp $
+$NetBSD: distinfo,v 1.16 2010/09/08 11:46:09 drochner Exp $
 
 SHA1 (balsa-2.4.8.tar.bz2) = 809d44a82505ca19cb202923f0683f47c8252b70
 RMD160 (balsa-2.4.8.tar.bz2) = d1723f99c4d27f722d48300863be539a5dad606a
@@ -6,6 +6,6 @@ Size (balsa-2.4.8.tar.bz2) = 3150866 bytes
 SHA1 (patch-aa) = d3798749cadec5931e5366ed94db033cf10442df
 SHA1 (patch-ab) = eb517156e63712f7d5c7dbde7b963bae12475997
 SHA1 (patch-ac) = 0e586d99d5c53e8caa0c9aa652bf5f5d7f0e1758
-SHA1 (patch-ag) = 665610929c4a84851560ec3acb8f28d103941e35
+SHA1 (patch-ag) = 4cb0d65378b505bc944add36ca68c29776dad496
 SHA1 (patch-ak) = abe90f5117fdcd3381c2a7061cf3ab29e9a3f025
 SHA1 (patch-ba) = 46ed4e317ef79ec58fc432c74c3e057b13ffee75
diff --git a/mail/balsa/patches/patch-ag b/mail/balsa/patches/patch-ag
index 7017ca2ccf3..8ec147a176e 100644
--- a/mail/balsa/patches/patch-ag
+++ b/mail/balsa/patches/patch-ag
@@ -1,12 +1,13 @@
-$NetBSD: patch-ag,v 1.4 2010/09/07 19:12:03 adam Exp $
+$NetBSD: patch-ag,v 1.5 2010/09/08 11:46:10 drochner Exp $
 
 --- libbalsa/imap/imap-handle.c.orig	2010-08-13 19:15:36.000000000 +0000
 +++ libbalsa/imap/imap-handle.c
-@@ -21,6 +21,7 @@
+@@ -19,7 +19,7 @@
+ #include "config.h"
+ 
  #define _POSIX_C_SOURCE 199506L
- #define _XOPEN_SOURCE 500
+-#define _XOPEN_SOURCE 500
++#define _XOPEN_SOURCE 520
  #define _BSD_SOURCE     1
-+#define _NETBSD_SOURCE  1
  
  #include <sys/types.h>
- #include <sys/socket.h>
-- 
cgit v1.2.3