From owner-svn-ports-head@FreeBSD.ORG Tue Feb 25 17:34:51 2014 Return-Path: Delivered-To: svn-ports-head@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 ECAC4B26; Tue, 25 Feb 2014 17:34:50 +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 CCCC212B3; Tue, 25 Feb 2014 17:34:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PHYowO026443; Tue, 25 Feb 2014 17:34:50 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PHYo1r026440; Tue, 25 Feb 2014 17:34:50 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201402251734.s1PHYo1r026440@svn.freebsd.org> From: Thierry Thomas Date: Tue, 25 Feb 2014 17:34:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346052 - in head/net-im/tox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 17:34:51 -0000 Author: thierry Date: Tue Feb 25 17:34:49 2014 New Revision: 346052 URL: http://svnweb.freebsd.org/changeset/ports/346052 QAT: https://qat.redports.org/buildarchive/r346052/ Log: Adding a option to allow the replacement of the cryptographic library sodium by NaCl. Do not bump PORTREVISION, because this does not affect the default. Added: head/net-im/tox/files/patch-libtoxcore.pc.in (contents, props changed) head/net-im/tox/pkg-message (contents, props changed) Modified: head/net-im/tox/Makefile Modified: head/net-im/tox/Makefile ============================================================================== --- head/net-im/tox/Makefile Tue Feb 25 17:29:51 2014 (r346051) +++ head/net-im/tox/Makefile Tue Feb 25 17:34:49 2014 (r346052) @@ -11,8 +11,7 @@ COMMENT= ProjectTox-Core library, a dece LICENSE= GPLv3 BUILD_DEPENDS= checkmk:${PORTSDIR}/devel/libcheck -LIB_DEPENDS= libsodium.so:${PORTSDIR}/security/libsodium \ - libvpx.so:${PORTSDIR}/multimedia/libvpx \ +LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx \ libopus.so:${PORTSDIR}/audio/opus USE_GITHUB= yes @@ -25,8 +24,10 @@ USE_AUTOTOOLS= automake autoconf libtool USES= pkgconfig USE_LDCONFIG= yes -OPTIONS_DEFINE= PHONE -OPTIONS_DEFAULT=PHONE +OPTIONS_RADIO= CRYPTO +OPTIONS_RADIO_CRYPTO= SODIUM NACL +OPTIONS_DEFINE= PHONE +OPTIONS_DEFAULT= PHONE SODIUM PHONE_DESC= Enable phone test PHONE_CONFIGURE_ENABLE= phone @@ -35,7 +36,17 @@ PHONE_LIB_DEPENDS= libopenal.so:${PORTSD libswscale.so:${PORTSDIR}/multimedia/ffmpeg PHONE_USE= SDL=sdl +SODIUM_DESC= Prefer libsodium +SODIUM_LIB_DEPENDS= libsodium.so:${PORTSDIR}/security/libsodium + +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 + pre-configure: + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac cd ${WRKSRC} && ./autogen.sh .include Added: head/net-im/tox/files/patch-libtoxcore.pc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/tox/files/patch-libtoxcore.pc.in Tue Feb 25 17:34:49 2014 (r346052) @@ -0,0 +1,10 @@ +--- libtoxcore.pc.in.orig 2014-02-22 23:52:26.000000000 +0100 ++++ libtoxcore.pc.in 2014-02-25 09:32:35.000000000 +0100 +@@ -7,6 +7,6 @@ + Description: Tox protocol library + Requires: + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ltoxcore @LIBS@ ++Libs: -L${libdir} -ltoxcore @NACL_LIBS@ @LIBS@ + Cflags: -I${includedir} + Added: head/net-im/tox/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/tox/pkg-message Tue Feb 25 17:34:49 2014 (r346052) @@ -0,0 +1,2 @@ +Warning: due to NaCl weirdness, if you switch your config from libsodium +to libnacl, you will have to rebuild the consumers of libtoxcore.