From fc4ad9b856184ea523484d4af63e84fef8a96d8f Mon Sep 17 00:00:00 2001
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Mon, 15 Dec 2014 22:59:28 +0000
Subject: MFH: r374769

- update to 1.7.19

Changelog:
http://svn.apache.org/repos/asf/subversion/trunk/CHANGES

Security:	f5561ade-846c-11e4-b7a7-20cf30e32f6

Approved by:	portmgr (Xin Li)
---
 devel/subversion17/Makefile        | 8 ++++----
 devel/subversion17/Makefile.common | 2 +-
 devel/subversion17/distinfo        | 4 ++--
 devel/subversion17/pkg-plist       | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/devel/subversion17/Makefile b/devel/subversion17/Makefile
index 5af550ee8797..170353ba75bd 100644
--- a/devel/subversion17/Makefile
+++ b/devel/subversion17/Makefile
@@ -200,8 +200,8 @@ post-build:
 post-install:	${MKREPOS_TARGET}
 .if ${PORT_OPTIONS:MTOOLS}
 	@${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/*
+	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/*
 .endif
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' --exclude '*.bak' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
@@ -210,7 +210,7 @@ post-install:	${MKREPOS_TARGET}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
-	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve
+	${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve
 .endif
 
 .if ${PORT_OPTIONS:MMOD_DAV_SVN}
@@ -278,7 +278,7 @@ _mkrepos:	.USE
 .endif
 
 svn-build-outputs-hack:
-	(cd ${WRKSRC} && python2 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
+	(cd ${WRKSRC} && python2.7 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
 	${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
 
 .include <bsd.port.post.mk>
diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common
index d0c07efec32e..bc7a7a976f76 100644
--- a/devel/subversion17/Makefile.common
+++ b/devel/subversion17/Makefile.common
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.7.18
+PORTVERSION=	1.7.19
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
diff --git a/devel/subversion17/distinfo b/devel/subversion17/distinfo
index 4d6e242af120..cc4eb98b58ce 100644
--- a/devel/subversion17/distinfo
+++ b/devel/subversion17/distinfo
@@ -1,2 +1,2 @@
-SHA256 (subversion17/subversion-1.7.18.tar.bz2) = f67381ce62b69bdb373e4c38ff84576677316904753536a78630603cacc5d91a
-SIZE (subversion17/subversion-1.7.18.tar.bz2) = 6096031
+SHA256 (subversion17/subversion-1.7.19.tar.bz2) = 0059cd376ac6a14c80612ea99c4b0fed9dc2ff0ad05560d108a4c5625323cd5c
+SIZE (subversion17/subversion-1.7.19.tar.bz2) = 6094560
diff --git a/devel/subversion17/pkg-plist b/devel/subversion17/pkg-plist
index 09427d3b299b..c77c2b05b6ce 100644
--- a/devel/subversion17/pkg-plist
+++ b/devel/subversion17/pkg-plist
@@ -134,9 +134,9 @@ lib/libsvn_wc-1.a
 %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n authz_svn %D/%F
-%%MOD_DAV_SVN%%%%TOOLS%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf
-%%MOD_DAV_SVN%%%%TOOLS%%%%APACHEMODDIR%%/mod_dontdothat.so
-%%MOD_DAV_SVN%%%%TOOLS%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F
+%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf
+%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so
+%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F
 man/man1/svn.1.gz
 man/man1/svnadmin.1.gz
 man/man1/svndumpfilter.1.gz
-- 
cgit v1.2.3