Use and fix C++. Fix pthread linkage.

3 files changed, 39 insertions, 0 deletions

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