Update pysvn to v1.9.15.

Upstream does not provide a CHangeLog, but it's been six years.

5 files changed, 103 insertions, 37 deletions

diff --git a/devel/py-pysvn/Makefile b/devel/py-pysvn/Makefile
index b5a9652ac3b..06486b5f4ff 100644
--- a/devel/py-pysvn/Makefile
+++ b/devel/py-pysvn/Makefile
@@ -1,30 +1,53 @@
-# $NetBSD: Makefile,v 1.46 2021/04/21 11:41:30 adam Exp $
+# $NetBSD: Makefile,v 1.47 2021/09/30 16:15:10 hauke Exp $
 #
 
-VERS=		1.7.6
+VERS=		1.9.15
 DISTNAME=	pysvn-${VERS}
 PKGNAME=	${PYPKGPREFIX}-pysvn-${VERS}
-PKGREVISION=	25
 CATEGORIES=	devel
-MASTER_SITES=	http://pysvn.barrys-emacs.org/source_kits/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pysvn/}
 
 MAINTAINER=		helgoman@users.sourceforge.net
-HOMEPAGE=		http://pysvn.tigris.org/
+HOMEPAGE=		https://pysvn.sourceforge.io/
 COMMENT=		Python interface to Subversion
 LICENSE=		apache-1.1
 
-DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+USE_LANGUAGES=		c c++
 
-USE_LANGUAGES=		c
+WRKSRC=			${WRKDIR}/${DISTNAME}/Source
 
 BUILDLINK_TRANSFORM.DragonFly+=	rm:-lresolv
 
-SUBST_CLASSES+=		rpath-flg
-SUBST_STAGE.rpath-flg=	pre-configure
-SUBST_FILES.rpath-flg=	Source/setup_configure.py
-SUBST_SED.rpath-flg=	-e 's|-Wl,--rpath|${COMPILER_RPATH_FLAG}|g'
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_FILES.path=	setup_configure.py
+SUBST_VARS.path+=	PREFIX
+
+PYSETUPCONFIGARGS=	--verbose --pycxx-dir="../Import/pycxx-7.1.5"
+PYLIBVER=		${PYVERSSUFFIX:S/./_/g}
+
+INSTALLATION_DIRS+=	${PYSITELIB}/pysvn
+
+PRINT_PLIST_AWK+=	{ gsub(/${PYLIBVER}\.so/, "$${PYLIBVER}.so"); }
+
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB:Q}
+PLIST_SUBST+=		PYLIBVER=${PYLIBVER:Q}
+
+do-configure:
+	${RUN} \
+	cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} \
+	${PYTHONBIN} setup.py configure ${PYSETUPCONFIGARGS}
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/pysvn/__init__.py \
+		${DESTDIR}${PREFIX}/${PYSITELIB}/pysvn/__init__.py
+	${INSTALL_LIB} ${WRKSRC}/pysvn/_pysvn_${PYLIBVER}.so \
+		${DESTDIR}${PREFIX}/${PYSITELIB}/pysvn/_pysvn_${PYLIBVER}.so
 
 .include "../../devel/subversion-base/buildlink3.mk"
-.include "../../lang/python/egg.mk"
+.include "../../www/neon/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-pysvn/PLIST b/devel/py-pysvn/PLIST
index b22ba0bc66f..670d6adf677 100644
--- a/devel/py-pysvn/PLIST
+++ b/devel/py-pysvn/PLIST
@@ -1,6 +1,3 @@
-@comment $NetBSD: PLIST,v 1.4 2013/03/28 21:22:57 joerg Exp $
-${PYSITELIB}/_pysvn.so
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.5 2021/09/30 16:15:10 hauke Exp $
+${PYSITELIB}/pysvn/__init__.py
+${PYSITELIB}/pysvn/_pysvn_${PYLIBVER}.so
diff --git a/devel/py-pysvn/distinfo b/devel/py-pysvn/distinfo
index 3b8dff08b53..f0803431dd9 100644
--- a/devel/py-pysvn/distinfo
+++ b/devel/py-pysvn/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:29:15 agc Exp $
+$NetBSD: distinfo,v 1.7 2021/09/30 16:15:10 hauke Exp $
 
