- Update to 0.99.47

PR:		166036
Submitted by:	Ports Fury
Feature safe:	yes

5 files changed, 123 insertions, 64 deletions

diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index 9501a59c5c2..d9723048444 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -7,27 +7,31 @@
 #
 
 PORTNAME=	gsculpt
-PORTVERSION=	0.99.46.2
-PORTREVISION=	6
+PORTVERSION=	0.99.47
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/gSculpt-${PORTVERSION}-alpha
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,}
 DISTNAME=	gSculpt-${PORTVERSION}-alpha-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Opensource 3D modelling application
 
-LIB_DEPENDS=	boost_python:${PORTSDIR}/devel/boost-python-libs
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext \
-		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
+LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/gSculpt-${PORTVERSION}-alpha
+LIB_DEPENDS=	boost_python.4:${PORTSDIR}/devel/boost-python-libs
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>0:${PORTSDIR}/graphics/py-opengl \
+		${PYTHON_PKGNAMEPREFIX}gtkglext>0:${PORTSDIR}/x11-toolkits/py-gtkglext
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S,-src,,}
+
+USE_GNOME=	pygtk2
+USE_GL=		glu
+USE_XORG=	x11
+USE_PYTHON=	2.4+
 USE_SCONS=	yes
 SCONS_BUILDENV=	${SCONS_ENV}
-USE_PYTHON=	2.5+
-USE_XORG=	x11
-USE_GL=		yes
-USE_GNOME=	pygtk2
 USE_LDCONFIG=	${PREFIX}/lib/gSculpt
+MAKE_JOBS_SAFE=	yes
+
 DATADIR=	${PREFIX}/share/gSculpt
 
 .include <bsd.port.pre.mk>
@@ -36,21 +40,27 @@ DATADIR=	${PREFIX}/share/gSculpt
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
+.if ${ARCH} == "i386"
+CFLAGS+=	-DGSCULPT_FPU_X86
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e "s|gsculpt.py|${PYTHONPREFIX_SITELIBDIR}/gSculpt/gsculpt.py|" \
+	@${REINPLACE_CMD} -e \
+		"s| gsculpt.py| ${PYTHONPREFIX_SITELIBDIR}/gSculpt/gsculpt.py|" \
 		${WRKSRC}/gsculpt
-	@${REINPLACE_CMD} -e "s|prefix = os.path.join( '/usr', 'local' )|prefix='${PREFIX}'|; \
-		s|'bin', 'gSculpt'|'${PYTHONPREFIX_SITELIBDIR}'|;" \
-		${WRKSRC}/SConstruct-install
-	@${REINPLACE_CMD} -e "s|-O2|-O1\|-O2|;s|'-Werror',||" \
+	@${REINPLACE_CMD} -e \
+		"s|'-Werror'|''| ; \
+		 s|'-g'|''| ; \
+		 s|'-DGSCULPT_FPU_X86'|''| ; \
+		 s|'[(]-O2.*-O[)]'|''| ; \
+		 /^cppLibs/s|BackgroundModel|BackgroundMesh|" \
 		${WRKSRC}/SConstruct
-.if ${ARCH} != "i386"
-	@${REINPLACE_CMD} -e "s|, '-DGSCULPT_FPU_X86'||;" \
-		${WRKSRC}/SConstruct
-.endif
+	@${REINPLACE_CMD} -e \
+		"/^prefix/s|=.*|= '${PREFIX}'| ; \
+		 /^gSculptStartDir/s|=.*|= os.path.join( pysitelibdir )|" \
+		${WRKSRC}/SConstruct-install
 
 do-install:
