[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: update: graphics/blender

To: ports_(_at_)_openbsd_(_dot_)_org
Subject: Re: update: graphics/blender
From: steven mestdagh <steven_(_dot_)_mestdagh_(_at_)_esat_(_dot_)_kuleuven_(_dot_)_be>
Date: Sat, 29 Oct 2005 21:18:22 +0200
here is a better diff, which removes hardcoded /usr/local, and also
installs some scripts that come with the source (inspired by netbsd).
tested on i386, but should still be working on sparc64 and macppc as was
reported earlier.


diff -uNr -x CVS graphics/blender/Makefile mystuff/graphics/blender/Makefile
--- graphics/blender/Makefile	Sun Dec 29 21:08:46 2002
+++ mystuff/graphics/blender/Makefile	Sat Oct 29 21:08:46 2005
@@ -1,37 +1,54 @@
-# $OpenBSD: Makefile,v 1.9 2002/12/29 20:08:46 fgsch Exp $
+# $OpenBSD$
 
 COMMENT=	"3D creation software"
-ONLY_FOR_ARCHS=	i386
 
-V=		2.23
-PKGNAME=	blender-${V}
-DISTNAME=	blender-creator-${V}-linux-glibc2.1.2-i386-static
+V=		2.37a
+DISTNAME=	blender-${V}
 CATEGORIES=	graphics
 
-HOMEPAGE=	http://www.blender.nl/
+HOMEPAGE=	http://www.blender.org/
 
-MAINTAINER=	Reinhard J. Sammer <reinhard_(_at_)_openbsd_(_dot_)_org>
+MAINTAINER=	Steven Mestdagh <steven_(_dot_)_mestdagh_(_at_)_esat_(_dot_)_kuleuven_(_dot_)_be>
 
-PERMIT_PACKAGE_CDROM=	"no commercial use"
-PERMIT_PACKAGE_FTP=	"no commercial use"
-PERMIT_DISTFILES_CDROM=	"no commercial use"
-PERMIT_DISTFILES_FTP=	"no commercial use"
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.cs.umn.edu/pub/blender/pub/ \
-		http://www.download.blender.pl/mirror/
+MASTER_SITES=	ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
+		http://download.blender.org/source/ \
+		http://public.planetmirror.com/pub/blender/source/
 
-RUN_DEPENDS=	:redhat_base-*:emulators/redhat/base
+BUILD_DEPENDS=	:scons-*:devel/scons \
+		:pkgconfig-*:devel/pkgconfig
+LIB_DEPENDS=	png::graphics/png \
+		jpeg::graphics/jpeg \
+		SDL::devel/sdl \
+		python2.3.0.0:python-2.3.*:lang/python/2.3
 
-INSTALL_STRIP=
-NO_BUILD=	Yes
+WANTLIB=	GL GLU X11 Xext c m pthread stdc++ usbhid util z
+
+MODULES=	gettext
+USE_X11=	Yes
 NO_REGRESS=	Yes
 
+WRKDIST=	${WRKDIR}/blender
+
+post-patch:
+	@perl -pi -e 's#!!LOCALBASE!!#${LOCALBASE}#g' ${WRKSRC}/SConstruct
+	@perl -pi -e 's#!!X11BASE!!#${X11BASE}#g' ${WRKSRC}/SConstruct
+
+do-build:
+	@env ${MAKE_ENV} scons -C ${WRKBUILD}
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/blender ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/blender
-	${INSTALL_DATA} ${WRKSRC}/{README,copyright.txt} \
-		${PREFIX}/share/examples/blender
-	cd ${WRKSRC} && tar cf - plugins | \
-		(cd ${PREFIX}/share/examples/blender && tar xf -)
+	${INSTALL_PROGRAM} ${WRKBUILD}/blender ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/blender/scripts
+	${INSTALL_DATA} ${WRKSRC}/release/scripts/*.py \
+		${PREFIX}/share/blender/scripts
+	${INSTALL_DATA_DIR} ${PREFIX}/share/blender/scripts/bpymodules
+	${INSTALL_DATA} ${WRKSRC}/release/scripts/bpymodules/*.py \
+		${PREFIX}/share/blender/scripts/bpymodules
 
 .include <bsd.port.mk>
diff -uNr -x CVS graphics/blender/distinfo mystuff/graphics/blender/distinfo
--- graphics/blender/distinfo	Wed Jan  5 22:11:14 2005
+++ mystuff/graphics/blender/distinfo	Sun Oct 16 10:06:17 2005
@@ -1,4 +1,4 @@
-MD5 (blender-creator-2.23-linux-glibc2.1.2-i386-static.tar.gz) = 98b58b1c840160f2ed5a01344dce3b96
-RMD160 (blender-creator-2.23-linux-glibc2.1.2-i386-static.tar.gz) = a365db940b767a1cdcd69eb1cfff77e166477f39
-SHA1 (blender-creator-2.23-linux-glibc2.1.2-i386-static.tar.gz) = 751e8927bfb0e77e6b4c212ceff197fbe07332e2
-SIZE (blender-creator-2.23-linux-glibc2.1.2-i386-static.tar.gz) = 2505088
+MD5 (blender-2.37a.tar.gz) = dd0002c09ecd68b3cb3e3d8f4ce31e83
+RMD160 (blender-2.37a.tar.gz) = 77a78a9f5ead45b7d1f67837c30446afbe937889
+SHA1 (blender-2.37a.tar.gz) = 8070654abdca449658f8fb7c9ecfc4fb7e445465
+SIZE (blender-2.37a.tar.gz) = 7990789
diff -uNr -x CVS graphics/blender/patches/patch-SConstruct mystuff/graphics/blender/patches/patch-SConstruct
--- graphics/blender/patches/patch-SConstruct	Thu Jan  1 01:00:00 1970
+++ mystuff/graphics/blender/patches/patch-SConstruct	Sat Oct 29 20:06:28 2005
@@ -0,0 +1,46 @@
+$OpenBSD$
+--- SConstruct.orig	Mon Jun 13 22:56:19 2005
++++ SConstruct	Sat Oct 29 20:04:29 2005
+@@ -623,17 +623,17 @@ elif sys.platform=='openbsd3':
+ 	z_include = ['/usr/include']
+ 	# png library information
+ 	png_lib = ['png']
+-	png_libpath = ['/usr/local/lib']
+-	png_include = ['/usr/local/include/libpng']
++	png_libpath = ['!!LOCALBASE!!/lib']
++	png_include = ['!!LOCALBASE!!/include/libpng']
+ 	# jpeg library information
+ 	jpeg_lib = ['jpeg']
+-	jpeg_libpath = ['/usr/local/lib']
+-	jpeg_include = ['/usr/local/include']
++	jpeg_libpath = ['!!LOCALBASE!!/lib']
++	jpeg_include = ['!!LOCALBASE!!/include']
+ 	# OpenGL library information
+ 	opengl_lib = ['GL', 'GLU']
+-	opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a']
+-	opengl_libpath = ['/usr/lib', '/usr/X11R6/lib']
+-	opengl_include = ['/usr/X11R6/include/']
++	opengl_static = ['!!X11BASE!!/lib/libGL.a', '!!X11BASE!!/lib/libGLU.a']
++	opengl_libpath = ['!!X11BASE!!/lib']
++	opengl_include = ['!!X11BASE!!/include/']
+ 	# SDL library information
+ 	sdl_env.ParseConfig ('sdl-config --cflags --libs')
+ 	sdl_cflags = sdl_env.Dictionary()['CCFLAGS']
+@@ -660,13 +660,13 @@ elif sys.platform=='openbsd3':
+         ftgl_lib = []
+         ftgl_libpath = []
+         ftgl_include = ['#extern/bFTGL/include']
+-	freetype_env.ParseConfig('pkg-config --cflags --libs freetype2')
++	freetype_env.ParseConfig('freetype-config --cflags --libs 2>/dev/null')
+ 	freetype_lib = freetype_env.Dictionary()['LIBS']
+ 	freetype_libpath = freetype_env.Dictionary()['LIBPATH']
+ 	freetype_include = freetype_env.Dictionary()['CPPPATH']
+-	gettext_lib = []
+-	gettext_libpath = []
+-	gettext_include = []
++	gettext_lib = ['intl', 'iconv']
++	gettext_libpath = ['!!LOCALBASE!!/lib']
++	gettext_include = ['!!LOCALBASE!!/include']
+ 	# OpenAL library information
+ 	openal_lib = ['openal']
+ 	openal_libpath = ['/usr/lib']
diff -uNr -x CVS graphics/blender/patches/patch-extern_solid_SConscript mystuff/graphics/blender/patches/patch-extern_solid_SConscript
--- graphics/blender/patches/patch-extern_solid_SConscript	Thu Jan  1 01:00:00 1970
+++ mystuff/graphics/blender/patches/patch-extern_solid_SConscript	Sun Oct 16 17:44:54 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- extern/solid/SConscript.orig	Sun Oct 16 17:44:24 2005
++++ extern/solid/SConscript	Sun Oct 16 17:44:37 2005
+@@ -18,7 +18,7 @@ if sys.platform=='win32':
+ 	defines += ['WIN32','NDEBUG', '_WINDOWS', '_LIB']
+ 	#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
+ 	cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
+-elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':
++elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='openbsd3':
+ 	defines += ['NDEBUG']
+ 	cflags += ['-O2']
+ elif sys.platform=='darwin' :
diff -uNr -x CVS graphics/blender/patches/patch-intern_SoundSystem_intern_SND_WaveCache_cpp mystuff/graphics/blender/patches/patch-intern_SoundSystem_intern_SND_WaveCache_cpp
--- graphics/blender/patches/patch-intern_SoundSystem_intern_SND_WaveCache_cpp	Thu Jan  1 01:00:00 1970
+++ mystuff/graphics/blender/patches/patch-intern_SoundSystem_intern_SND_WaveCache_cpp	Mon Oct 17 08:45:39 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- intern/SoundSystem/intern/SND_WaveCache.cpp.orig	Mon Oct 17 08:43:26 2005
++++ intern/SoundSystem/intern/SND_WaveCache.cpp	Mon Oct 17 08:45:19 2005
+@@ -48,7 +48,7 @@
+ #ifdef __APPLE__
+ # include <sys/malloc.h>
+ #else
+-# ifdef __FreeBSD__
++# if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #  include <stdlib.h>
+ # else
+ #  include <malloc.h>
diff -uNr -x CVS graphics/blender/patches/patch-intern_iksolver_intern_TNT_cmat_h mystuff/graphics/blender/patches/patch-intern_iksolver_intern_TNT_cmat_h
--- graphics/blender/patches/patch-intern_iksolver_intern_TNT_cmat_h	Thu Jan  1 01:00:00 1970
+++ mystuff/graphics/blender/patches/patch-intern_iksolver_intern_TNT_cmat_h	Mon Oct 17 09:50:32 2005
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- intern/iksolver/intern/TNT/cmat.h.orig	Mon Oct 17 09:38:08 2005
++++ intern/iksolver/intern/TNT/cmat.h	Mon Oct 17 09:42:12 2005
+@@ -39,7 +39,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <iostream>
+-#include <strstream>
++#include <sstream>
+ #ifdef TNT_USE_REGIONS
+ #include "region2d.h"
+ #endif
+@@ -207,7 +207,7 @@ class Matrix 
+     Matrix(Subscript M, Subscript N, const char *s)
+     {
+         initialize(M,N);
+-        std::istrstream ins(s);
++        std::istringstream ins(s);
+ 
+         Subscript i, j;
+ 
diff -uNr -x CVS graphics/blender/patches/patch-intern_iksolver_intern_TNT_vec_h mystuff/graphics/blender/patches/patch-intern_iksolver_intern_TNT_vec_h
--- graphics/blender/patches/patch-intern_iksolver_intern_TNT_vec_h	Thu Jan  1 01:00:00 1970
+++ mystuff/graphics/blender/patches/patch-intern_iksolver_intern_TNT_vec_h	Mon Oct 17 09:50:32 2005
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- intern/iksolver/intern/TNT/vec.h.orig	Thu Jul 22 02:15:49 2004
++++ intern/iksolver/intern/TNT/vec.h	Mon Oct 17 09:41:08 2005
+@@ -37,7 +37,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <iostream>
+-#include <strstream>
++#include <sstream>
+ 
+ namespace TNT
+ {
+@@ -189,7 +189,7 @@ class Vector 
+     Vector(Subscript N, char *s) :  v_(0), vm1_(0), n_(0)
+     {
+         initialize(N);
+-        std::istrstream ins(s);
++        std::istringstream ins(s);
+ 
+         Subscript i;
+ 
diff -uNr -x CVS graphics/blender/patches/patch-source_blender_blenlib_intern_storage_c mystuff/graphics/blender/patches/patch-source_blender_blenlib_intern_storage_c
--- graphics/blender/patches/patch-source_blender_blenlib_intern_storage_c	Thu Jan  1 01:00:00 1970
+++ mystuff/graphics/blender/patches/patch-source_blender_blenlib_intern_storage_c	Mon Oct 17 08:32:08 2005
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- source/blender/blenlib/intern/storage.c.orig	Mon Oct 17 07:33:52 2005
++++ source/blender/blenlib/intern/storage.c	Mon Oct 17 08:31:26 2005
+@@ -50,7 +50,7 @@
+ #include <time.h>
+ #include <sys/stat.h>
+ 
+-#if !defined(linux) && (defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__))
++#if !defined(__OpenBSD__) && !defined(linux) && (defined(__sgi) || defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__))
+ #include <sys/statfs.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ struct statfs {
+ #include <pwd.h>
+ #endif
+ 
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
+ #include <malloc.h>
+ #endif
+ 
+@@ -194,7 +194,7 @@ double BLI_diskfree(char *dir)
+ #ifdef __BeOS
+ 	return -1;
+ #endif
+-#if !defined(linux) && (defined (__sgi) || defined (__sun__) || defined (__sun) || defined(__sparc) || defined(__sparc__))
++#if !defined(__OpenBSD__) && !defined(linux) && (defined (__sgi) || defined (__sun__) || defined (__sun) || defined(__sparc) || defined(__sparc__))
+ 
+ 	if (statfs(name, &disk, sizeof(struct statfs), 0)){
+ 		/* printf("diskfree: Couldn't get information about %s.\n",dir); */
diff -uNr -x CVS graphics/blender/pkg/DESCR mystuff/graphics/blender/pkg/DESCR
--- graphics/blender/pkg/DESCR	Mon Dec 15 22:42:31 2003
+++ mystuff/graphics/blender/pkg/DESCR	Sat Oct 29 21:05:16 2005
@@ -1,9 +1,10 @@
-Developed as the in-house software of a high quality animation
-studio, Blender has proven to be an extremely fast and versatile
-design instrument. The software has a personal touch, offering a
-unique approach to the world of Three Dimensions. Use Blender to
-create TV commercials, to make technical visualizations, business
-graphics, to do some morphing, or design user interfaces. You can
-easy build and manage complex environments. The renderer is versatile
-and extremely fast.  All basic animation principles (curves & keys)
-are well implemented.
+Blender is an integrated suite of tools enabling the creation of a
+broad range of 3D content. It offers full functionality for modelling,
+rendering, animation, post-production, creation and playback of
+interactive 3D content with the singular benefits of cross-platform
+operability and a download file size of less than 2.5MB.
+Aimed at media professionals and artists, Blender can be used to create
+3D visualizations, stills as well as broadcast quality video.
+
+Documentation for blender is available on the homepage:
+http://www.blender.org/cms/Documentation.628.0.html
diff -uNr -x CVS graphics/blender/pkg/MESSAGE mystuff/graphics/blender/pkg/MESSAGE
--- graphics/blender/pkg/MESSAGE	Thu Dec 13 10:39:35 2001
+++ mystuff/graphics/blender/pkg/MESSAGE	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-The beginners page is at http://www.blender.nl/support/beginners.php
diff -uNr -x CVS graphics/blender/pkg/PLIST mystuff/graphics/blender/pkg/PLIST
--- graphics/blender/pkg/PLIST	Fri Sep 17 07:38:07 2004
+++ mystuff/graphics/blender/pkg/PLIST	Sat Oct 29 20:17:24 2005
@@ -1,27 +1,84 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:50:08 espie Exp $
+_(_at_)_comment $OpenBSD$
 bin/blender
-share/examples/blender/
-share/examples/blender/README
-share/examples/blender/copyright.txt
-share/examples/blender/plugins/
-share/examples/blender/plugins/Makefile
-share/examples/blender/plugins/bmake
-share/examples/blender/plugins/include/
-share/examples/blender/plugins/include/floatpatch.h
-share/examples/blender/plugins/include/iff.h
-share/examples/blender/plugins/include/plugin.h
-share/examples/blender/plugins/include/util.h
-share/examples/blender/plugins/sequence/
-share/examples/blender/plugins/sequence/Makefile
-share/examples/blender/plugins/sequence/blur.c
-share/examples/blender/plugins/sequence/blur.so
-share/examples/blender/plugins/sequence/scatter.c
-share/examples/blender/plugins/sequence/scatter.so
-share/examples/blender/plugins/sequence/showzbuf.c
-share/examples/blender/plugins/sequence/showzbuf.so
-share/examples/blender/plugins/texture/
-share/examples/blender/plugins/texture/Makefile
-share/examples/blender/plugins/texture/clouds2.c
-share/examples/blender/plugins/texture/clouds2.so
-share/examples/blender/plugins/texture/tiles.c
-share/examples/blender/plugins/texture/tiles.so
+share/blender/
+share/blender/scripts/
+share/blender/scripts/Apply_def.py
+share/blender/scripts/Axiscopy.py
+share/blender/scripts/DirectX8Exporter.py
+share/blender/scripts/DirectXExporter.py
+share/blender/scripts/UVpaint05.py
+share/blender/scripts/ac3d_export.py
+share/blender/scripts/ac3d_import.py
+share/blender/scripts/armature_symetry.py
+share/blender/scripts/batch_name_edit.py
+share/blender/scripts/bevel_center.py
+share/blender/scripts/blender2cal3d.py
+share/blender/scripts/bpymodules/
+share/blender/scripts/bpymodules/BPyBlender.py
+share/blender/scripts/bpymodules/BPyMathutils.py
+share/blender/scripts/bpymodules/BPyNMesh.py
+share/blender/scripts/bpymodules/BPyRegistry.py
+share/blender/scripts/bpymodules/ai2obj.py
+share/blender/scripts/bpymodules/defaultdoodads.py
+share/blender/scripts/bpymodules/eps2obj.py
+share/blender/scripts/bpymodules/gimp2obj.py
+share/blender/scripts/bpymodules/meshtools.py
+share/blender/scripts/bpymodules/svg2obj.py
+share/blender/scripts/bvh2arm.py
+share/blender/scripts/bvh_export.py
+share/blender/scripts/bvh_import.py
+share/blender/scripts/camera_changer.py
+share/blender/scripts/clean_mesh.py
+share/blender/scripts/config.py
+share/blender/scripts/console.py
+share/blender/scripts/discombobulator.py
+share/blender/scripts/disp_paint.py
+share/blender/scripts/doc_browser.py
+share/blender/scripts/envelope_assignment.py
+share/blender/scripts/envelope_symmetry.py
+share/blender/scripts/fixfromarmature.py
+share/blender/scripts/help_browser.py
+share/blender/scripts/help_getting_started.py
+share/blender/scripts/help_manual.py
+share/blender/scripts/help_py_reference.py
+share/blender/scripts/help_release_notes.py
+share/blender/scripts/help_tutorials.py
+share/blender/scripts/help_web_blender.py
+share/blender/scripts/help_web_devcomm.py
+share/blender/scripts/help_web_eshop.py
+share/blender/scripts/help_web_usercomm.py
+share/blender/scripts/hotkeys.py
+share/blender/scripts/kloputils.py
+share/blender/scripts/knife.py
+share/blender/scripts/lightwave_export.py
+share/blender/scripts/lightwave_import.py
+share/blender/scripts/nendo_export.py
+share/blender/scripts/nendo_import.py
+share/blender/scripts/obdatacopier.py
+share/blender/scripts/obj_export.py
+share/blender/scripts/obj_import.py
+share/blender/scripts/off_export.py
+share/blender/scripts/off_import.py
+share/blender/scripts/paths_import.py
+share/blender/scripts/radiosity_export.py
+share/blender/scripts/radiosity_import.py
+share/blender/scripts/raw_export.py
+share/blender/scripts/raw_import.py
+share/blender/scripts/renameobjectbyblock.py
+share/blender/scripts/rvk1_torvk2.py
+share/blender/scripts/save_theme.py
+share/blender/scripts/sel_same.py
+share/blender/scripts/skin.py
+share/blender/scripts/slp_import.py
+share/blender/scripts/sysinfo.py
+share/blender/scripts/tex2uvbaker.py
+share/blender/scripts/truespace_export.py
+share/blender/scripts/truespace_import.py
+share/blender/scripts/unweld.py
+share/blender/scripts/uv_export.py
+share/blender/scripts/videoscape_export.py
+share/blender/scripts/vrml97_export.py
+share/blender/scripts/wings_export.py
+share/blender/scripts/wings_import.py
+share/blender/scripts/wrl2export.py
+share/blender/scripts/x3d_export.py

Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Prev by Date: NEW: ruby-sys-admin-1.3.1
Next by Date: new: audio/noteedit
Previous by thread: Re: update: graphics/blender
Next by thread: games/xsoldier mastersite broken
Index(es):
- Date
- Thread
Visit your host, monkey.org