From owner-svn-ports-head@freebsd.org Fri Dec 30 13:09:30 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECB4CC971A3; Fri, 30 Dec 2016 13:09:30 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB15912B4; Fri, 30 Dec 2016 13:09:30 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBUD9Tfp093478; Fri, 30 Dec 2016 13:09:29 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBUD9T67093474; Fri, 30 Dec 2016 13:09:29 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201612301309.uBUD9T67093474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Fri, 30 Dec 2016 13:09:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429978 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 30 Dec 2016 13:09:31 -0000 Author: hrs Date: Fri Dec 30 13:09:29 2016 New Revision: 429978 URL: https://svnweb.freebsd.org/changeset/ports/429978 Log: - Remove unnecessary `hostname -s`. - Update WWW: in pkg-descr. - Style clean-ups. Added: head/security/nacl/files/patch-curvecp_socket__udp.c - copied, changed from r429977, head/security/nacl/files/patch-socket_udp.c Deleted: head/security/nacl/files/patch-socket_udp.c Modified: head/security/nacl/Makefile head/security/nacl/files/patch-do head/security/nacl/pkg-descr Modified: head/security/nacl/Makefile ============================================================================== --- head/security/nacl/Makefile Fri Dec 30 12:54:37 2016 (r429977) +++ head/security/nacl/Makefile Fri Dec 30 13:09:29 2016 (r429978) @@ -7,19 +7,17 @@ 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: @@ -29,24 +27,20 @@ post-patch: pre-build: ${RM} -r ${WRKSRC}/crypto_onetimeauth/poly1305/amd64 - -do-build: - cd ${WRKSRC} && ./do - -.include + ${PRINTF} "%s\n\t%s\n" "all:" "${SH} ./do" > ${WRKSRC}/Makefile 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 +.include Copied and modified: head/security/nacl/files/patch-curvecp_socket__udp.c (from r429977, head/security/nacl/files/patch-socket_udp.c) ============================================================================== --- head/security/nacl/files/patch-socket_udp.c Fri Dec 30 12:54:37 2016 (r429977, copy source) +++ head/security/nacl/files/patch-curvecp_socket__udp.c Fri Dec 30 13:09:29 2016 (r429978) @@ -1,5 +1,5 @@ ---- 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 +--- 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" Modified: head/security/nacl/files/patch-do ============================================================================== --- head/security/nacl/files/patch-do Fri Dec 30 12:54:37 2016 (r429977) +++ head/security/nacl/files/patch-do Fri Dec 30 13:09:29 2016 (r429978) @@ -1,15 +1,15 @@ ---- 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" Modified: head/security/nacl/pkg-descr ============================================================================== --- head/security/nacl/pkg-descr Fri Dec 30 12:54:37 2016 (r429977) +++ head/security/nacl/pkg-descr Fri Dec 30 13:09:29 2016 (r429978) @@ -7,4 +7,4 @@ Of course, other libraries already exist 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/