-	@cd ${WRKSRC} && \
-	${SCONS_BIN} -f SConstruct-install ${PREFIX}
+	@cd ${WRKSRC} && ${SCONS_BIN} -f SConstruct-install ${PREFIX}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gsculpt/distinfo b/graphics/gsculpt/distinfo
index 0adf651699b..7480af6259a 100644
--- a/graphics/gsculpt/distinfo
+++ b/graphics/gsculpt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gSculpt-0.99.46.2-alpha-src.tar.gz) = 1e754b0bfd52094d18241d2acfc2413f8bd8e53594f6f4ced57ff0a0780427b5
-SIZE (gSculpt-0.99.46.2-alpha-src.tar.gz) = 1170171
+SHA256 (gSculpt-0.99.47-alpha-src.tar.gz) = cb7f0cbff996da66318ab0e2e9bd5f5ebf1170ab9daa4b504e6fc68736d7bc30
+SIZE (gSculpt-0.99.47-alpha-src.tar.gz) = 1245259
diff --git a/graphics/gsculpt/files/patch-cpp__ImporeExportFilter__ObjImport__PyObjImport.cpp b/graphics/gsculpt/files/patch-cpp__ImporeExportFilter__ObjImport__PyObjImport.cpp
new file mode 100644
index 00000000000..4ea39b05e16
--- /dev/null
+++ b/graphics/gsculpt/files/patch-cpp__ImporeExportFilter__ObjImport__PyObjImport.cpp
@@ -0,0 +1,11 @@
+--- cpp/ImportExportFilter/ObjImport/PyObjImport.cpp.orig	2009-06-22 04:58:54.000000000 +0900
++++ cpp/ImportExportFilter/ObjImport/PyObjImport.cpp	2012-03-06 23:06:16.000000000 +0900
+@@ -8,6 +8,8 @@
+ #ifndef PYOBJIMPORT_CPP__
+ #define PYOBJIMPORT_CPP__
+ 
++#include <Python.h>
++
+ #include <string>
+ 
+ #include <boost/python.hpp>
diff --git a/graphics/gsculpt/files/patch-cpp__Math__Vector2.h b/graphics/gsculpt/files/patch-cpp__Math__Vector2.h
new file mode 100644
index 00000000000..47045e1514a
--- /dev/null
+++ b/graphics/gsculpt/files/patch-cpp__Math__Vector2.h
@@ -0,0 +1,10 @@
+--- cpp/Math/Vector2.h.orig	2008-12-30 23:41:26.000000000 +0900
++++ cpp/Math/Vector2.h	2012-03-06 22:15:22.000000000 +0900
+@@ -8,6 +8,7 @@
+ #ifndef VECTOR2_H__
+ #define VECTOR2_H__
+ 
++#include <cstdio>
+ #include <math.h>
+ 
+ #include <algorithm>
diff --git a/graphics/gsculpt/pkg-plist b/graphics/gsculpt/pkg-plist
index fbfd575f9b3..11eaaa01d48 100644
--- a/graphics/gsculpt/pkg-plist
+++ b/graphics/gsculpt/pkg-plist
@@ -1,15 +1,18 @@
 bin/gsculpt
+lib/gSculpt/libBackgroundMesh.so
 lib/gSculpt/libBrush.so
 lib/gSculpt/libCompGeometry.so
 lib/gSculpt/libFileIO.so
 lib/gSculpt/libGraphViewHelper.so
 lib/gSculpt/libGraphics.so
 lib/gSculpt/libGroup.so
+lib/gSculpt/libImportExportFilterObjImport.so
 lib/gSculpt/libLogGrid.so
 lib/gSculpt/libMath.so
 lib/gSculpt/libMesh.so
 lib/gSculpt/libModel.so
 lib/gSculpt/libPainter.so
+lib/gSculpt/libPlatformSpecific.so
 lib/gSculpt/libPolyBlend.so
 lib/gSculpt/libPolyline.so
 lib/gSculpt/libProduct.so
@@ -18,7 +21,12 @@ lib/gSculpt/libTransformation.so
 lib/gSculpt/libUVMap.so
 lib/gSculpt/libUtil.so
 lib/gSculpt/libView.so
-%%PYTHON_SITELIBDIR%%/gsculpt.py
+%%PYTHON_SITELIBDIR%%/Britefury/Background/BackgroundMesh.so
+%%PYTHON_SITELIBDIR%%/Britefury/Background/BackgroundModelFileChooser.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/Background/BackgroundModelFileRef.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/Background/BackgroundModelFileRefCell.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/Background/BackgroundModelFileRefFieldEditor.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/Background/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/Brush/Brush.so
 %%PYTHON_SITELIBDIR%%/Britefury/Brush/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/Cache/GSCache.pyc
@@ -77,6 +85,11 @@ lib/gSculpt/libView.so
 %%PYTHON_SITELIBDIR%%/Britefury/Event/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/FileIO/IOXml.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/FileIO/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/GL/GL.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/GL/GLU.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/GL/_GL.so
+%%PYTHON_SITELIBDIR%%/Britefury/GL/_GLU.so
+%%PYTHON_SITELIBDIR%%/Britefury/GL/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/GraphView/GraphViewHelper.so
 %%PYTHON_SITELIBDIR%%/Britefury/GraphView/SheetGraphView.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/GraphView/SheetGraphViewDisplayTable.pyc
