From owner-svn-ports-head@FreeBSD.ORG  Tue Feb 26 23:59:26 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4FE8541F;
 Tue, 26 Feb 2013 23:59:26 +0000 (UTC) (envelope-from lx@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 340A6A2A;
 Tue, 26 Feb 2013 23:59:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1QNxQoq015886;
 Tue, 26 Feb 2013 23:59:26 GMT (envelope-from lx@svn.freebsd.org)
Received: (from lx@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1QNxQ24015885;
 Tue, 26 Feb 2013 23:59:26 GMT (envelope-from lx@svn.freebsd.org)
Message-Id: <201302262359.r1QNxQ24015885@svn.freebsd.org>
From: David Thiel <lx@FreeBSD.org>
Date: Tue, 26 Feb 2013 23:59:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313014 - head/security/nacl
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Feb 2013 23:59:26 -0000

Author: lx
Date: Tue Feb 26 23:59:25 2013
New Revision: 313014
URL: http://svnweb.freebsd.org/changeset/ports/313014

Log:
  - Add randombytes.o to the libnacl.a archive
  - Add -fPIC
  
  PR:	ports/175820
  Submitted by:	Gasol Wu

Modified:
  head/security/nacl/Makefile

Modified: head/security/nacl/Makefile
==============================================================================
--- head/security/nacl/Makefile	Tue Feb 26 23:52:39 2013	(r313013)
+++ head/security/nacl/Makefile	Tue Feb 26 23:59:25 2013	(r313014)
@@ -1,12 +1,10 @@
-# New ports collection makefile for:	nacl
-# Date created:		2011-10-03
-# Whom:			David Thiel <lx@FreeBSD.org>
-#
+# Created by: David Thiel <lx@FreeBSD.org>
 # $FreeBSD$
 #
 
 PORTNAME=	nacl
 PORTVERSION=	20110221
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://hyperelliptic.org/nacl/
 
@@ -14,8 +12,9 @@ MAINTAINER=	lx@FreeBSD.org
 COMMENT=	High speed cryptography library
 
 ALL_TARGET=	do
-USE_BZIP2=	YES
-MAKE_JOBS_UNSAFE=	YES
+USE_BZIP2=	yes
+USE_BINUTILS=	yes
+MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -23,30 +22,48 @@ MAKE_JOBS_UNSAFE=	YES
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
-HOSTNAME_CMD?=	/bin/hostname
+HOSTNAME_CMD?=	/bin/hostname -s
+
+post-patch:
+	@${REINPLACE_CMD} -i -e "s/$$/ -fPIC/" ${WRKSRC}/okcompilers/c
+
+pre-build:
+	${RM} -rf ${WRKSRC}/crypto_onetimeauth/poly1305/amd64
 
 do-build:
 	cd ${WRKSRC} && ./do
 
+post-build:
+.if ${ARCH} == "i386"
+	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/libnacl.a \
+		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/randombytes.o
+.elif ${ARCH} == "powerpc"
+	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/libnacl.a \
+		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/randombytes.o
+.else
+	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/libnacl.a \
+		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/randombytes.o
+.endif
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha256 \
 		${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha512 \
 		${PREFIX}/bin
 .if ${ARCH} == "i386"
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/lib/x86/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/* \
 		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/include/x86/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/x86/* \
 		${PREFIX}/include
 .elif ${ARCH} == "powerpc"
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/lib/ppc/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/* \
 		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/include/ppc/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/ppc/* \
 		${PREFIX}/include
 .else
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/lib/${ARCH}/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/* \
 		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/include/${ARCH}/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/${ARCH}/* \
 		${PREFIX}/include
 .endif