From owner-svn-ports-all@FreeBSD.ORG  Tue Feb 25 20:16:30 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0C900ED2;
 Tue, 25 Feb 2014 20:16:30 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id ED673144B;
 Tue, 25 Feb 2014 20:16:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PKGToU096013;
 Tue, 25 Feb 2014 20:16:29 GMT (envelope-from thierry@svn.freebsd.org)
Received: (from thierry@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PKGTtQ096012;
 Tue, 25 Feb 2014 20:16:29 GMT (envelope-from thierry@svn.freebsd.org)
Message-Id: <201402252016.s1PKGTtQ096012@svn.freebsd.org>
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Tue, 25 Feb 2014 20:16:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r346071 - head/net-im/tox
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.17
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: Tue, 25 Feb 2014 20:16:30 -0000

Author: thierry
Date: Tue Feb 25 20:16:29 2014
New Revision: 346071
URL: http://svnweb.freebsd.org/changeset/ports/346071
QAT: https://qat.redports.org/buildarchive/r346071/

Log:
  Fix configure for default case.
  
  ${opt}_CONFIGURE_WITH does not work as I expected...

Modified:
  head/net-im/tox/Makefile

Modified: head/net-im/tox/Makefile
==============================================================================
--- head/net-im/tox/Makefile	Tue Feb 25 20:11:12 2014	(r346070)
+++ head/net-im/tox/Makefile	Tue Feb 25 20:16:29 2014	(r346071)
@@ -41,10 +41,15 @@ SODIUM_LIB_DEPENDS=	libsodium.so:${PORTS
 
 NACL_DESC=		Prefer NaCl
 NACL_CONFIGURE_ENABLE=	nacl
-NACL_CONFIGURE_WITH=	nacl-libs=${LOCALBASE}/lib
 NACL_BUILD_DEPENDS=	${LOCALBASE}/lib/libnacl.a:${PORTSDIR}/security/nacl
 NACL_RUN_DEPENDS=	${LOCALBASE}/lib/libnacl.a:${PORTSDIR}/security/nacl
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNACL}
+CONFIGURE_ARGS+=	--with-nacl-libs=${LOCALBASE}/lib
+.endif
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 	cd ${WRKSRC} && ./autogen.sh