From owner-svn-ports-branches@freebsd.org  Tue Jun  6 00:56:58 2017
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD5A6B7DEC2;
 Tue,  6 Jun 2017 00:56:58 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9B47E75137;
 Tue,  6 Jun 2017 00:56:58 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v560uvJp002720;
 Tue, 6 Jun 2017 00:56:57 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v560uvdv002718;
 Tue, 6 Jun 2017 00:56:57 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201706060056.v560uvdv002718@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 6 Jun 2017 00:56:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r442732 - in branches/2017Q2/Mk: . Uses
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2017 00:56:58 -0000

Author: bdrewery
Date: Tue Jun  6 00:56:57 2017
New Revision: 442732
URL: https://svnweb.freebsd.org/changeset/ports/442732

Log:
  MFH: r442729 r442730
  
  r442729:
          No quoting needed here.
  
  r442730:
          Don't pass the default version in DEPENDS_ARGS.
  
          This greatly simplifies handling for Poudriere.
  
  With hat:	portmgr
  Approved by:	portmgr (implicit)

Modified:
  branches/2017Q2/Mk/Uses/python.mk
  branches/2017Q2/Mk/bsd.ruby.mk
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/Mk/Uses/python.mk
==============================================================================
--- branches/2017Q2/Mk/Uses/python.mk	Tue Jun  6 00:47:24 2017	(r442731)
+++ branches/2017Q2/Mk/Uses/python.mk	Tue Jun  6 00:56:57 2017	(r442732)
@@ -377,7 +377,8 @@ IGNORE=		needs an unsupported version of Python
 # try to find a different one, if the passed version fits into
 # the supported version range.
 PYTHON_VERSION?=	python${_PYTHON_VERSION}
-.if !defined(PYTHON_NO_DEPENDS)
+.if !defined(PYTHON_NO_DEPENDS) && \
+    ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
 DEPENDS_ARGS+=		PYTHON_VERSION=${PYTHON_VERSION}
 .endif
 

Modified: branches/2017Q2/Mk/bsd.ruby.mk
==============================================================================
--- branches/2017Q2/Mk/bsd.ruby.mk	Tue Jun  6 00:47:24 2017	(r442731)
+++ branches/2017Q2/Mk/bsd.ruby.mk	Tue Jun  6 00:56:57 2017	(r442732)
@@ -267,7 +267,9 @@ RUBY_SHLIBVER?=		${RUBY_VER:S/.//}
 
 RUBY_CONFIGURE_ARGS+=	--program-prefix=""
 
-DEPENDS_ARGS+=		RUBY_VER="${RUBY_VER}"
+.if ${RUBY_VER} != ${RUBY_DEFAULT_VER}
+DEPENDS_ARGS+=		RUBY_VER=${RUBY_VER}
+.endif
 
 RUBY_CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"