-SHA1 (pysvn-1.7.6.tar.gz) = 720399815278a0b29a2ea87a09a0d2807d4614e4
-RMD160 (pysvn-1.7.6.tar.gz) = f6b44e293ec4a94cd610cb8e1f2b711c1aad5aee
-SHA512 (pysvn-1.7.6.tar.gz) = 21c78521d34167ebb751c832ed2cc954f1afa1941caf073f1d3cca2d487dceffbf81feaf0761ed3a9fd94e7289d81228b54f556019b9851386bdbf7577320ed2
-Size (pysvn-1.7.6.tar.gz) = 331549 bytes
-SHA1 (patch-Source_pysvn__client__cmd__checkin.cpp) = d4a6ab9709fea7728519fa3a34044bf93ef24bd2
+SHA1 (pysvn-1.9.15.tar.gz) = f10c81564d43fa5363ef5354a67bd5336faa633d
+RMD160 (pysvn-1.9.15.tar.gz) = 11086a08131edba961e0a2416c8227d1ac0a1bbe
+SHA512 (pysvn-1.9.15.tar.gz) = 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
+Size (pysvn-1.9.15.tar.gz) = 667161 bytes
+SHA1 (patch-setup__configure.py) = 51265c394958ae67457f0b5347cd33b706f84d26
diff --git a/devel/py-pysvn/patches/patch-Source_pysvn__client__cmd__checkin.cpp b/devel/py-pysvn/patches/patch-Source_pysvn__client__cmd__checkin.cpp
deleted file mode 100644
index 9324f6bbbbf..00000000000
--- a/devel/py-pysvn/patches/patch-Source_pysvn__client__cmd__checkin.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_pysvn__client__cmd__checkin.cpp,v 1.1 2012/11/16 00:43:11 joerg Exp $
-
---- Source/pysvn_client_cmd_checkin.cpp.orig	2012-11-15 14:44:17.000000000 +0000
-+++ Source/pysvn_client_cmd_checkin.cpp
-@@ -208,7 +208,7 @@ Py::Object pysvn_client::cmd_checkout( c
- 
-         PythonAllowThreads permission( m_context );
- 
--        svn_revnum_t revnum = 0;
-+        revnum = 0;
- 
- #if defined( PYSVN_HAS_CLIENT_CHECKOUT3 )
-         svn_error_t *error = svn_client_checkout3
diff --git a/devel/py-pysvn/patches/patch-setup__configure.py b/devel/py-pysvn/patches/patch-setup__configure.py
new file mode 100644
index 00000000000..440c9eb9563
--- /dev/null
+++ b/devel/py-pysvn/patches/patch-setup__configure.py
@@ -0,0 +1,59 @@
+$NetBSD: patch-setup__configure.py,v 1.1 2021/09/30 16:15:10 hauke Exp $
+
+Add support for NetBSD toolchain.
+
+--- setup_configure.py.orig	2021-09-29 20:38:06.063225727 +0000
++++ setup_configure.py
+@@ -184,6 +184,9 @@ class Setup:
+             elif sys.platform.startswith('freebsd'):
+                 self.platform = 'freebsd'
+ 
++            elif sys.platform.startswith('netbsd'):
++                self.platform = 'netbsd'
++
+             elif sys.platform == 'cygwin':
+                 self.platform = 'cygwin'
+ 
+@@ -214,6 +217,10 @@ class Setup:
+             self.c_utils = FreeBsdCompilerGCC( self )
+             self.c_pysvn = FreeBsdCompilerGCC( self )
+ 
++        elif self.platform == 'netbsd':
++            self.c_utils = NetBsdCompilerGCC( self )
++            self.c_pysvn = NetBsdCompilerGCC( self )
++
+         elif self.platform == 'cygwin':
+             self.c_utils = CygwinCompilerGCC( self )
+             self.c_pysvn = CygwinCompilerGCC( self )
+@@ -1348,6 +1355,31 @@ class FreeBsdCompilerGCC(UnixCompilerGCC
+                 ] )
+         return py_ld_libs
+ 
++class NetBsdCompilerGCC(UnixCompilerGCC):
++    def __init__( self, setup ):
++        UnixCompilerGCC.__init__( self, setup )
++
++    def _getLdLibs( self ):
++        py_ld_libs = [
++                '-L%(SVN_LIB)s',
++                '-L%(APR_LIB)s',
++                '-Wl,-R',
++                '-Wl,@PREFIX@/lib',
++                '-lsvn_client-1',
++                '-lsvn_diff-1',
++                '-lsvn_repos-1',
++                ]
++
++        if os.path.exists( '/usr/lib/libkrb5.so' ):
++            py_ld_libs.append( '-lkrb5' )
++
++        py_ld_libs.extend( [
++                '-lcom_err',
++                '-lexpat',
++                '-lneon',
++                ] )
++        return py_ld_libs
++
+ class CygwinCompilerGCC(UnixCompilerGCC):
+     def __init__( self, setup ):
+         UnixCompilerGCC.__init__( self, setup )