From owner-svn-ports-all@FreeBSD.ORG Sun May 25 13:39:16 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B85AA892; Sun, 25 May 2014 13:39:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A628620F4; Sun, 25 May 2014 13:39:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PDdGkh062542; Sun, 25 May 2014 13:39:16 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4PDdG3q062541; Sun, 25 May 2014 13:39:16 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201405251339.s4PDdG3q062541@svn.freebsd.org> From: Mathieu Arnold Date: Sun, 25 May 2014 13:39:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355244 - 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.18 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: Sun, 25 May 2014 13:39:16 -0000 Author: mat Date: Sun May 25 13:39:16 2014 New Revision: 355244 URL: http://svnweb.freebsd.org/changeset/ports/355244 QAT: https://qat.redports.org/buildarchive/r355244/ Log: If using WRKDIRPREFIX, the licenses path will be made unusable. With hat: portmgr Sponsored by: Absolight Modified: head/Mk/bsd.licenses.mk Modified: head/Mk/bsd.licenses.mk ============================================================================== --- head/Mk/bsd.licenses.mk Sun May 25 13:24:36 2014 (r355243) +++ head/Mk/bsd.licenses.mk Sun May 25 13:39:16 2014 (r355244) @@ -683,7 +683,11 @@ ${_LICENSE_COOKIE}: @${ECHO_MSG} . if ${_LICENSE_COMB} != "single" . for lic in ${_LICENSE_TO_ASK} +. if defined(WRKDIRPREFIX) + @${ECHO_MSG} "- ${lic} (${_LICENSE_NAME_${lic}}), available at ${_LICENSE_FILE_${lic}}" +. else @${ECHO_MSG} "- ${lic} (${_LICENSE_NAME_${lic}}), available at ${_LICENSE_FILE_${lic}:S/${WRKDIR}\//${WRKDIR:T}\//}" +. endif . endfor @${ECHO_MSG} . endif