Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Dec 2014 14:56:33 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r375684 - head/ports-mgmt/portshaker
Message-ID:  <201412271456.sBREuXVr027087@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Sat Dec 27 14:56:32 2014
New Revision: 375684
URL: https://svnweb.freebsd.org/changeset/ports/375684
QAT: https://qat.redports.org/buildarchive/r375684/

Log:
  ports-mgmt/portshaker: Support Subversion 1.7 or 1.8 depending on make.conf
  
  Currently building portshaker package on a clean system will install
  subversion 1.8 even if 1.7 is defined in make.conf with
  WITH_SUBVERSION_VER=17.
  
  Patch fixes this and will use either 1.7 or 1.8 as required for the
  run dependency.
  
  PR:		195740
  Submitted by:	simon.wright@gmx.net
  Approved by:	romain (maintainer timeout)

Modified:
  head/ports-mgmt/portshaker/Makefile

Modified: head/ports-mgmt/portshaker/Makefile
==============================================================================
--- head/ports-mgmt/portshaker/Makefile	Sat Dec 27 14:52:35 2014	(r375683)
+++ head/ports-mgmt/portshaker/Makefile	Sat Dec 27 14:56:32 2014	(r375684)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	portshaker
 PORTVERSION=	1.0.10
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	ports-mgmt
 DISTNAME=	portshaker-${PORTVERSION}
 
@@ -24,7 +24,11 @@ RSYNC_DESC=	rsync support
 GIT_DESC=	git support
 HG_DESC=	mercurial support
 RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
-SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
+SVN_RUN_DEPENDS=        svn:${PORTSDIR}/devel/subversion17
+.else
+SVN_RUN_DEPENDS=        svn:${PORTSDIR}/devel/subversion
+.endif
 GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
 HG_RUN_DEPENDS=		hg:${PORTSDIR}/devel/mercurial
 .else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412271456.sBREuXVr027087>