4 files changed, 43 insertions, 2 deletions
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index 0525ec572b5..82091968d60 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2011/02/28 14:52:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2011/06/28 09:28:24 wiz Exp $
 #
 
 DISTNAME=	cppunit-1.12.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cppunit/}
 
diff --git a/devel/cppunit/distinfo b/devel/cppunit/distinfo
index fb399e10c23..47e389561e9 100644
--- a/devel/cppunit/distinfo
+++ b/devel/cppunit/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/10/16 15:25:09 wiz Exp $
+$NetBSD: distinfo,v 1.4 2011/06/28 09:28:24 wiz Exp $
 
 SHA1 (cppunit-1.12.1.tar.gz) = f1ab8986af7a1ffa6760f4bacf5622924639bf4a
 RMD160 (cppunit-1.12.1.tar.gz) = c5f38b1d201afcba7913f2b53fb7558add3d21f5
 Size (cppunit-1.12.1.tar.gz) = 762803 bytes
+SHA1 (patch-include_cppunit_Message.h) = aa4442b3c8d144a686d8d43f4c97943ee0d82ba4
+SHA1 (patch-src_cppunit_Message.cpp) = 4e5d38c70879d30f18bc7135916346a58652d3ce
diff --git a/devel/cppunit/patches/patch-include_cppunit_Message.h b/devel/cppunit/patches/patch-include_cppunit_Message.h
new file mode 100644
index 00000000000..81edb0e5ef4
--- /dev/null
+++ b/devel/cppunit/patches/patch-include_cppunit_Message.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-include_cppunit_Message.h,v 1.1 2011/06/28 09:28:24 wiz Exp $
+
+devel/cppunit misses a destructor declaration for one of its classes.
+The compiler generates an implicit destructor but in certain circonstances this leads to crashes.
+More information is available in this bug report on Red Hat's tracker:
+https://bugzilla.redhat.com/show_bug.cgi?id=641350
+
+--- include/cppunit/Message.h.orig	2004-11-19 20:00:44.000000000 +0000
++++ include/cppunit/Message.h
+@@ -57,6 +57,8 @@ public:
+            const std::string &detail2,
+            const std::string &detail3 );
+ 
++  ~Message();
++
+   Message &operator =( const Message &other );
+ 
+   /*! \brief Returns the short description.
diff --git a/devel/cppunit/patches/patch-src_cppunit_Message.cpp b/devel/cppunit/patches/patch-src_cppunit_Message.cpp
new file mode 100644
index 00000000000..75c60393e7f
--- /dev/null
+++ b/devel/cppunit/patches/patch-src_cppunit_Message.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_cppunit_Message.cpp,v 1.1 2011/06/28 09:28:24 wiz Exp $
+
+devel/cppunit misses a destructor declaration for one of its classes.
+The compiler generates an implicit destructor but in certain circonstances this leads to crashes.
+More information is available in this bug report on Red Hat's tracker:
+https://bugzilla.redhat.com/show_bug.cgi?id=641350
+
+--- src/cppunit/Message.cpp.orig	2004-11-19 20:00:44.000000000 +0000
++++ src/cppunit/Message.cpp
+@@ -47,6 +47,10 @@ Message::Message( const std::string &sho
+   addDetail( detail1, detail2, detail3 );
+ }
+ 
++Message::~Message()
++{
++}
++
+ Message &
+ Message::operator =( const Message &other )
+ {