From owner-svn-ports-head@FreeBSD.ORG  Sun Jul  6 19:16:30 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 050ABC6F;
 Sun,  6 Jul 2014 19:16:30 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA27E2CA0;
 Sun,  6 Jul 2014 19:16:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s66JGT7I071938;
 Sun, 6 Jul 2014 19:16:29 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s66JGT51071937;
 Sun, 6 Jul 2014 19:16:29 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201407061916.s66JGT51071937@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Sun, 6 Jul 2014 19:16:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360999 - 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.18
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: Sun, 06 Jul 2014 19:16:30 -0000

Author: johans
Date: Sun Jul  6 19:16:29 2014
New Revision: 360999
URL: http://svnweb.freebsd.org/changeset/ports/360999
QAT: https://qat.redports.org/buildarchive/r360999/

Log:
  - Stagify
  - Adopt port

Modified:
  head/security/nacl/Makefile

Modified: head/security/nacl/Makefile
==============================================================================
--- head/security/nacl/Makefile	Sun Jul  6 19:11:52 2014	(r360998)
+++ head/security/nacl/Makefile	Sun Jul  6 19:16:29 2014	(r360999)
@@ -7,22 +7,20 @@ PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://hyperelliptic.org/nacl/
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= 	johans@FreeBSD.org
 COMMENT=	High speed cryptography library
 
+USES=		tar:bzip2
 ALL_TARGET=	do
-USE_BZIP2=	yes
 USE_BINUTILS=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
+BROKEN_ia64=	Does not compile on ia64, powerpc, or sparc64
+BROKEN_powerpc=	Does not compile on ia64, powerpc, or sparc64
+BROKEN_sparc64=	Does not compile on ia64, powerpc, or sparc64
 
 HOSTNAME_CMD?=	/bin/hostname -s
+MYARCH=		${ARCH:S/i386/x86/:S/powerpc/ppc/}
 
 post-patch:
 	@${REINPLACE_CMD} -i -e "s/$$/ -fPIC/" ${WRKSRC}/okcompilers/c
@@ -35,38 +33,20 @@ pre-build:
 do-build:
 	cd ${WRKSRC} && ./do
 
+.include <bsd.port.pre.mk>
+
 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
+	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${MYARCH}/libnacl.a \
+		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${MYARCH}/randombytes.o
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha256 \
-		${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha512 \
-		${PREFIX}/bin
-.if ${ARCH} == "i386"
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/* \
-		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/x86/* \
-		${PREFIX}/include
-.elif ${ARCH} == "powerpc"
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/* \
-		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/ppc/* \
-		${PREFIX}/include
-.else
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/* \
-		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/${ARCH}/* \
-		${PREFIX}/include
-.endif
+		${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
 
 .include <bsd.port.post.mk>