Index: head/security/nacl/Makefile
===================================================================
--- head/security/nacl/Makefile	(revision 429977)
+++ head/security/nacl/Makefile	(revision 429978)
@@ -1,52 +1,46 @@
 # Created by: David Thiel <lx@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nacl
 PORTVERSION=	20110221
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://hyperelliptic.org/nacl/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	High speed cryptography library
 
 LICENSE=	PD
 
 USES=		tar:bzip2
-ALL_TARGET=	do
 USE_BINUTILS=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-HOSTNAME_CMD?=	/bin/hostname -s
 MYARCH=		${ARCH:S/i386/x86/}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|$$| -fPIC|" ${WRKSRC}/okcompilers/c
 	@${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/okcompilers/c
 	@${REINPLACE_CMD} -e "s|g++|${CXX}|" ${WRKSRC}/okcompilers/cpp
 
 pre-build:
 	${RM} -r ${WRKSRC}/crypto_onetimeauth/poly1305/amd64
+	${PRINTF} "%s\n\t%s\n" "all:" "${SH} ./do" > ${WRKSRC}/Makefile
 
-do-build:
-	cd ${WRKSRC} && ./do
-
-.include <bsd.port.pre.mk>
-
 post-build:
-	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${MYARCH}/libnacl.a \
-		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${MYARCH}/randombytes.o
+	${AR} -r ${WRKSRC}/build/HOSTNAME/lib/${MYARCH}/libnacl.a \
+	    ${WRKSRC}/build/HOSTNAME/lib/${MYARCH}/randombytes.o
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha256 \
-		${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha512 \
-		${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${MYARCH}/* \
-		${STAGEDIR}${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/${MYARCH}/* \
-		${STAGEDIR}${PREFIX}/include
+	${INSTALL_PROGRAM} ${WRKSRC}/build/HOSTNAME/bin/nacl-sha256 \
+	    ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/build/HOSTNAME/bin/nacl-sha512 \
+	    ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/build/HOSTNAME/lib/${MYARCH}/* \
+	    ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/build/HOSTNAME/include/${MYARCH}/* \
+	    ${STAGEDIR}${PREFIX}/include
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/security/nacl/files/patch-socket_udp.c
===================================================================
--- head/security/nacl/files/patch-socket_udp.c	(revision 429977)
+++ head/security/nacl/files/patch-socket_udp.c	(nonexistent)
@@ -1,13 +0,0 @@
---- 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

Property changes on: head/security/nacl/files/patch-socket_udp.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/nacl/files/patch-curvecp_socket__udp.c
===================================================================
--- head/security/nacl/files/patch-curvecp_socket__udp.c	(nonexistent)
+++ head/security/nacl/files/patch-curvecp_socket__udp.c	(revision 429978)
@@ -0,0 +1,13 @@
+--- curvecp/socket_udp.c.orig	2011-02-21 01:49:34 UTC
++++ curvecp/socket_udp.c
+@@ -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

Property changes on: head/security/nacl/files/patch-curvecp_socket__udp.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/security/nacl/files/patch-do
===================================================================
--- head/security/nacl/files/patch-do	(revision 429977)
+++ head/security/nacl/files/patch-do	(revision 429978)
@@ -1,22 +1,22 @@
---- do.orig	2011-02-20 17:49:34.000000000 -0800
-+++ do	2012-03-20 16:49:10.324256193 -0700
+--- do.orig	2011-02-21 01:49:34 UTC
++++ do
 @@ -6,7 +6,7 @@
  
  version=`cat version`
  project=nacl
 -shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`
-+shorthostname=`hostname -s`
++shorthostname=HOSTNAME
  
  top="`pwd`/build/$shorthostname"
  bin="$top/bin"
-@@ -38,8 +38,8 @@
+@@ -38,8 +38,8 @@ mkdir -p "$bin"
  mkdir -p "$lib"
  mkdir -p "$include"
  
 -exec >"$top/log"
 -exec 2>&1
 +#exec >"$top/log"
 +#exec 2>&1
  exec 5>"$top/data"
  exec </dev/null
  
Index: head/security/nacl/pkg-descr
===================================================================
--- head/security/nacl/pkg-descr	(revision 429977)
+++ head/security/nacl/pkg-descr	(revision 429978)
@@ -1,10 +1,10 @@
 NaCl (pronounced "salt") is a new easy-to-use high-speed software
 library for network communication, encryption, decryption, signatures,
 etc. NaCl's goal is to provide all of the core operations needed to
 build higher-level cryptographic tools.
 
 Of course, other libraries already exist for these core operations.
 NaCl advances the state of the art by improving security, by improving
 usability, and by improving speed.
 
-WWW: http://nacl.cace-project.eu/
+WWW: https://nacl.cr.yp.to/