From owner-svn-ports-head@FreeBSD.ORG  Sat Sep  8 08:50:28 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98052106564A;
	Sat,  8 Sep 2012 08:50:28 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 838568FC0A;
	Sat,  8 Sep 2012 08:50:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q888oSZ2054543;
	Sat, 8 Sep 2012 08:50:28 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q888oSo4054541;
	Sat, 8 Sep 2012 08:50:28 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201209080850.q888oSo4054541@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Sat, 8 Sep 2012 08:50:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303882 - head/devel/nspr
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Sep 2012 08:50:28 -0000

Author: flo
Date: Sat Sep  8 08:50:27 2012
New Revision: 303882
URL: http://svn.freebsd.org/changeset/ports/303882

Log:
  Fix mismerge.

Modified:
  head/devel/nspr/Makefile

Modified: head/devel/nspr/Makefile
==============================================================================
--- head/devel/nspr/Makefile	Sat Sep  8 08:35:29 2012	(r303881)
+++ head/devel/nspr/Makefile	Sat Sep  8 08:50:27 2012	(r303882)
@@ -31,6 +31,10 @@ LIBS=		libnspr4.so.1 libplc4.so.1 libpld
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "arm"
+BROKEN=		Does not compile on arm
+.endif
+
 .if !defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--disable-debug
 .endif