From 4bbcbc2d95a9c7065f037e8b34c7799634e4c9a1 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Sun, 30 Jul 2006 07:29:13 +0000
Subject: [PATCH] unbreak build on OpenBSD 4.

---
 graphics/blender/Makefile                            | 11 +++++++++--
 .../blender/patches/patch-extern_bullet_SConscript   | 12 ++++++++++++
 .../blender/patches/patch-extern_solid_SConscript    | 12 ++++++++++++
 .../blender/patches/patch-intern_ghost_SConscript    | 12 ++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 graphics/blender/patches/patch-extern_bullet_SConscript
 create mode 100644 graphics/blender/patches/patch-extern_solid_SConscript
 create mode 100644 graphics/blender/patches/patch-intern_ghost_SConscript

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 1432f922627..ea38ca12139 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2006/07/26 06:45:27 steven Exp $
+# $OpenBSD: Makefile,v 1.14 2006/07/30 07:29:13 steven Exp $
 
 COMMENT=	"3D creation software"
 
@@ -40,6 +40,9 @@ WRKDIST=	${WRKDIR}/${DISTNAME:S/-//}
 
 CFLAGS+=	-fPIC -funsigned-char -fno-strict-aliasing
 
+post-extract:
+	@cd ${WRKSRC}/config && cp openbsd3-config.py openbsd4-config.py
+
 do-build:
 	@${SETENV} ${MAKE_ENV} scons -C ${WRKSRC} blendernogame \
 		CC=${CC} CXX=${CXX} \
@@ -67,7 +70,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/release/scripts/bpymodules/*.py \
 		${PREFIX}/share/blender/scripts/bpymodules
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/blender
-	${INSTALL_DATA} ${WRKSRC}/release/text/{?lender*,*license*,copy*} \
+	${INSTALL_DATA} ${WRKSRC}/release/text/?lender* \
+		${PREFIX}/share/doc/blender
+	${INSTALL_DATA} ${WRKSRC}/release/text/*license* \
+		${PREFIX}/share/doc/blender
+	${INSTALL_DATA} ${WRKSRC}/release/text/copy* \
 		${PREFIX}/share/doc/blender
 
 .include <bsd.port.mk>
diff --git a/graphics/blender/patches/patch-extern_bullet_SConscript b/graphics/blender/patches/patch-extern_bullet_SConscript
new file mode 100644
index 00000000000..09038d535a1
--- /dev/null
+++ b/graphics/blender/patches/patch-extern_bullet_SConscript
@@ -0,0 +1,12 @@
+$OpenBSD: patch-extern_bullet_SConscript,v 1.1 2006/07/30 07:29:13 steven Exp $
+--- extern/bullet/SConscript.orig	Sun Jul 30 08:25:22 2006
++++ extern/bullet/SConscript	Sun Jul 30 08:25:41 2006
+@@ -14,7 +14,7 @@ if env['OURPLATFORM']=='win32-vc':
+ elif env['OURPLATFORM']=='win32-mingw':
+     defs += ' NDEBUG'
+     cflags += ['-O2']
+-elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='openbsd3':
++elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='openbsd3' or sys.platform=='openbsd4':
+     defs += ' NDEBUG'
+     cflags += ['-O2']
+ elif sys.platform=='darwin':
diff --git a/graphics/blender/patches/patch-extern_solid_SConscript b/graphics/blender/patches/patch-extern_solid_SConscript
new file mode 100644
index 00000000000..c12a1f6f1bb
--- /dev/null
+++ b/graphics/blender/patches/patch-extern_solid_SConscript
@@ -0,0 +1,12 @@
+$OpenBSD: patch-extern_solid_SConscript,v 1.3 2006/07/30 07:29:13 steven Exp $
+--- extern/solid/SConscript.orig	Sun Jul 30 08:26:02 2006
++++ extern/solid/SConscript	Sun Jul 30 08:26:17 2006
+@@ -12,7 +12,7 @@ if env['OURPLATFORM']=='win32-vc':
+ elif env['OURPLATFORM']=='win32-mingw':
+     defs += ' NDEBUG'
+     cflags += ['-O2']
+-elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='openbsd3':
++elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='openbsd3' or sys.platform=='openbsd4':
+     defs += ' NDEBUG'
+     cflags += ['-O2']
+ elif sys.platform=='darwin' :
diff --git a/graphics/blender/patches/patch-intern_ghost_SConscript b/graphics/blender/patches/patch-intern_ghost_SConscript
new file mode 100644
index 00000000000..71f5649db29
--- /dev/null
+++ b/graphics/blender/patches/patch-intern_ghost_SConscript
@@ -0,0 +1,12 @@
+$OpenBSD: patch-intern_ghost_SConscript,v 1.1 2006/07/30 07:29:13 steven Exp $
+--- intern/ghost/SConscript.orig	Sun Jul 30 08:27:02 2006
++++ intern/ghost/SConscript	Sun Jul 30 08:27:19 2006
+@@ -22,7 +22,7 @@ elif window_system == 'darwin':
+     for f in pf:
+         sources.remove('intern' + os.sep + f + 'Win32.cpp')
+         sources.remove('intern' + os.sep + f + 'X11.cpp')
+-elif window_system == 'openbsd3':
++elif window_system == 'openbsd3' or window_system == 'openbsd4':
+     for f in pf:
+         sources.remove('intern' + os.sep + f + 'Win32.cpp')
+         sources.remove('intern' + os.sep + f + 'Carbon.cpp')