From 0d72ea96618b657d9b8a4d40215927394f3e4868 Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Thu, 19 Jan 2017 19:26:44 +0000
Subject: [PATCH] Update to 1.9.3

- While I'm here:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Add missing LIB_DEPENDS
  - Use WRKSRC_SUBDIR
  - Simplify regex
  - Use MAKE_CMD
  - Merge pre-install: into do-install:

PR:		216192
Submitted by:	Attila Nagy <bra@fsn.hu> (maintainer)
---
 devel/pysvn/Makefile | 24 +++++++++++++-----------
 devel/pysvn/distinfo |  5 +++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index 5a123ae4111e..0122139a011c 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -2,42 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	pysvn
-PORTVERSION=	1.8.0
+PORTVERSION=	1.9.3
 CATEGORIES=	devel
 MASTER_SITES=	http://pysvn.barrys-emacs.org/source_kits/
 
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Python binding for Subversion
 
-LICENSE=	APACHE20
+LICENSE=	APACHE11
+LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 LIB_DEPENDS=	libsvn_client-1.so:devel/subversion \
-		libneon.so:www/neon
+		libneon.so:www/neon \
+		libexpat.so:textproc/expat2
 
 # Python3 ready
 USES=		python
 USE_PYTHON=	distutils noegginfo
 PYDISTUTILS_CONFIGURE_TARGET=	configure
 PYDISTUTILS_CONFIGUREARGS=	--apr-inc-dir=${LOCALBASE}/include/apr-1 \
-				--svn-root-dir=${LOCALBASE}
+				--svn-inc-dir=${LOCALBASE}/include/subversion-1 \
+				--pycxx-dir=${WRKSRC}/../Import/pycxx-6.2.8 \
+				--pycxx-src-dir=${WRKSRC}/../Import/pycxx-6.2.8/Src
 
 PLIST_SUB=	PYTHONVER=${PYTHON_VERSION:S/./_/:S/python//}
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PORTNAME}/__init__.py \
 		%%PYTHON_SITELIBDIR%%/${PORTNAME}/_pysvn_%%PYTHONVER%%.so
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Source
+WRKSRC_SUBDIR=	Source
 
 post-patch:
-	${REINPLACE_CMD} -e "s,gcc,${CC},g" -e "s,g++,${CXX},g" ${WRKSRC}/setup_configure.py
+	${REINPLACE_CMD} -e 's|^min_pycxx_version =|pycxx_version = &|g; s|gcc|${CC}|g; s|g++|${CXX}|g'  ${WRKSRC}/setup_configure.py
 
 do-build:
-	@cd ${WRKSRC} && ${MAKE}
-
-pre-install:
-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
+	@cd ${WRKSRC} && ${MAKE_CMD}
 
 do-install:
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/${PORTNAME}/*.py \
 		${WRKSRC}/${PORTNAME}/*.so \
diff --git a/devel/pysvn/distinfo b/devel/pysvn/distinfo
index 6fbf2cd10b48..9cf5fc944ad5 100644
--- a/devel/pysvn/distinfo
+++ b/devel/pysvn/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pysvn-1.8.0.tar.gz) = 39596f4884ed689cdb5a4e210e421724302a566c7ba756cc4d46bbfeb0c8326b
-SIZE (pysvn-1.8.0.tar.gz) = 366583
+TIMESTAMP = 1484677099
+SHA256 (pysvn-1.9.3.tar.gz) = 7c8fe4fba5bee93e87bc8dc9d70cc469038dc5c7ce0a458f214a4f0c20c94988
+SIZE (pysvn-1.9.3.tar.gz) = 405760