@@ -98,8 +111,11 @@ lib/gSculpt/libView.so
 %%PYTHON_SITELIBDIR%%/Britefury/GroupTools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/I18n/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/I18n/i18n.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/Obj/ObjImport.so
+%%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/Obj/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/ObjExport.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/ObjImport.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/STL.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/ToolImportedModel.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/VrmlExport.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/__init__.pyc
@@ -289,6 +305,8 @@ lib/gSculpt/libView.so
 %%PYTHON_SITELIBDIR%%/Britefury/Painter/RequestPainter.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/Painter/RequestViewportPainter.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/Painter/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/PlatformSpecific/PlatformSpecific.so
+%%PYTHON_SITELIBDIR%%/Britefury/PlatformSpecific/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/PolyBlend/PolyBlend.so
 %%PYTHON_SITELIBDIR%%/Britefury/PolyBlend/PolyBlendComponent.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/PolyBlend/__init__.pyc
@@ -416,6 +434,7 @@ lib/gSculpt/libView.so
 %%PYTHON_SITELIBDIR%%/Britefury/UI/PopupWindow.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/UI/RadioGroup.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/UI/TestWindow.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/UI/ThreadMontiorProgressDialog.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/UI/ToggleButton.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/UI/ToggleGroup.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/UI/UIAction.pyc
@@ -430,6 +449,9 @@ lib/gSculpt/libView.so
 %%PYTHON_SITELIBDIR%%/Britefury/View/BackgroundImage.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/View/BackgroundImageCommandTracker.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/View/BackgroundImageTool.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/View/BackgroundModel.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/View/BackgroundModelCommandTracker.pyc
+%%PYTHON_SITELIBDIR%%/Britefury/View/BackgroundModelTool.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/View/DrawingPlane.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/View/DrawingTemplate.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/View/FocusTool.pyc
@@ -463,54 +485,57 @@ lib/gSculpt/libView.so
 %%PYTHON_SITELIBDIR%%/Britefury/gSculptConfig/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/gSculptConfig/gSculptConfig.pyc
 %%PYTHON_SITELIBDIR%%/Britefury/gSculptConfig/gSculptUserConfig.pyc
-%%DATADIR%%/gsimages/gSculpt_splash_screen_mouse_over_by_Gary_Rose.png
-%%DATADIR%%/gsimages/gridx.png
-%%DATADIR%%/gsimages/graphview_zoomextentsselected.png
-%%DATADIR%%/gsimages/graphview_zoom.png
-%%DATADIR%%/gsimages/rendering_small.png
-%%DATADIR%%/gsimages/vp_notebook_newvp.png
-%%DATADIR%%/gsimages/draw_vertices.png
-%%DATADIR%%/gsimages/snap_settings.png
-%%DATADIR%%/gsimages/vp_notebook.png
-%%DATADIR%%/gsimages/drawing_template.png
-%%DATADIR%%/gsimages/graphview_1to1.png
-%%DATADIR%%/gsimages/draw_textured.png
+%%PYTHON_SITELIBDIR%%/gsculpt.py
 %%DATADIR%%/gsimages/background_images.png
-%%DATADIR%%/gsimages/gSculpt_Glass_Master_by_Gary_Rose.png
-%%DATADIR%%/gsimages/drawing_plane.png
-%%DATADIR%%/gsimages/meshedit_faces.png
-%%DATADIR%%/gsimages/meshedit_body.png
+%%DATADIR%%/gsimages/background_models.png
+%%DATADIR%%/gsimages/draw_backg_transparent.png
+%%DATADIR%%/gsimages/draw_backgroundimages.png
 %%DATADIR%%/gsimages/draw_markedfaces.png
-%%DATADIR%%/gsimages/falloff_cubicscurve.png
 %%DATADIR%%/gsimages/draw_smooth.png
-%%DATADIR%%/gsimages/vp_quad.png
-%%DATADIR%%/gsimages/vp_single.png
-%%DATADIR%%/gsimages/falloff_linear.png
+%%DATADIR%%/gsimages/draw_solid.png
+%%DATADIR%%/gsimages/draw_textured.png
+%%DATADIR%%/gsimages/draw_vertices.png
+%%DATADIR%%/gsimages/draw_wireframe.png
+%%DATADIR%%/gsimages/drawing_plane.png
+%%DATADIR%%/gsimages/drawing_template.png
+%%DATADIR%%/gsimages/falloff_cubicscurve.png
+%%DATADIR%%/gsimages/falloff_flat.png
 %%DATADIR%%/gsimages/falloff_gaussian.png
