Use and fix C++. Fix pthread linkage.

5 files changed, 46 insertions, 2 deletions

diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 8c18f0259fb..15e41f72969 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2006/05/19 14:32:43 joerg Exp $
 #
 
 DISTNAME=	ogre-v0-12-1
@@ -15,6 +15,7 @@ COMMENT=	Object-Oriented Graphics Rendering Engine
 WRKSRC=			${WRKDIR}/ogrenew
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--with-platform=SDL
@@ -25,4 +26,5 @@ PKGCONFIG_OVERRIDE+=    OGRE.pc.in
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ogre/distinfo b/devel/ogre/distinfo
index 17c0f579e21..72f98720a7f 100644
--- a/devel/ogre/distinfo
+++ b/devel/ogre/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:22 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/05/19 14:32:43 joerg Exp $
 
 SHA1 (ogre-v0-12-1.tar.bz2) = ffabeeb66305182ca3c7f2d9ee5a700599afd0db
 RMD160 (ogre-v0-12-1.tar.bz2) = 34c4e3bfa6d29591c53e0a533fb65ee5a4a5be01
@@ -6,3 +6,6 @@ Size (ogre-v0-12-1.tar.bz2) = 13718569 bytes
 SHA1 (patch-aa) = f091507e8f84385a1ce2e78bd811189006fdb449
 SHA1 (patch-ab) = d2d6e3482391d6b5562a9cfdb302adc2911686b2
 SHA1 (patch-ac) = bfe1bfd9c2033cb75dd5db97ce930e419a649639
+SHA1 (patch-ad) = 14bb9fc366b02292200c39d24c609a019271c6e9
+SHA1 (patch-ae) = 6834759ac02fdf555dfa3fe482bddc914e10fa62
+SHA1 (patch-af) = b7e359ccdee4a3a99aa633a8e79e3bea1ca1939b
diff --git a/devel/ogre/patches/patch-ad b/devel/ogre/patches/patch-ad
new file mode 100644
index 00000000000..173a0784b31
--- /dev/null
+++ b/devel/ogre/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/05/19 14:32:43 joerg Exp $
+
+--- OgreMain/src/OgreParticleSystemManager.cpp.orig	2006-05-19 13:33:18.000000000 +0000
++++ OgreMain/src/OgreParticleSystemManager.cpp
+@@ -34,7 +34,7 @@ http://www.gnu.org/copyleft/lesser.txt.
+ 
+ 
+ namespace Ogre {
+-    ParticleSystemManager* Singleton<ParticleSystemManager>::ms_Singleton = 0;
++    template <> ParticleSystemManager* Singleton<ParticleSystemManager>::ms_Singleton = 0;
+     //-----------------------------------------------------------------------
+     ParticleSystemManager::ParticleSystemManager()
+     {
diff --git a/devel/ogre/patches/patch-ae b/devel/ogre/patches/patch-ae
new file mode 100644
index 00000000000..d1fafe7c0fc
--- /dev/null
+++ b/devel/ogre/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/05/19 14:32:43 joerg Exp $
+
+--- Samples/Nature/src/Makefile.in.orig	2006-05-19 13:58:59.000000000 +0000
++++ Samples/Nature/src/Makefile.in
+@@ -160,7 +160,7 @@ INCLUDES = $(STLPORT_CFLAGS) -I$(top_src
+ noinst_PROGRAMS = Nature 
+ Nature_SOURCES = Nature.cpp
+ Nature_LDFLAGS = -L$(top_srcdir)/OgreMain/src
+-Nature_LDADD = -lOgreMain -lpthread
++Nature_LDADD = -lOgreMain ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ subdir = Samples/Nature/src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/ogre/patches/patch-af b/devel/ogre/patches/patch-af
new file mode 100644
index 00000000000..4583352d156
--- /dev/null
+++ b/devel/ogre/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/05/19 14:32:43 joerg Exp $
+
+--- Samples/Terrain/src/Makefile.in.orig	2006-05-19 13:59:22.000000000 +0000
++++ Samples/Terrain/src/Makefile.in
+@@ -160,7 +160,7 @@ INCLUDES = $(STLPORT_CFLAGS) -I$(top_src
+ noinst_PROGRAMS = Terrain 
+ Terrain_SOURCES = Terrain.cpp
+ Terrain_LDFLAGS = -L$(top_srcdir)/OgreMain/src
+-Terrain_LDADD = -lOgreMain -lpthread
++Terrain_LDADD = -lOgreMain ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ subdir = Samples/Terrain/src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs