Disable -fno-exceptions for Clang as libsigc++ uses exceptions in the

header files. Fix template lookup.

7 files changed, 78 insertions, 2 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index dbe36828e08..107efd15650 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2013/02/16 11:23:48 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2013/03/28 21:34:50 joerg Exp $
 #
 
 DISTNAME=		ekiga-3.2.6
@@ -29,6 +29,12 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+# libsigc++ uses exceptions in the header files
+BUILDLINK_TRANSFORM+=	rm:-fno-exceptions
+.endif
+
 .include "../../audio/esound/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
index e2474976b4e..70361bde600 100644
--- a/net/ekiga/distinfo
+++ b/net/ekiga/distinfo
@@ -1,9 +1,14 @@
-$NetBSD: distinfo,v 1.10 2012/04/19 13:07:45 hans Exp $
+$NetBSD: distinfo,v 1.11 2013/03/28 21:34:51 joerg Exp $
 
 SHA1 (ekiga-3.2.6.tar.bz2) = 1c9d2004aa57643a951c1d454e9cfb207143c021
 RMD160 (ekiga-3.2.6.tar.bz2) = f53fe740856e4a4c5b6141086ba25288aabe51ac
 Size (ekiga-3.2.6.tar.bz2) = 8257285 bytes
 SHA1 (patch-configure) = 2aa9145b6b790dcc4dbb63de47ebf663d059c26e
 SHA1 (patch-configure.ac) = a27f2712f9b3f2fa9020d85de87cae78d30ad9bb
+SHA1 (patch-lib_engine_account_bank-impl.h) = 2cc4906ce966e5a8840ec5284433c3a9396c5911
+SHA1 (patch-lib_engine_addressbook_book-impl.h) = 2259de4d6b4450180a0a2a60866eaf3f3e04f3eb
+SHA1 (patch-lib_engine_addressbook_source-impl.h) = ca0d25740c4b37768e15179e4980d4559cf392a8
+SHA1 (patch-lib_engine_presence_cluster-impl.h) = bbdb345cbcb5eae14737021960434343b87bf5fe
+SHA1 (patch-lib_engine_presence_heap-impl.h) = 7a28aa97722d3d81653a2eb98b9d92acc80a6f79
 SHA1 (patch-src_Makefile.am) = 54a6fd59b640c118b928af19fe3aa9943550a3dc
 SHA1 (patch-src_Makefile.in) = dab0e316da9ba7eb2286d104018d59dc85c1ed5b
diff --git a/net/ekiga/patches/patch-lib_engine_account_bank-impl.h b/net/ekiga/patches/patch-lib_engine_account_bank-impl.h
new file mode 100644
index 00000000000..62bbe8e8677
--- /dev/null
+++ b/net/ekiga/patches/patch-lib_engine_account_bank-impl.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_engine_account_bank-impl.h,v 1.1 2013/03/28 21:34:51 joerg Exp $
+
+--- lib/engine/account/bank-impl.h.orig	2013-03-28 17:43:20.000000000 +0000
++++ lib/engine/account/bank-impl.h
+@@ -212,7 +212,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::add_account (gmref_ptr<AccountType> account)
+ {
+-  add_object (account);
++  this->add_object (account);
+ 
+   account->questions.add_handler (questions.make_slot ());
+   account->registration_event.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::BankImpl<AccountType>::on_registration_event), account));
diff --git a/net/ekiga/patches/patch-lib_engine_addressbook_book-impl.h b/net/ekiga/patches/patch-lib_engine_addressbook_book-impl.h
new file mode 100644
index 00000000000..9010638d67b
--- /dev/null
+++ b/net/ekiga/patches/patch-lib_engine_addressbook_book-impl.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_engine_addressbook_book-impl.h,v 1.1 2013/03/28 21:34:51 joerg Exp $
+
+--- lib/engine/addressbook/book-impl.h.orig	2013-03-28 17:33:03.000000000 +0000
++++ lib/engine/addressbook/book-impl.h
+@@ -204,7 +204,7 @@ void
+ Ekiga::BookImpl<ContactType>::add_contact (gmref_ptr<ContactType> contact)
+ {
+   contact->questions.add_handler (questions.make_slot ());
+-  add_object (contact);
++  this->add_object (contact);
+ }
+ 
+ 
diff --git a/net/ekiga/patches/patch-lib_engine_addressbook_source-impl.h b/net/ekiga/patches/patch-lib_engine_addressbook_source-impl.h
new file mode 100644
index 00000000000..e853153785d
--- /dev/null
+++ b/net/ekiga/patches/patch-lib_engine_addressbook_source-impl.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_engine_addressbook_source-impl.h,v 1.1 2013/03/28 21:34:51 joerg Exp $
+
+--- lib/engine/addressbook/source-impl.h.orig	2013-03-28 17:39:51.000000000 +0000
++++ lib/engine/addressbook/source-impl.h
+@@ -206,7 +206,7 @@ template<typename BookType>
+ void
+ Ekiga::SourceImpl<BookType>::add_book (gmref_ptr<BookType> book)
+ {
+-  add_object (book);
++  this->add_object (book);
+ 
+   add_connection (book, book->contact_added.connect (sigc::bind<0> (contact_added.make_slot (), book)));
+ 
diff --git a/net/ekiga/patches/patch-lib_engine_presence_cluster-impl.h b/net/ekiga/patches/patch-lib_engine_presence_cluster-impl.h
new file mode 100644
index 00000000000..825c0e2902c
--- /dev/null
+++ b/net/ekiga/patches/patch-lib_engine_presence_cluster-impl.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_engine_presence_cluster-impl.h,v 1.1 2013/03/28 21:34:51 joerg Exp $
+
+--- lib/engine/presence/cluster-impl.h.orig	2013-03-28 17:41:32.000000000 +0000
++++ lib/engine/presence/cluster-impl.h
+@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (
+ 
+   add_connection (heap, heap->questions.add_handler (questions.make_slot ()));
+ 
+-  add_object (heap);
++  this->add_object (heap);
+ }
+ 
+ template<typename HeapType>
diff --git a/net/ekiga/patches/patch-lib_engine_presence_heap-impl.h b/net/ekiga/patches/patch-lib_engine_presence_heap-impl.h
new file mode 100644
index 00000000000..1f4db2da950
--- /dev/null
+++ b/net/ekiga/patches/patch-lib_engine_presence_heap-impl.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_engine_presence_heap-impl.h,v 1.1 2013/03/28 21:34:51 joerg Exp $
+
+--- lib/engine/presence/heap-impl.h.orig	2013-03-28 17:40:57.000000000 +0000
++++ lib/engine/presence/heap-impl.h
+@@ -160,7 +160,7 @@ Ekiga::HeapImpl<PresentityType>::add_pre
+ {
+   presentity->questions.add_handler (questions.make_slot ());
+ 
+-  add_object (presentity);
++  this->add_object (presentity);
+ }
+ 
+ template<typename PresentityType>