From owner-svn-ports-all@FreeBSD.ORG  Sun Jul 28 16:58:31 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 ESMTP id 9BE61BD8;
 Sun, 28 Jul 2013 16:58:31 +0000 (UTC)
 (envelope-from kientzle@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 889E22209;
 Sun, 28 Jul 2013 16:58:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6SGwVcb023740;
 Sun, 28 Jul 2013 16:58:31 GMT
 (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6SGwV28023739;
 Sun, 28 Jul 2013 16:58:31 GMT
 (envelope-from kientzle@svn.freebsd.org)
Message-Id: <201307281658.r6SGwV28023739@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sun, 28 Jul 2013 16:58:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323839 - head/devel/cross-gcc
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jul 2013 16:58:31 -0000

Author: kientzle (src committer)
Date: Sun Jul 28 16:58:31 2013
New Revision: 323839
URL: http://svnweb.freebsd.org/changeset/ports/323839

Log:
  PACKAGE_BUILDING isn't really the right condition here;
  what we use as the binutils really depends on whether this
  is being used as a master port or as a standalone port.

Modified:
  head/devel/cross-gcc/Makefile

Modified: head/devel/cross-gcc/Makefile
==============================================================================
--- head/devel/cross-gcc/Makefile	Sun Jul 28 16:51:54 2013	(r323838)
+++ head/devel/cross-gcc/Makefile	Sun Jul 28 16:58:31 2013	(r323839)
@@ -22,18 +22,10 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 		mpfr.4:${PORTSDIR}/math/mpfr \
 		mpc.2:${PORTSDIR}/math/mpc
 
-#
-# Temporary hack to deal with dependencies during package builds for
-# slave ports.
-#
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/${OURTARGET}-binutils
-RUN_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/${OURTARGET}-binutils
-BROKEN=		plist build broken with tinderbox/cluster
-.else
-BUILD_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
-RUN_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
-.endif
+# If using this as a master port, override BUILD_DEPENDS and
+# RUN_DEPENDS with the appropriate specific binutils port.
+BUILD_DEPENDS?=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
+RUN_DEPENDS?=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes