a few weeks ago i already posted a similar diff, but no response, so please test.
steven Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/blender/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 2005/11/24 22:22:56 1.10 +++ Makefile 2006/01/30 14:08:19 @@ -2,7 +2,7 @@ COMMENT= "3D creation software" -DISTNAME= blender-2.37a +DISTNAME= blender-2.40 CATEGORIES= graphics HOMEPAGE= http://www.blender.org/ @@ -19,20 +19,20 @@ http://download.blender.org/source/ \ http://public.planetmirror.com/pub/blender/source/ +PYTHON_VER= 2.3 + 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 + python2.3.0.0:python-${PYTHON_VER}*:lang/python/${PYTHON_VER} WANTLIB= GL GLU X11 Xext c m pthread stdc++ usbhid util z MODULES= devel/gettext USE_X11= Yes NO_REGRESS= Yes - -WRKDIST= ${WRKDIR}/blender pre-build: @perl -pi -e 's#!!LOCALBASE!!#${LOCALBASE}#g' ${WRKSRC}/SConstruct Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/blender/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 2005/11/24 22:22:56 1.3 +++ distinfo 2006/01/30 14:08:19 @@ -1,4 +1,4 @@ -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 +MD5 (blender-2.40.tar.gz) = 3b58026ca9d0b26292ef39d7e2353f31 +RMD160 (blender-2.40.tar.gz) = ea3f0bcc76c677dfd726d69bfdd127ea8e323d20 +SHA1 (blender-2.40.tar.gz) = 1f86c2ba16afc09eec648c4ccccac8ff23a3374c +SIZE (blender-2.40.tar.gz) = 9298365 Index: patches/patch-SConstruct =================================================================== RCS file: /cvs/ports/graphics/blender/patches/patch-SConstruct,v retrieving revision 1.1 diff -u -r1.1 patch-SConstruct --- patches/patch-SConstruct 2005/11/24 22:22:57 1.1 +++ patches/patch-SConstruct 2006/01/30 14:08:19 @@ -1,7 +1,7 @@ $OpenBSD: patch-SConstruct,v 1.1 2005/11/24 22:22:57 steven Exp $ ---- SConstruct.orig Mon Jun 13 22:56:19 2005 -+++ SConstruct Mon Nov 21 10:27:22 2005 -@@ -607,9 +607,9 @@ elif sys.platform=='openbsd3': +--- SConstruct.orig Tue Dec 20 16:56:12 2005 ++++ SConstruct Tue Jan 3 16:05:47 2006 +@@ -666,9 +666,9 @@ elif sys.platform=='openbsd3': build_blender_static = 'false' build_blender_player = 'false' build_blender_plugin = 'false' @@ -14,7 +14,7 @@ cxxflags = [] defines = [] warn_flags = ['-Wall','-W'] -@@ -623,17 +623,17 @@ elif sys.platform=='openbsd3': +@@ -682,17 +682,21 @@ elif sys.platform=='openbsd3': z_include = ['/usr/include'] # png library information png_lib = ['png'] @@ -28,6 +28,10 @@ - jpeg_include = ['/usr/local/include'] + jpeg_libpath = ['!!LOCALBASE!!/lib'] + jpeg_include = ['!!LOCALBASE!!/include'] ++ # tiff library information ++ tiff_lib = ['tiff'] ++ tiff_libpath = ['!!LOCALBASE!!/lib'] ++ tiff_include = ['!!LOCALBASE!!/include'] # OpenGL library information opengl_lib = ['GL', 'GLU'] - opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a'] @@ -39,7 +43,7 @@ # SDL library information sdl_env.ParseConfig ('sdl-config --cflags --libs') sdl_cflags = sdl_env.Dictionary()['CCFLAGS'] -@@ -660,13 +660,13 @@ elif sys.platform=='openbsd3': +@@ -723,13 +727,13 @@ elif sys.platform=='openbsd3': ftgl_lib = [] ftgl_libpath = [] ftgl_include = ['#extern/bFTGL/include'] @@ -57,7 +61,7 @@ # OpenAL library information openal_lib = ['openal'] openal_libpath = ['/usr/lib'] -@@ -786,8 +786,8 @@ else: +@@ -855,8 +859,8 @@ else: config.write ("\n# Extra compiler flags can be defined here.\n") config.write ("DEFINES = %s\n"%(my_defines)) @@ -68,9 +72,9 @@ config.write ("LDFLAGS = %s\n"%(my_ldflags)) config.write ("USE_INTERNATIONAL = %r\n"%(use_international)) -@@ -800,10 +800,10 @@ else: - config.write ("USE_FMOD = %r\n"%(use_fmod)) +@@ -872,10 +876,10 @@ else: config.write ("USE_QUICKTIME = %r\n"%(use_quicktime)) + config.write ("USE_FLUIDSIM = %r\n"%(use_fluidsim)) config.write ("\n# Compiler information.\n") - config.write ("HOST_CC = %r\n"%(env_dict['CC'])) - config.write ("HOST_CXX = %r\n"%(env_dict['CXX'])) Index: patches/patch-source_blender_blenkernel_intern_blender_c =================================================================== RCS file: /cvs/ports/graphics/blender/patches/patch-source_blender_blenkernel_intern_blender_c,v retrieving revision 1.1 diff -u -r1.1 patch-source_blender_blenkernel_intern_blender_c --- patches/patch-source_blender_blenkernel_intern_blender_c 2005/11/24 22:22:57 1.1 +++ patches/patch-source_blender_blenkernel_intern_blender_c 2006/01/30 14:08:19 @@ -1,7 +1,7 @@ $OpenBSD: patch-source_blender_blenkernel_intern_blender_c,v 1.1 2005/11/24 22:22:57 steven Exp $ ---- source/blender/blenkernel/intern/blender.c.orig Mon May 30 15:20:13 2005 -+++ source/blender/blenkernel/intern/blender.c Thu Nov 24 10:54:56 2005 -@@ -696,9 +696,10 @@ void BKE_undo_save_quit(void) +--- source/blender/blenkernel/intern/blender.c.orig Mon Dec 5 16:46:25 2005 ++++ source/blender/blenkernel/intern/blender.c Tue Jan 3 16:03:52 2006 +@@ -683,9 +683,10 @@ void BKE_undo_save_quit(void) /* no undo state to save */ if(undobase.first==undobase.last) return; Index: patches/patch-source_blender_blenkernel_intern_subsurf_ccg_c =================================================================== RCS file: /cvs/ports/graphics/blender/patches/patch-source_blender_blenkernel_intern_subsurf_ccg_c,v retrieving revision 1.1 diff -u -r1.1 patch-source_blender_blenkernel_intern_subsurf_ccg_c --- patches/patch-source_blender_blenkernel_intern_subsurf_ccg_c 2005/11/24 22:22:57 1.1 +++ patches/patch-source_blender_blenkernel_intern_subsurf_ccg_c 2006/01/30 14:08:19 @@ -1,39 +1,40 @@ -$OpenBSD: patch-source_blender_blenkernel_intern_subsurf_ccg_c,v 1.1 2005/11/24 22:22:57 steven Exp $ ---- source/blender/blenkernel/intern/subsurf_ccg.c.orig Mon Nov 21 22:43:17 2005 -+++ source/blender/blenkernel/intern/subsurf_ccg.c Mon Nov 21 22:46:27 2005 -@@ -313,7 +313,7 @@ static DispListMesh *subSurf_createDispL - med->flag|= ME_SEAM; - } - } else { -- int edgeIdx = (int) ccgSubSurf_getEdgeEdgeHandle(ss, e); -+ long edgeIdx = (long) ccgSubSurf_getEdgeEdgeHandle(ss, e); +$OpenBSD$ +--- source/blender/blenkernel/intern/subsurf_ccg.c.orig Sun Oct 9 23:01:57 2005 ++++ source/blender/blenkernel/intern/subsurf_ccg.c Thu Jan 5 18:14:06 2006 +@@ -428,7 +428,7 @@ static DispListMesh *ss_to_displistmesh( + flags |= ME_SEAM; + } + } else { +- int edgeIdx = (int) ccgSubSurf_getEdgeEdgeHandle(ss, e); ++ long edgeIdx = (long) ccgSubSurf_getEdgeEdgeHandle(ss, e); - /* Edges created by lib have handle of -1 */ - if (edgeIdx!=-1 && ssm->me->medge) { -@@ -377,7 +377,7 @@ static DispListMesh *subSurf_createDispL - int flag; + if (edgeIdx!=-1) { + MEdge *origMed = &medge[edgeIdx]; +@@ -471,7 +471,7 @@ static DispListMesh *ss_to_displistmesh( + int mapIndex = ccgDM_getFaceMapIndex(ccgdm, ss, f); - if (ssm->controlType==SUBSURF_CONTROLTYPE_MESH) { + if (!ssFromEditmesh) { - int origIdx = (int) ccgSubSurf_getFaceFaceHandle(ss, f); + long origIdx = (long) ccgSubSurf_getFaceFaceHandle(ss, f); - MFace *origMFace = &((MFace*) ssm->me->mface)[origIdx]; - if (ssm->me->tface) - origTFace = &((TFace*)ssm->me->tface)[origIdx]; -@@ -501,7 +501,7 @@ static void subSurf_sync(SubSurf *ss, in + MFace *origMFace = &mface[origIdx]; + + if (tface) { +@@ -601,7 +601,8 @@ static void ss_sync_from_mesh(CCGSubSurf + int totvert = dlm?dlm->totvert:me->totvert; + int totedge = dlm?dlm->totedge:me->totedge; + int totface = dlm?dlm->totface:me->totface; +- int i, index; ++ int index; ++ long i; - if (ss->controlType==SUBSURF_CONTROLTYPE_MESH) { - CCGVertHDL fVerts[4]; -- int i; -+ long i; + ccgSubSurf_initFullSync(ss); - for (i=0; i<ss->me->totvert; i++) { - ccgSubSurf_syncVert(ss->subSurf, (CCGVertHDL) i, ss->me->mvert[i].co); -@@ -981,7 +981,7 @@ void subsurf_calculate_limit_positions(M - vi = ccgSubSurf_getVertIterator(ss->subSurf); +@@ -1587,7 +1588,7 @@ void subsurf_calculate_limit_positions(M + vi = ccgSubSurf_getVertIterator(ss); for (; !ccgVertIterator_isStopped(vi); ccgVertIterator_next(vi)) { CCGVert *v = ccgVertIterator_getCurrent(vi); -- int idx = (int) ccgSubSurf_getVertVertHandle(ss->subSurf, v); -+ long idx = (long) ccgSubSurf_getVertVertHandle(ss->subSurf, v); - int N = ccgSubSurf_getVertNumEdges(ss->subSurf, v); - int numFaces = ccgSubSurf_getVertNumFaces(ss->subSurf, v); +- int idx = (int) ccgSubSurf_getVertVertHandle(ss, v); ++ long idx = (long) ccgSubSurf_getVertVertHandle(ss, v); + int N = ccgSubSurf_getVertNumEdges(ss, v); + int numFaces = ccgSubSurf_getVertNumFaces(ss, v); float *co; Index: patches/patch-source_blender_blenlib_intern_fileops_c =================================================================== RCS file: /cvs/ports/graphics/blender/patches/patch-source_blender_blenlib_intern_fileops_c,v retrieving revision 1.1 diff -u -r1.1 patch-source_blender_blenlib_intern_fileops_c --- patches/patch-source_blender_blenlib_intern_fileops_c 2005/11/24 22:22:57 1.1 +++ patches/patch-source_blender_blenlib_intern_fileops_c 2006/01/30 14:08:19 @@ -1,7 +1,7 @@ $OpenBSD: patch-source_blender_blenlib_intern_fileops_c,v 1.1 2005/11/24 22:22:57 steven Exp $ ---- source/blender/blenlib/intern/fileops.c.orig Mon Nov 21 11:14:49 2005 -+++ source/blender/blenlib/intern/fileops.c Mon Nov 21 11:15:34 2005 -@@ -65,7 +65,7 @@ char *first_slash(char *string) { +--- source/blender/blenlib/intern/fileops.c.orig Wed Jul 27 23:31:43 2005 ++++ source/blender/blenlib/intern/fileops.c Tue Jan 3 16:03:52 2006 +@@ -75,7 +75,7 @@ char *first_slash(char *string) { if (!ffslash) return fbslash; else if (!fbslash) return ffslash; @@ -10,7 +10,7 @@ else return fbslash; } -@@ -78,7 +78,7 @@ char *BLI_last_slash(char *string) { +@@ -88,7 +88,7 @@ char *BLI_last_slash(char *string) { if (!lfslash) return lbslash; else if (!lbslash) return lfslash; Index: patches/patch-source_blender_blenloader_intern_readfile_c =================================================================== RCS file: /cvs/ports/graphics/blender/patches/patch-source_blender_blenloader_intern_readfile_c,v retrieving revision 1.1 diff -u -r1.1 patch-source_blender_blenloader_intern_readfile_c --- patches/patch-source_blender_blenloader_intern_readfile_c 2005/11/24 22:22:57 1.1 +++ patches/patch-source_blender_blenloader_intern_readfile_c 2006/01/30 14:08:19 @@ -1,7 +1,7 @@ $OpenBSD: patch-source_blender_blenloader_intern_readfile_c,v 1.1 2005/11/24 22:22:57 steven Exp $ ---- source/blender/blenloader/intern/readfile.c.orig Mon Nov 21 22:57:09 2005 -+++ source/blender/blenloader/intern/readfile.c Mon Nov 21 22:57:25 2005 -@@ -2161,7 +2161,7 @@ static void lib_link_object(FileData *fd +--- source/blender/blenloader/intern/readfile.c.orig Wed Dec 21 17:18:59 2005 ++++ source/blender/blenloader/intern/readfile.c Tue Jan 3 16:03:52 2006 +@@ -2162,7 +2162,7 @@ static void lib_link_object(FileData *fd ob->type= OB_EMPTY; warn= 1; if(ob->id.lib) printf("Can't find obdata of %s lib %s\n", ob->id.name+2, ob->id.lib->name); Index: patches/patch-source_blender_src_transform_conversions_c =================================================================== RCS file: /cvs/ports/graphics/blender/patches/patch-source_blender_src_transform_conversions_c,v retrieving revision 1.1 diff -u -r1.1 patch-source_blender_src_transform_conversions_c --- patches/patch-source_blender_src_transform_conversions_c 2005/11/24 22:22:57 1.1 +++ patches/patch-source_blender_src_transform_conversions_c 2006/01/30 14:08:19 @@ -1,7 +1,7 @@ $OpenBSD: patch-source_blender_src_transform_conversions_c,v 1.1 2005/11/24 22:22:57 steven Exp $ ---- source/blender/src/transform_conversions.c.orig Mon Nov 21 22:32:14 2005 -+++ source/blender/src/transform_conversions.c Mon Nov 21 22:32:33 2005 -@@ -892,8 +892,8 @@ static void createTransLatticeVerts(Tran +--- source/blender/src/transform_conversions.c.orig Mon Dec 19 18:54:17 2005 ++++ source/blender/src/transform_conversions.c Tue Jan 3 16:03:52 2006 +@@ -1282,8 +1282,8 @@ static void createTransLatticeVerts(Tran /* ********************* mesh ****************** */ /* proportional distance based on connectivity */ Index: patches/patch-source_blender_src_usiblender_c =================================================================== RCS file: /cvs/ports/graphics/blender/patches/patch-source_blender_src_usiblender_c,v retrieving revision 1.1 diff -u -r1.1 patch-source_blender_src_usiblender_c --- patches/patch-source_blender_src_usiblender_c 2005/11/24 22:22:57 1.1 +++ patches/patch-source_blender_src_usiblender_c 2006/01/30 14:08:19 @@ -1,7 +1,7 @@ $OpenBSD: patch-source_blender_src_usiblender_c,v 1.1 2005/11/24 22:22:57 steven Exp $ ---- source/blender/src/usiblender.c.orig Wed Nov 23 00:24:07 2005 -+++ source/blender/src/usiblender.c Wed Nov 23 00:22:38 2005 -@@ -153,9 +153,7 @@ static void init_userdef_file(void) +--- source/blender/src/usiblender.c.orig Wed Nov 23 17:33:19 2005 ++++ source/blender/src/usiblender.c Tue Jan 3 16:03:52 2006 +@@ -151,9 +151,7 @@ static void init_userdef_file(void) } if(U.mixbufsize==0) U.mixbufsize= 2048; if (BLI_streq(U.tempdir, "/")) { Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/graphics/blender/pkg/DESCR,v retrieving revision 1.3 diff -u -r1.3 DESCR --- pkg/DESCR 2005/11/24 22:22:57 1.3 +++ pkg/DESCR 2006/01/30 14:08:19 @@ -1,8 +1,7 @@ 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. +interactive 3D content with the benefit of cross-platform operability. Aimed at media professionals and artists, Blender can be used to create 3D visualizations, stills as well as broadcast quality video. Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/blender/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- pkg/PLIST 2005/11/24 22:22:57 1.4 +++ pkg/PLIST 2006/01/30 14:08:19 @@ -2,23 +2,27 @@ bin/blender share/blender/ share/blender/scripts/ +share/blender/scripts/3ds_export.py +share/blender/scripts/3ds_import.py 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/archimap.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/blenderLipSynchro.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/boxpack2d.py share/blender/scripts/bpymodules/defaultdoodads.py share/blender/scripts/bpymodules/eps2obj.py share/blender/scripts/bpymodules/gimp2obj.py @@ -29,6 +33,8 @@ share/blender/scripts/bvh_import.py share/blender/scripts/camera_changer.py share/blender/scripts/clean_mesh.py +share/blender/scripts/collada_export.py +share/blender/scripts/collada_import.py share/blender/scripts/config.py share/blender/scripts/console.py share/blender/scripts/discombobulator.py @@ -52,6 +58,9 @@ share/blender/scripts/knife.py share/blender/scripts/lightwave_export.py share/blender/scripts/lightwave_import.py +share/blender/scripts/md2_export.py +share/blender/scripts/md2_import.py +share/blender/scripts/mirror_bone_weights.py share/blender/scripts/nendo_export.py share/blender/scripts/nendo_import.py share/blender/scripts/obdatacopier.py @@ -76,9 +85,12 @@ share/blender/scripts/truespace_import.py share/blender/scripts/unweld.py share/blender/scripts/uv_export.py +share/blender/scripts/uvpaint.py share/blender/scripts/videoscape_export.py share/blender/scripts/vrml97_export.py +share/blender/scripts/widgetwizard.py share/blender/scripts/wings_export.py share/blender/scripts/wings_import.py share/blender/scripts/wrl2export.py share/blender/scripts/x3d_export.py +share/blender/scripts/xsi_export.py Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
