On Mon, May 25, 2009 at 08:39:39PM -0700, Ryan Boggs wrote:
> I just tested this with django without the workaround and it works.
> If this is committed, then the patch for django can be removed.
I will commit this version instead later today.
f.-
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-mxDateTime/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 6 Apr 2009 18:21:26 -0000 1.22
+++ Makefile 26 May 2009 07:39:48 -0000
@@ -6,7 +6,7 @@ COMMENT= Date and Time types for Python
VERSION= 3.1.2
DISTNAME= egenix-mx-base-${VERSION}
-PKGNAME= py-mxDateTime-${VERSION}
+PKGNAME= py-mxDateTime-${VERSION}p0
CATEGORIES= devel
MASTER_SITES= http://www.lemburg.com/files/python/
@@ -21,7 +21,7 @@ PERMIT_DISTFILES_CDROM= Yes
MODULES= lang/python
-FLAVORS= python2.4 python2.5 # Needed for Zope, e.g.
+FLAVORS= python2.4 python2.5 python2.6 # Needed for Zope, e.g.
FLAVOR?= python2.5
.if !${FLAVOR} || ${FLAVOR:L:Npython?.?}
@@ -31,6 +31,12 @@ ERRORS+= "Fatal: You must select one ver
MODPY_VERSION= ${FLAVOR:S/python//}
NO_REGRESS= Yes
+
+# Avoid collisions with libc' bm_free
+post-configure:
+ @perl -pi -e 's|bm_free|mxbm_free|g' \
+ ${WRKSRC}/mx/TextTools/mxTextTools/mxbmse.[ch] \
+ ${WRKSRC}/mx/TextTools/mxTextTools/mxTextTools.c
post-install:
find ${WRKINST} -name \*.egg-info -exec rm {} \;
