ports/132658: Update port: devel/pysvn

[Attila Nagy]

>Number:         132658
>Category:       ports
>Synopsis:       Update port: devel/pysvn
>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 Mar 15 13:40:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Attila Nagy
>Release:        
>Organization:
>Environment:
>Description:
- update pysvn to 1.6.3
- run setup.py backport if running with python 2.5 or earlier
- switch to in-source pycxx instead of depending on the port (which sometimes is not compatible with pysvn)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN pysvn/Makefile pysvn.new/Makefile
--- pysvn/Makefile	2009-02-17 23:19:25.000000000 +0100
+++ pysvn.new/Makefile	2009-03-15 14:24:58.000000000 +0100
@@ -6,26 +6,23 @@
 #
 
 PORTNAME=	pysvn
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 CATEGORIES=	devel
 MASTER_SITES=	http://pysvn.barrys-emacs.org/source_kits/
 
 MAINTAINER=	bra at 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
+.include <bsd.port.pre.mk>
+PYVERSION=     ${PYTHON_VERSION:S/^python//}
 
 PLIST_SUB=	PYTHONVER=${PYTHON_VERSION:S/./_/:S/python//}
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PORTNAME}/__init__.py \
@@ -34,8 +31,13 @@
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Source
 
+.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 +49,4 @@
 		${WRKSRC}/${PORTNAME}/*.so \
 		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN pysvn/distinfo pysvn.new/distinfo
--- pysvn/distinfo	2008-11-17 19:25:33.000000000 +0100
+++ pysvn.new/distinfo	2009-03-15 12:42:23.000000000 +0100
@@ -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.6.3.tar.gz) = 41d312ff09b05f7b53d3641a82c64c93
+SHA256 (pysvn-1.6.3.tar.gz) = 85f514b98a5bc9e90c45e8d464940da20be3b2a43b7503fe3337863481918708
+SIZE (pysvn-1.6.3.tar.gz) = 310832
diff -ruN pysvn/files/patch-setup_configure.py pysvn.new/files/patch-setup_configure.py
--- pysvn/files/patch-setup_configure.py	1970-01-01 01:00:00.000000000 +0100
+++ pysvn.new/files/patch-setup_configure.py	2009-03-15 13:01:07.000000000 +0100
@@ -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()


>Release-Note:
>Audit-Trail:
>Unformatted: