- Update to 0.99.39/2

PR:		112046
Submitted by:	Martin Tournoij <carpetsmoker@xs4all.nl> (maintainer)

12 files changed, 60 insertions, 118 deletions

diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index 4c0ec8ad5b23..d1646ed6ff86 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -2,11 +2,12 @@
 # Date created:			Oct 10, 2001
 # Whom:				ijliao
 #
+# $Carpetsmoker: ports/gsculpt/Makefile,v 1.3 2007/04/22 12:24:12 carpetsmoker Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	gsculpt
-PORTVERSION=	0.99.39
+PORTVERSION=	0.99.39.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,7 +36,7 @@ USE_LDCONFIG=	${PREFIX}/lib/gSculpt
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/include/python2.4|/usr/local/include/python2.4|" \
+	@${REINPLACE_CMD} -e "s|/usr/include/python2.4|${LOCALBASE}/include/python2.4|" \
 		${WRKSRC}/SConstruct
 	@${REINPLACE_CMD} -e "s|gsculpt.py|${PYTHONPREFIX_SITELIBDIR}/gSculpt/gsculpt.py|" \
 		${WRKSRC}/gsculpt
diff --git a/graphics/gsculpt/distinfo b/graphics/gsculpt/distinfo
index 457d00c4dbaa..e6ca23f10c5f 100644
--- a/graphics/gsculpt/distinfo
+++ b/graphics/gsculpt/distinfo
@@ -1,3 +1,3 @@
-MD5 (gSculpt-0.99.39-alpha-src.tar.gz) = ee95a485a1e79b3a07c90771224e0225
-SHA256 (gSculpt-0.99.39-alpha-src.tar.gz) = 5171921173f443b4de79d522d8fcc2882f57e39329b051ce15cc73ae4f80c878
-SIZE (gSculpt-0.99.39-alpha-src.tar.gz) = 1117795
+MD5 (gSculpt-0.99.39.2-alpha-src.tar.gz) = 6f808af67da4c3343f7503bdac2a6ec8
+SHA256 (gSculpt-0.99.39.2-alpha-src.tar.gz) = 7e7e685f5180c5dc2be1e2198e963f1573d1c871a9758bd3d6df80ae594514f2
+SIZE (gSculpt-0.99.39.2-alpha-src.tar.gz) = 1101072
diff --git a/graphics/gsculpt/files/patch-SConstruct b/graphics/gsculpt/files/patch-SConstruct
index c7ac80c3f57e..d1ab2b0694e8 100644
--- a/graphics/gsculpt/files/patch-SConstruct
+++ b/graphics/gsculpt/files/patch-SConstruct
@@ -8,15 +8,6 @@
  
  PLATFORM_WIN32 = 0
  PLATFORM_LINUX = 1
-@@ -117,7 +117,7 @@
- 	pyExtSuffix = '.pyd'
- elif platform == PLATFORM_LINUX:
- 	localIncPaths = [ 'cpp' ]
--	pyIncPaths = [ '/usr/include/python2.4' ]
-+	pyIncPaths = [ '/usr/local/include/python2.4' ]
- 	boostPyIncPaths = []
- 	standardIncPaths = []
- 	localLibPaths = [ '.' ]
 @@ -140,9 +140,24 @@
  
  extLibs = pyLibs + boostPyLibs + glLibs
