Attachment #77864 for bug #112046

View | Details | Raw Unified | Return to bug 112046
Collapse All | Expand All




# Date created:			Oct 10, 2001
# Whom:				ijliao
#
# $Carpetsmoker: ports/gsculpt/Makefile,v 1.3 2007/04/22 12:24:12 carpetsmoker Exp $
# $FreeBSD: ports/graphics/gsculpt/Makefile,v 1.19 2007/03/02 17:26:49 rafan Exp $
#

PORTNAME=	gsculpt
PORTVERSION=	0.99.39.2
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

.include <bsd.port.pre.mk>

post-patch:
	@${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

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (gSculpt-0.99.39-alpha-src.tar.gz) = ee95a485a1e79b3a07c90771224e0225	1	MD5 (gSculpt-0.99.39.2-alpha-src.tar.gz) = 6f808af67da4c3343f7503bdac2a6ec8
2	SHA256 (gSculpt-0.99.39-alpha-src.tar.gz) = 5171921173f443b4de79d522d8fcc2882f57e39329b051ce15cc73ae4f80c878	2	SHA256 (gSculpt-0.99.39.2-alpha-src.tar.gz) = 7e7e685f5180c5dc2be1e2198e963f1573d1c871a9758bd3d6df80ae594514f2
3	SIZE (gSculpt-0.99.39-alpha-src.tar.gz) = 1117795	3	SIZE (gSculpt-0.99.39.2-alpha-src.tar.gz) = 1101072




 
 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




--- 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




--- 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]




--- 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>
 
 
 




--- 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()




--- 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;
 
 
 




--- 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;
 
 
 




--- 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;
 
 
 




--- 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;
 
 
 




--- 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;
 
 
 

Return to bug 112046

Lines 2-12 Link Here

(-)Makefile (-2 / +3 lines)
2	# Date created: Oct 10, 2001	2	# Date created: Oct 10, 2001
3	# Whom: ijliao	3	# Whom: ijliao
4	#	4	#
		5	# $Carpetsmoker: ports/gsculpt/Makefile,v 1.3 2007/04/22 12:24:12 carpetsmoker Exp $
5	# $FreeBSD: ports/graphics/gsculpt/Makefile,v 1.19 2007/03/02 17:26:49 rafan Exp $	6	# $FreeBSD: ports/graphics/gsculpt/Makefile,v 1.19 2007/03/02 17:26:49 rafan Exp $
6	#	7	#
7		8
8	PORTNAME= gsculpt	9	PORTNAME= gsculpt
9	PORTVERSION= 0.99.39	10	PORTVERSION= 0.99.39.2
10	CATEGORIES= graphics	11	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 35-41 Link Here
35	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
36		37
37	post-patch:	38	post-patch:
38	@${REINPLACE_CMD} -e "s\|/usr/include/python2.4\|/usr/local/include/python2.4\|" \	39	@${REINPLACE_CMD} -e "s\|/usr/include/python2.4\|${LOCALBASE}/include/python2.4\|" \
39	${WRKSRC}/SConstruct	40	${WRKSRC}/SConstruct
40	@${REINPLACE_CMD} -e "s\|gsculpt.py\|${PYTHONPREFIX_SITELIBDIR}/gSculpt/gsculpt.py\|" \	41	@${REINPLACE_CMD} -e "s\|gsculpt.py\|${PYTHONPREFIX_SITELIBDIR}/gSculpt/gsculpt.py\|" \
41	${WRKSRC}/gsculpt	42	${WRKSRC}/gsculpt

Lines 8-22 Link Here

(-)files/patch-SConstruct (-9 lines)
8		8
9	PLATFORM_WIN32 = 0	9	PLATFORM_WIN32 = 0
10	PLATFORM_LINUX = 1	10	PLATFORM_LINUX = 1
11	@@ -117,7 +117,7 @@
12	pyExtSuffix = '.pyd'
13	elif platform == PLATFORM_LINUX:
14	localIncPaths = [ 'cpp' ]
15	- pyIncPaths = [ '/usr/include/python2.4' ]
16	+ pyIncPaths = [ '/usr/local/include/python2.4' ]
17	boostPyIncPaths = []
18	standardIncPaths = []
19	localLibPaths = [ '.' ]
20	@@ -140,9 +140,24 @@	11	@@ -140,9 +140,24 @@
21		12
22	extLibs = pyLibs + boostPyLibs + glLibs	13	extLibs = pyLibs + boostPyLibs + glLibs

Line 0 Link Here