-%%DATADIR%%/gsimages/meshedit_vertices.png
-%%DATADIR%%/gsimages/focus_tool.png
-%%DATADIR%%/gsimages/meshedit_mesh.png
+%%DATADIR%%/gsimages/falloff_linear.png
 %%DATADIR%%/gsimages/falloff_spherical.png
+%%DATADIR%%/gsimages/focus_tool.png
 %%DATADIR%%/gsimages/function_button.png
-%%DATADIR%%/gsimages/grida.png
-%%DATADIR%%/gsimages/meshedit_edges.png
+%%DATADIR%%/gsimages/gSculpt_Glass_Master_by_Gary_Rose.png
+%%DATADIR%%/gsimages/gSculpt_splash_screen_by_Gary_Rose.png
+%%DATADIR%%/gsimages/gSculpt_splash_screen_mouse_over_by_Gary_Rose.png
+%%DATADIR%%/gsimages/graphview_1to1.png
 %%DATADIR%%/gsimages/graphview_origin.png
+%%DATADIR%%/gsimages/graphview_zoom.png
+%%DATADIR%%/gsimages/graphview_zoomextentsall.png
+%%DATADIR%%/gsimages/graphview_zoomextentsselected.png
 %%DATADIR%%/gsimages/grid_toggle.png
-%%DATADIR%%/gsimages/falloff_flat.png
+%%DATADIR%%/gsimages/grida.png
+%%DATADIR%%/gsimages/gridx.png
+%%DATADIR%%/gsimages/gridy.png
 %%DATADIR%%/gsimages/gridz.png
-%%DATADIR%%/gsimages/node_view_settings.png
-%%DATADIR%%/gsimages/mesh_primitives.png
-%%DATADIR%%/gsimages/draw_wireframe.png
-%%DATADIR%%/gsimages/graphview_zoomextentsall.png
-%%DATADIR%%/gsimages/draw_backgroundimages.png
-%%DATADIR%%/gsimages/draw_solid.png
 %%DATADIR%%/gsimages/group.png
-%%DATADIR%%/gsimages/gridy.png
-%%DATADIR%%/gsimages/draw_backg_transparent.png
-%%DATADIR%%/gsimages/gSculpt_splash_screen_by_Gary_Rose.png
-%%DATADIR%%/gsimages/red_x.png
 %%DATADIR%%/gsimages/layers.png
-@dirrm lib/gSculpt
+%%DATADIR%%/gsimages/mesh_primitives.png
+%%DATADIR%%/gsimages/meshedit_body.png
+%%DATADIR%%/gsimages/meshedit_edges.png
+%%DATADIR%%/gsimages/meshedit_faces.png
+%%DATADIR%%/gsimages/meshedit_mesh.png
+%%DATADIR%%/gsimages/meshedit_vertices.png
+%%DATADIR%%/gsimages/node_view_settings.png
+%%DATADIR%%/gsimages/red_x.png
+%%DATADIR%%/gsimages/rendering_small.png
+%%DATADIR%%/gsimages/snap_settings.png
+%%DATADIR%%/gsimages/vp_notebook.png
+%%DATADIR%%/gsimages/vp_notebook_newvp.png
+%%DATADIR%%/gsimages/vp_quad.png
+%%DATADIR%%/gsimages/vp_single.png
+@dirrm %%DATADIR%%/gsimages
+@dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/gSculptConfig
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/extlibs/pyconsole
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/extlibs/greenlet
@@ -534,6 +559,7 @@ lib/gSculpt/libView.so
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/ProceduralCore
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/PrimitiveTools
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/PolyBlend
+@dirrm %%PYTHON_SITELIBDIR%%/Britefury/PlatformSpecific
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Painter
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/ModelTools
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Model
@@ -553,12 +579,14 @@ lib/gSculpt/libView.so
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/MainApp
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/LogGrid
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Kernel
+@dirrm %%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter/Obj
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/ImportExportFilter
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/I18n
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/GroupTools
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Group
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Graphics
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/GraphView
+@dirrm %%PYTHON_SITELIBDIR%%/Britefury/GL
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/FileIO
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Event
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Editor
@@ -568,6 +596,6 @@ lib/gSculpt/libView.so
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Cell
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Cache
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury/Brush
+@dirrm %%PYTHON_SITELIBDIR%%/Britefury/Background
 @dirrm %%PYTHON_SITELIBDIR%%/Britefury
-@dirrm %%DATADIR%%/gsimages
-@dirrm %%DATADIR%%
+@dirrm lib/gSculpt