From owner-svn-ports-all@FreeBSD.ORG  Wed Feb 20 21:12:06 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B21D891B;
 Wed, 20 Feb 2013 21:12:06 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9921274A;
 Wed, 20 Feb 2013 21:12:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1KLC6J4032083;
 Wed, 20 Feb 2013 21:12:06 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1KLC65L032082;
 Wed, 20 Feb 2013 21:12:06 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201302202112.r1KLC65L032082@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Wed, 20 Feb 2013 21:12:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312675 - head/security/nss
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: Wed, 20 Feb 2013 21:12:06 -0000

Author: flo
Date: Wed Feb 20 21:12:06 2013
New Revision: 312675
URL: http://svnweb.freebsd.org/changeset/ports/312675

Log:
  The files we are looking for are also in ${LOCALBASE}/bin, this should
  help people that installed binutils on an older version of FreeBSD
  and upgraded base in the meantime.
  
  e.g. Install binutils on 9.0 they got installed in
  
  ${LOCALBASE}/x86_64-portbld-freebsd9.0
  
  after upgrading to 9.1 the nss port would look in
  
  ${LOCALBASE}/x86_64-portbld-freebsd9.1
  
  and not find the tools its looking for, falling back to the tools from base
  that don't support all the instructions the nss ports needs.
  
  Avoid all this by using ${LOCALBASE}/bin

Modified:
  head/security/nss/Makefile

Modified: head/security/nss/Makefile
==============================================================================
--- head/security/nss/Makefile	Wed Feb 20 21:01:57 2013	(r312674)
+++ head/security/nss/Makefile	Wed Feb 20 21:12:06 2013	(r312675)
@@ -54,7 +54,7 @@ BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 
 .if ${ARCH} == amd64
 USE_BINUTILS=	# intel-gcm.s
-CFLAGS+=	-B${LOCALBASE}/${CONFIGURE_TARGET:S/amd64/x86_64/}/bin
+CFLAGS+=	-B${LOCALBASE}/bin
 .if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023
 EXTRA_PATCHES+=	${FILESDIR}/extra-bug835050
 .endif