Date: Sun, 1 Apr 2007 14:36:34 +0400 (MSD) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/111093: [MAINTAINER] deve/py-ode: update to 1.2.0 Message-ID: <20070401103634.C7C8C412C@hades.panopticon> Resent-Message-ID: <200704011040.l31Ae5H7026876@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111093
>Category: ports
>Synopsis: [MAINTAINER] deve/py-ode: update to 1.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 01 10:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p12 FreeBSD 6.1-RELEASE-p12 #0: Tue Jan 16 23:12:21 MSK 2007 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
Update to 1.2.0
>How-To-Repeat:
>Fix:
--- py-ode-1.2.0.patch begins here ---
diff -ruN py-ode.orig/Makefile py-ode/Makefile
--- py-ode.orig/Makefile Sun Apr 1 13:41:46 2007
+++ py-ode/Makefile Sun Apr 1 14:28:54 2007
@@ -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_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
+ @${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.mk>
+.include <bsd.port.post.mk>
diff -ruN py-ode.orig/distinfo py-ode/distinfo
--- py-ode.orig/distinfo Sun Apr 1 13:41:46 2007
+++ py-ode/distinfo Sun Apr 1 13:42:19 2007
@@ -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 -ruN py-ode.orig/files/patch-setup.py py-ode/files/patch-setup.py
--- py-ode.orig/files/patch-setup.py Sun Apr 1 13:41:46 2007
+++ py-ode/files/patch-setup.py Thu Jan 1 03:00:00 1970
@@ -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",
--- py-ode-1.2.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070401103634.C7C8C412C>