- Unbreak build

- Upgrade pysvn to 1.7.0.

 This release include:
 * bug fixes for reported issues
 * New callback_conflict_resolver
 * Support Subversion 1.6

PR:		133893
Submitted by:	Attila Nagy <bra@fsn.hu> (maintainer)

devel/pysvn/Makefile

@@ -6,26 +6,23 @@
 #
 
 PORTNAME=	pysvn
-PORTVERSION=	1.6.2
+PORTVERSION=	1.7.0
 CATEGORIES=	devel
 MASTER_SITES=	http://pysvn.barrys-emacs.org/source_kits/
 
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Python binding for Subversion
 
-BUILD_DEPENDS=	py${PYTHON_SUFFIX}-cxx>=5.4.2:${PORTSDIR}/devel/py-cxx
 LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion \
 		neon.28:${PORTSDIR}/www/neon28
 
-BROKEN=		does not compile
-
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_NOEGGINFO=yes
 PYDISTUTILS_CONFIGURE_TARGET=configure
-PYDISTUTILS_CONFIGUREARGS=--pycxx-dir=${PYTHON_INCLUDEDIR} \
-		--pycxx-src-dir=${LOCALBASE}/share/${PYTHON_VERSION}/CXX \
-		--apr-inc-dir=${LOCALBASE}/include/apr-1
+PYDISTUTILS_CONFIGUREARGS=--apr-inc-dir=${LOCALBASE}/include/apr-1
+
+PYVERSION=	${PYTHON_VERSION:S/^python//}
 
 PLIST_SUB=	PYTHONVER=${PYTHON_VERSION:S/./_/:S/python//}
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PORTNAME}/__init__.py \
@@ -34,8 +31,14 @@ PLIST_DIRS=	%%PYTHON_SITELIBDIR%%/${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Source
 
+.include <bsd.port.pre.mk>
+.if defined(PYTHON_VERSION) && ${PYVERSION:S/.//} < 26
+pre-configure:
+	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py backport
+.endif
+
 do-build:
-	cd ${WRKSRC} && ${MAKE}
+	@cd ${WRKSRC} && ${MAKE}
 
 pre-install:
 	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
@@ -47,4 +50,4 @@ do-install:
 		${WRKSRC}/${PORTNAME}/*.so \
 		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

devel/pysvn/distinfo

@@ -1,3 +1,3 @@
-MD5 (pysvn-1.6.2.tar.gz) = 58bb216b815f3c05ed77f70708515355
-SHA256 (pysvn-1.6.2.tar.gz) = 140c28fe9171cb231fb07c78066ccc74e316e20a63e3f1d5a7cdd10da3b7847e
-SIZE (pysvn-1.6.2.tar.gz) = 220638
+MD5 (pysvn-1.7.0.tar.gz) = 77614676d24bca45749034ea6ec449d8
+SHA256 (pysvn-1.7.0.tar.gz) = 55ae53e2e05fc7099c329a08f13a9b5d216b620cdba9f4036e3de0115601f505
+SIZE (pysvn-1.7.0.tar.gz) = 324484

devel/pysvn/files/patch-setup_configure.py

@@ -0,0 +1,10 @@
+--- setup_configure.py.orig	2009-03-15 12:58:45.000000000 +0100
++++ setup_configure.py	2009-03-15 12:59:08.000000000 +0100
+@@ -147,6 +147,7 @@
+ 
+         # add source dir
+         include_dir_list.append( '.' )
++        include_dir_list.reverse()
+ 
+         # get the python CFLAGS
+         py_cflags_python_list = distutils.sysconfig.get_config_var('CFLAGS').split()