Renable and fix build of C++ library under Mac OS X.

Bump package revision because of this fix.

5 files changed, 46 insertions, 14 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index fac8781ba52..30a9947bc44 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2007/01/21 18:13:55 minskim Exp $
+# $NetBSD: Makefile,v 1.58 2007/01/24 15:58:04 tron Exp $
 
 DISTNAME=	gnutls-1.6.1
+PKGREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 		ftp://ftp.gnutls.org/pub/gnutls/ \
@@ -22,7 +23,7 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
-INFO_FILES=		# PLIST
+INFO_FILES=		yes
 
 PKGCONFIG_OVERRIDE=	lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=	libextra/gnutls-extra.pc.in
@@ -39,14 +40,6 @@ EGDIR=		${PREFIX}/share/examples/gnutls
 
 .include "../../mk/bsd.prefs.mk"
 
-# Darwin's g++ cannot build the gnutls C++ library (PR 35456).
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-cxx
-PLIST_SUBST+=		CXX="@comment "
-.else
-PLIST_SUBST+=		CXX=""
-.endif
-
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} include/gnutls
 
 post-install:
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index e4046f86111..98bdbc6025f 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2007/01/21 18:13:55 minskim Exp $
+@comment $NetBSD: PLIST,v 1.25 2007/01/24 15:58:04 tron Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -10,7 +10,7 @@ bin/srptool
 include/gnutls/compat.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
-${CXX}include/gnutls/gnutlsxx.h
+include/gnutls/gnutlsxx.h
 include/gnutls/openpgp.h
 include/gnutls/openssl.h
 include/gnutls/pkcs12.h
@@ -19,7 +19,7 @@ info/gnutls.info
 lib/libgnutls-extra.la
 lib/libgnutls-openssl.la
 lib/libgnutls.la
-${CXX}lib/libgnutlsxx.la
+lib/libgnutlsxx.la
 lib/pkgconfig/gnutls-extra.pc
 lib/pkgconfig/gnutls.pc
 man/man1/certtool.1
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 0ff68a7abc0..d77c99183b5 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.33 2007/01/20 17:38:06 wiz Exp $
+$NetBSD: distinfo,v 1.34 2007/01/24 15:58:04 tron Exp $
 
 SHA1 (gnutls-1.6.1.tar.bz2) = e9517a6ad324245a5ebf8d86a16fc1486cd0b6ee
 RMD160 (gnutls-1.6.1.tar.bz2) = e1b780885dadc6cb355af53a4e69172f1037e06c
 Size (gnutls-1.6.1.tar.bz2) = 4226536 bytes
+SHA1 (patch-aa) = eb29cda3b79c6cf7303ebf53ace62a7834eac6bf
 SHA1 (patch-ab) = 503bf7fa154341504db7ba3b5c6602627ff27dc5
+SHA1 (patch-ac) = 937b2ea324ffa0dccb37a0612d7ace8b0de9c00a
diff --git a/security/gnutls/patches/patch-aa b/security/gnutls/patches/patch-aa
new file mode 100644
index 00000000000..316419c8676
--- /dev/null
+++ b/security/gnutls/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.9 2007/01/24 15:58:04 tron Exp $
+
+--- includes/gnutls/gnutlsxx.h.orig	2006-08-07 13:40:23.000000000 +0100
++++ includes/gnutls/gnutlsxx.h	2007-01-24 11:29:43.000000000 +0000
+@@ -233,7 +233,14 @@
+ {
+     public:
+         credentials(gnutls_credentials_type_t t);
++#if defined(__APPLE__) || defined(__MACOS__)
++        credentials( credentials& c) {
++                type = c.type;
++                set_ptr( c.ptr());
++	}
++#else
+         credentials( credentials& c);
++#endif
+         virtual ~credentials() { }
+         gnutls_credentials_type_t get_type() const;
+     protected:
diff --git a/security/gnutls/patches/patch-ac b/security/gnutls/patches/patch-ac
new file mode 100644
index 00000000000..534c5c18d8e
--- /dev/null
+++ b/security/gnutls/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.3 2007/01/24 15:58:04 tron Exp $
+
+--- lib/gnutlsxx.cpp.orig	2006-06-01 20:49:01.000000000 +0100
++++ lib/gnutlsxx.cpp	2007-01-24 11:31:05.000000000 +0000
+@@ -822,11 +822,13 @@
+ { 
+ }
+ 
++#if !(defined(__APPLE__) || defined(__MACOS__))
+ credentials::credentials( credentials& c)
+ {
+     this->type = c.type;
+     this->set_ptr( c.ptr());
+ }
++#endif
+ 
+ gnutls_credentials_type_t credentials::get_type() const
+ {