diff --git a/graphics/gsculpt/files/patch-cpp-Math-BBox2.h b/graphics/gsculpt/files/patch-cpp-Math-BBox2.h
new file mode 100644
index 000000000000..e9fe3b3f1643
--- /dev/null
+++ b/graphics/gsculpt/files/patch-cpp-Math-BBox2.h
@@ -0,0 +1,18 @@
+--- cpp/Math/BBox2.h.orig	Sat Mar  3 10:31:14 2007
++++ cpp/Math/BBox2.h	Wed Apr 11 16:32:28 2007
+@@ -8,7 +8,6 @@
+ #ifndef BBOX2_H__
+ #define BBOX2_H__
+ 
+-#include <boost/python.hpp>
+ 
+ 
+ 
+@@ -24,6 +23,7 @@
+ #include <Math/Polygon2.h>
+ #include <Math/Side.h>
+ #include <Math/Axis.h>
++#include <boost/python.hpp>
+ 
+ /*
+ 2D BOUNDING BOX
diff --git a/graphics/gsculpt/files/patch-cpp-Math-Matrix4.h b/graphics/gsculpt/files/patch-cpp-Math-Matrix4.h
new file mode 100644
index 000000000000..b241abb42215
--- /dev/null
+++ b/graphics/gsculpt/files/patch-cpp-Math-Matrix4.h
@@ -0,0 +1,18 @@
+--- cpp/Math/Matrix4.h.orig	Sat Mar  3 10:31:14 2007
++++ cpp/Math/Matrix4.h	Sat Apr 14 02:21:26 2007
+@@ -21,7 +21,6 @@
+ #ifndef MATRIX4_H__
+ #define MATRIX4_H__
+ 
+-#include <boost/python.hpp>
+ 
+ 
+ 
+@@ -50,6 +49,7 @@
+ #include <Math/Triangle2.h>
+ #include <Math/Triangle3.h>
+ #include <Math/epsilon.h>
++#include <boost/python.hpp>
+ 
+ //a selection of macros to make acessing the members of the matrix easy
+ #define iMA d[0]
diff --git a/graphics/gsculpt/files/patch-cpp-Math-Segment2.h b/graphics/gsculpt/files/patch-cpp-Math-Segment2.h
new file mode 100644
index 000000000000..a01a454eb537
--- /dev/null
+++ b/graphics/gsculpt/files/patch-cpp-Math-Segment2.h
@@ -0,0 +1,18 @@
+--- cpp/Math/Segment2.h.orig	Sat Mar  3 10:07:34 2007
++++ cpp/Math/Segment2.h	Wed Apr 11 18:10:37 2007
+@@ -8,7 +8,6 @@
+ #ifndef SEGMENT2_H__
+ #define SEGMENT2_H__
+ 
+-#include <boost/python.hpp>
+ 
+ 
+ #include <stdio.h>
+@@ -17,6 +16,7 @@
+ 
+ #include <Math/Point2.h>
+ #include <Math/Vector2.h>
++#include <boost/python.hpp>
+ 
+ 
+ 
diff --git a/graphics/gsculpt/files/patch-cpp-Math-pyIndexTriangle.cpp b/graphics/gsculpt/files/patch-cpp-Math-pyIndexTriangle.cpp
deleted file mode 100644
index bf5b452495e6..000000000000
--- a/graphics/gsculpt/files/patch-cpp-Math-pyIndexTriangle.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- cpp/Math/pyIndexTriangle.cpp.orig	Mon Jan  1 17:49:08 2007
-+++ cpp/Math/pyIndexTriangle.cpp	Tue Feb 20 13:56:21 2007
-@@ -8,10 +8,10 @@
- #ifndef PYINDEXTRIANGLE_CPP
- #define PYINDEXTRIANGLE_CPP
- 
--#include <Math/IndexTriangle.h>
--
- #include <boost/python.hpp>
- using namespace boost::python;
-+
-+#include <Math/IndexTriangle.h>
- 
- 
- void export_IndexTriangle()
diff --git a/graphics/gsculpt/files/patch-cpp-Model-pyGSProductModelBlank.cpp b/graphics/gsculpt/files/patch-cpp-Model-pyGSProductModelBlank.cpp
deleted file mode 100644
index 77dfb9a289e1..000000000000
--- a/graphics/gsculpt/files/patch-cpp-Model-pyGSProductModelBlank.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- cpp/Model/pyGSProductModelBlank.cpp.orig	Tue Feb 20 16:17:02 2007
-+++ cpp/Model/pyGSProductModelBlank.cpp	Tue Feb 20 16:17:43 2007
-@@ -8,13 +8,14 @@
- #ifndef PYGSPRODUCTMODELBLANK_CPP__
- #define PYGSPRODUCTMODELBLANK_CPP__
- 
-+#include <boost/python.hpp>
-+using namespace boost::python;
-+
- #include <Product/GSProduct.h>
- 
- #include <Model/GSProductModelBlank.h>
- 
- 
--#include <boost/python.hpp>
--using namespace boost::python;
- 
- 
- 
diff --git a/graphics/gsculpt/files/patch-cpp-Product-pyGSProduct.cpp b/graphics/gsculpt/files/patch-cpp-Product-pyGSProduct.cpp
deleted file mode 100644
index b3521e026745..000000000000
--- a/graphics/gsculpt/files/patch-cpp-Product-pyGSProduct.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- cpp/Product/pyGSProduct.cpp.orig	Tue Feb 20 16:24:38 2007
-+++ cpp/Product/pyGSProduct.cpp	Tue Feb 20 16:24:49 2007
-@@ -8,11 +8,12 @@
- #ifndef PYGSPRODUCT_CPP__
- #define PYGSPRODUCT_CPP__
- 
-+#include <boost/python.hpp>
-+using namespace boost::python;
-+
- #include <Product/GSProduct.h>
- 
- 
--#include <boost/python.hpp>
--using namespace boost::python;
- 
- 
- 
diff --git a/graphics/gsculpt/files/patch-cpp-RTType-pyRTObject.cpp b/graphics/gsculpt/files/patch-cpp-RTType-pyRTObject.cpp
deleted file mode 100644
index 3fb6c7713148..000000000000
--- a/graphics/gsculpt/files/patch-cpp-RTType-pyRTObject.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- cpp/RTType/pyRTObject.cpp.orig	Tue Feb 20 16:26:57 2007
-+++ cpp/RTType/pyRTObject.cpp	Tue Feb 20 16:27:07 2007
-@@ -8,11 +8,12 @@
- #ifndef PYOBJECTPAINTERFACTORY_CPP__
- #define PYOBJECTPAINTERFACTORY_CPP__
- 
-+#include <boost/python.hpp>
-+using namespace boost::python;
-+
- #include <RTType/RTType.h>
- 
- 
--#include <boost/python.hpp>
--using namespace boost::python;
- 
- 
- 
diff --git a/graphics/gsculpt/files/patch-cpp-Util-pySETree.cpp b/graphics/gsculpt/files/patch-cpp-Util-pySETree.cpp
deleted file mode 100644
index 2fa8cf7adbcb..000000000000
--- a/graphics/gsculpt/files/patch-cpp-Util-pySETree.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- cpp/Util/pySETree.cpp.orig	Tue Feb 20 16:34:38 2007
-+++ cpp/Util/pySETree.cpp	Tue Feb 20 16:34:47 2007
-@@ -8,11 +8,12 @@
- #ifndef PYSETREE_CPP__
- #define PYSETREE_CPP__
- 
-+#include <boost/python.hpp>
-+using namespace boost::python;
-+
- #include <Util/SETree.h>
- 
- 
--#include <boost/python.hpp>
--using namespace boost::python;
- 
- 
- 
diff --git a/graphics/gsculpt/files/patch-cpp-bugworkarounds-pyGLDeleteTextures.cpp b/graphics/gsculpt/files/patch-cpp-bugworkarounds-pyGLDeleteTextures.cpp
deleted file mode 100644
index 68b6c5b3bee4..000000000000
--- a/graphics/gsculpt/files/patch-cpp-bugworkarounds-pyGLDeleteTextures.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- cpp/bugworkarounds/pyGLDeleteTextures/pyGLDeleteTextures.cpp.orig	Tue Feb 20 16:39:18 2007
-+++ cpp/bugworkarounds/pyGLDeleteTextures.cpp	Tue Feb 20 16:38:58 2007
-@@ -8,13 +8,14 @@
- #ifndef PYGLDELETETEXTURES_CPP__
- #define PYGLDELETETEXTURES_CPP__
- 
-+#include <boost/python.hpp>
-+using namespace boost::python;
-+
- #include <PlatformSpecific/IncludeGL.h>
- 
- #include <Util/Array.h>
- 
- 
--#include <boost/python.hpp>
--using namespace boost::python;
- 
- 
-