From owner-svn-ports-all@FreeBSD.ORG  Thu Jan 30 00:41:27 2014
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 ESMTPS id E866FADF;
 Thu, 30 Jan 2014 00:41:27 +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 D49201D7D;
 Thu, 30 Jan 2014 00:41:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0U0fRLt032772;
 Thu, 30 Jan 2014 00:41:27 GMT (envelope-from lx@svn.freebsd.org)
Received: (from lx@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0U0fR3N032770;
 Thu, 30 Jan 2014 00:41:27 GMT (envelope-from lx@svn.freebsd.org)
Message-Id: <201401300041.s0U0fR3N032770@svn.freebsd.org>
From: David Thiel <lx@FreeBSD.org>
Date: Thu, 30 Jan 2014 00:41:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341796 - in head/security/nacl: . 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-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: Thu, 30 Jan 2014 00:41:28 -0000

Author: lx
Date: Thu Jan 30 00:41:27 2014
New Revision: 341796
URL: http://svnweb.freebsd.org/changeset/ports/341796
QAT: https://qat.redports.org/buildarchive/r341796/

Log:
  Fix build on 10, honor C/CXX, and fix issue with curvecp.
  
  Submitted by:	fallout and Tim Newsham

Added:
  head/security/nacl/files/patch-socket_udp.c   (contents, props changed)
Modified:
  head/security/nacl/Makefile

Modified: head/security/nacl/Makefile
==============================================================================
--- head/security/nacl/Makefile	Wed Jan 29 23:55:29 2014	(r341795)
+++ head/security/nacl/Makefile	Thu Jan 30 00:41:27 2014	(r341796)
@@ -26,6 +26,8 @@ HOSTNAME_CMD?=	/bin/hostname -s
 
 post-patch:
 	@${REINPLACE_CMD} -i -e "s/$$/ -fPIC/" ${WRKSRC}/okcompilers/c
+	@${REINPLACE_CMD} -i -e "s/gcc/${CC}/" ${WRKSRC}/okcompilers/c
+	@${REINPLACE_CMD} -i -e "s/c++/${CXX}/" ${WRKSRC}/okcompilers/cpp
 
 pre-build:
 	${RM} -rf ${WRKSRC}/crypto_onetimeauth/poly1305/amd64

Added: head/security/nacl/files/patch-socket_udp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/nacl/files/patch-socket_udp.c	Thu Jan 30 00:41:27 2014	(r341796)
@@ -0,0 +1,13 @@
+--- curvecp/socket_udp.c.orig	2014-01-29 15:34:07.000000000 -0800
++++ curvecp/socket_udp.c	2014-01-29 15:34:12.000000000 -0800
+@@ -6,6 +6,10 @@
+ #include "socket.h"
+ #include "blocking.h"
+ 
++#ifndef SOL_IP
++#define SOL_IP IPPROTO_IP  /* FreeBSD requires protocol number */
++#endif
++
+ static void enable_bsd_fragmentation(int fd)
+ {
+ #ifdef IP_DONTFRAG