aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authornivit <nivit@FreeBSD.org>2007-04-03 22:10:46 +0800
committernivit <nivit@FreeBSD.org>2007-04-03 22:10:46 +0800
commit91cd6599634187f243bea51cf415035a7a8bdbe0 (patch)
tree1217bd5c9cf7073cf5fc35351a3f0c68375dbfa3 /devel
parent09d1e98afd1145b5518604baca5a4ec0a036bd3c (diff)
downloadfreebsd-ports-gnome-91cd6599634187f243bea51cf415035a7a8bdbe0.tar.gz
freebsd-ports-gnome-91cd6599634187f243bea51cf415035a7a8bdbe0.tar.zst
freebsd-ports-gnome-91cd6599634187f243bea51cf415035a7a8bdbe0.zip
- Update to 1.2.0
- Remove files/patch-setup.py PR: ports/111093 Submitted by: Dmitry Marakasov <amdmi3 at amdmi3.ru> (maintainer)
Diffstat (limited to 'devel')
-rw-r--r--devel/py-ode/Makefile24
-rw-r--r--devel/py-ode/distinfo6
-rw-r--r--devel/py-ode/files/patch-setup.py27
3 files changed, 17 insertions, 40 deletions
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index 307a4ed51bed..4db40cd10a7d 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= ode
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.0
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= pyode
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyODE-${PORTVERSION}
@@ -24,12 +24,16 @@ USE_BZIP2= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
+
+OPTIONS= TRIMESH "Trimesh support (sync with OPCODE opt of devel/ode)" on
+
+.include <bsd.port.pre.mk>
+
post-patch:
- @${REINPLACE_CMD} -e '/^#ODE_BASE/ s|.*|ODE_BASE="${X11BASE}"|' ${WRKSRC}/setup.py
-# gcc4x compatibility
- @${REINPLACE_CMD} -e 's|((PyObject *\*)__pyx_v_sp) = |__pyx_v_sp = (struct __pyx_obj_3ode_SpaceBase*)|' ${WRKSRC}/ode_notrimesh.c
- @${REINPLACE_CMD} -e 's|((PyObject *\*)__pyx_v_m) = |__pyx_v_m = (struct __pyx_obj_3ode_Mass*)|' ${WRKSRC}/ode_notrimesh.c
- @${REINPLACE_CMD} -e 's|((PyObject *\*)__pyx_v_jg) = |__pyx_v_jg = (struct __pyx_obj_3ode_JointGroup*)|' ${WRKSRC}/ode_notrimesh.c
- @${REINPLACE_CMD} -e 's|((PyObject *\*)__pyx_v_cont) = |__pyx_v_cont = (struct __pyx_obj_3ode_Contact*)|' ${WRKSRC}/ode_notrimesh.c
-
-.include <bsd.port.mk>
+ @${REINPLACE_CMD} -e 's|/usr/local|${X11BASE}|' ${WRKSRC}/setup.py
+.if defined(WITHOUT_TRIMESH)
+ @${REINPLACE_CMD} -e '/TRIMESH_ENABLE/ s|True|False|' ${WRKSRC}/setup.py
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-ode/distinfo b/devel/py-ode/distinfo
index 2a17d10bffbc..b5446df2ae2c 100644
--- a/devel/py-ode/distinfo
+++ b/devel/py-ode/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/PyODE-1.1.0.tar.bz2) = ad7873c0977e275a9061898ac2e611cd
-SHA256 (python/PyODE-1.1.0.tar.bz2) = 5811121e25f81e55d65d4235baec623726096ce5cfdb980ed223ffde91ec066a
-SIZE (python/PyODE-1.1.0.tar.bz2) = 140371
+MD5 (python/PyODE-1.2.0.tar.bz2) = ab72f3acc635371fd454978e5a97591c
+SHA256 (python/PyODE-1.2.0.tar.bz2) = 117c8f06012e0c0004e69527580a56fac3d814da1051ec1aa73d97d16b60279b
+SIZE (python/PyODE-1.2.0.tar.bz2) = 147671
diff --git a/devel/py-ode/files/patch-setup.py b/devel/py-ode/files/patch-setup.py
deleted file mode 100644
index defcac1f7688..000000000000
--- a/devel/py-ode/files/patch-setup.py
+++ /dev/null
@@ -1,27 +0,0 @@
---- setup.py.orig Thu Jul 7 15:36:03 2005
-+++ setup.py Fri Jan 26 22:54:51 2007
-@@ -150,22 +150,11 @@
- script so that it points to the actual location of the ODE directory."""%ODE_BASE
- sys.exit()
-
--config = readODEConfig()
--
- generate('ode_trimesh.c', True)
- generate('ode_notrimesh.c', False)
-
--try:
-- wrap_trimesh = TRIMESH_SUPPORT_OVERRIDE
--except NameError, e:
-- wrap_trimesh = config.get('OPCODE_DIRECTORY', '')
--
--if (wrap_trimesh):
-- print "Installing with trimesh support."
-- install = 'ode_trimesh.c'
--else:
-- print "Installing without trimesh support."
-- install = 'ode_notrimesh.c'
-+print "Installing without trimesh support."
-+install = 'ode_notrimesh.c'
-
- # Compile the module
- setup(name = "PyODE",