(-)files/patch-cpp-Math-BBox2.h (+18 lines)
	1	--- cpp/Math/BBox2.h.orig Sat Mar 3 10:31:14 2007
	2	+++ cpp/Math/BBox2.h Wed Apr 11 16:32:28 2007
	3	@@ -8,7 +8,6 @@
	4	#ifndef BBOX2_H__
	5	#define BBOX2_H__
	6
	7	-#include <boost/python.hpp>
	8
	9
	10
	11	@@ -24,6 +23,7 @@
	12	#include <Math/Polygon2.h>
	13	#include <Math/Side.h>
	14	#include <Math/Axis.h>
	15	+#include <boost/python.hpp>
	16
	17	/*
	18	2D BOUNDING BOX

Line 0 Link Here

(-)files/patch-cpp-Math-Matrix4.h (+18 lines)
	1	--- cpp/Math/Matrix4.h.orig Sat Mar 3 10:31:14 2007
	2	+++ cpp/Math/Matrix4.h Sat Apr 14 02:21:26 2007
	3	@@ -21,7 +21,6 @@
	4	#ifndef MATRIX4_H__
	5	#define MATRIX4_H__
	6
	7	-#include <boost/python.hpp>
	8
	9
	10
	11	@@ -50,6 +49,7 @@
	12	#include <Math/Triangle2.h>
	13	#include <Math/Triangle3.h>
	14	#include <Math/epsilon.h>
	15	+#include <boost/python.hpp>
	16
	17	//a selection of macros to make acessing the members of the matrix easy
	18	#define iMA d[0]

Line 0 Link Here

(-)files/patch-cpp-Math-Segment2.h (+18 lines)
	1	--- cpp/Math/Segment2.h.orig Sat Mar 3 10:07:34 2007
	2	+++ cpp/Math/Segment2.h Wed Apr 11 18:10:37 2007
	3	@@ -8,7 +8,6 @@
	4	#ifndef SEGMENT2_H__
	5	#define SEGMENT2_H__
	6
	7	-#include <boost/python.hpp>
	8
	9
	10	#include <stdio.h>
	11	@@ -17,6 +16,7 @@
	12
	13	#include <Math/Point2.h>
	14	#include <Math/Vector2.h>
	15	+#include <boost/python.hpp>
	16
	17
	18

Lines 1-15 Link Here

(-)files/patch-cpp-Math-pyIndexTriangle.cpp (-15 lines)
1	--- cpp/Math/pyIndexTriangle.cpp.orig Mon Jan 1 17:49:08 2007
2	+++ cpp/Math/pyIndexTriangle.cpp Tue Feb 20 13:56:21 2007
3	@@ -8,10 +8,10 @@
4	#ifndef PYINDEXTRIANGLE_CPP
5	#define PYINDEXTRIANGLE_CPP
6
7	-#include <Math/IndexTriangle.h>
8	-
9	#include <boost/python.hpp>
10	using namespace boost::python;
11	+
12	+#include <Math/IndexTriangle.h>
13
14
15	void export_IndexTriangle()

Lines 1-19 Link Here

(-)files/patch-cpp-Model-pyGSProductModelBlank.cpp (-19 lines)
1	--- cpp/Model/pyGSProductModelBlank.cpp.orig Tue Feb 20 16:17:02 2007
2	+++ cpp/Model/pyGSProductModelBlank.cpp Tue Feb 20 16:17:43 2007
3	@@ -8,13 +8,14 @@
4	#ifndef PYGSPRODUCTMODELBLANK_CPP__
5	#define PYGSPRODUCTMODELBLANK_CPP__
6
7	+#include <boost/python.hpp>
8	+using namespace boost::python;
9	+
10	#include <Product/GSProduct.h>
11
12	#include <Model/GSProductModelBlank.h>
13
14
15	-#include <boost/python.hpp>
16	-using namespace boost::python;
17
18
19

Lines 1-17 Link Here

(-)files/patch-cpp-Product-pyGSProduct.cpp (-17 lines)
1	--- cpp/Product/pyGSProduct.cpp.orig Tue Feb 20 16:24:38 2007
2	+++ cpp/Product/pyGSProduct.cpp Tue Feb 20 16:24:49 2007
3	@@ -8,11 +8,12 @@
4	#ifndef PYGSPRODUCT_CPP__
5	#define PYGSPRODUCT_CPP__
6
7	+#include <boost/python.hpp>
8	+using namespace boost::python;
9	+
10	#include <Product/GSProduct.h>
11
12
13	-#include <boost/python.hpp>
14	-using namespace boost::python;
15
16
17

Lines 1-17 Link Here

(-)files/patch-cpp-RTType-pyRTObject.cpp (-17 lines)
1	--- cpp/RTType/pyRTObject.cpp.orig Tue Feb 20 16:26:57 2007
2	+++ cpp/RTType/pyRTObject.cpp Tue Feb 20 16:27:07 2007
3	@@ -8,11 +8,12 @@
4	#ifndef PYOBJECTPAINTERFACTORY_CPP__
5	#define PYOBJECTPAINTERFACTORY_CPP__
6
7	+#include <boost/python.hpp>
8	+using namespace boost::python;
9	+
10	#include <RTType/RTType.h>
11
12
13	-#include <boost/python.hpp>
14	-using namespace boost::python;
15
16
17

Lines 1-17 Link Here

(-)files/patch-cpp-Util-pySETree.cpp (-17 lines)
1	--- cpp/Util/pySETree.cpp.orig Tue Feb 20 16:34:38 2007
2	+++ cpp/Util/pySETree.cpp Tue Feb 20 16:34:47 2007
3	@@ -8,11 +8,12 @@
4	#ifndef PYSETREE_CPP__
5	#define PYSETREE_CPP__
6
7	+#include <boost/python.hpp>
8	+using namespace boost::python;
9	+
10	#include <Util/SETree.h>
11
12
13	-#include <boost/python.hpp>
14	-using namespace boost::python;
15
16
17

Lines 1-19 Link Here

(-)files/patch-cpp-bugworkarounds-pyGLDeleteTextures.cpp (-19 lines)
1	--- cpp/bugworkarounds/pyGLDeleteTextures/pyGLDeleteTextures.cpp.orig Tue Feb 20 16:39:18 2007
2	+++ cpp/bugworkarounds/pyGLDeleteTextures.cpp Tue Feb 20 16:38:58 2007
3	@@ -8,13 +8,14 @@
4	#ifndef PYGLDELETETEXTURES_CPP__
5	#define PYGLDELETETEXTURES_CPP__
6
7	+#include <boost/python.hpp>
8	+using namespace boost::python;
9	+
10	#include <PlatformSpecific/IncludeGL.h>
11
12	#include <Util/Array.h>
13
14
15	-#include <boost/python.hpp>
16	-using namespace boost::python;
17
18
19