From owner-svn-ports-all@freebsd.org Tue Oct 20 20:27:00 2015 Return-Path: Delivered-To: svn-ports-all@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 A9509A0A496; Tue, 20 Oct 2015 20:27:00 +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 76AE68E9; Tue, 20 Oct 2015 20:27:00 +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 t9KKQxHN060721; Tue, 20 Oct 2015 20:26:59 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9KKQxg4060720; Tue, 20 Oct 2015 20:26:59 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201510202026.t9KKQxg4060720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 20 Oct 2015 20:26:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399879 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Oct 2015 20:27:00 -0000 Author: bdrewery Date: Tue Oct 20 20:26:59 2015 New Revision: 399879 URL: https://svnweb.freebsd.org/changeset/ports/399879 Log: Rework change in r399791 for default perl to not execute it on 'make clean' if perl is not installed. With hat: portmgr Modified: head/Mk/bsd.default-versions.mk Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Tue Oct 20 20:21:39 2015 (r399878) +++ head/Mk/bsd.default-versions.mk Tue Oct 20 20:26:59 2015 (r399879) @@ -23,8 +23,8 @@ FPC_DEFAULT?= 2.6.4 GCC_DEFAULT?= 4.8 LUA_DEFAULT?= 5.2 MYSQL_DEFAULT?= 5.6 -.if !defined(_PORTS_ENV_CHECK) && \ - (defined(PACKAGE_BUILDING) || !exists(${LOCALBASE}/bin/perl)) +.if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ + defined(PACKAGE_BUILDING)) PERL5_DEFAULT?= 5.20 .elif !defined(PERL5_DEFAULT) # There's no need to replace development versions, like "5.23" with "devel"