svn commit: r341038 - branches/2014Q1/security/poly1305aes

[Martin Wilke]

Author: miwi
Date: Sat Jan 25 13:27:29 2014
New Revision: 341038
URL: http://svnweb.freebsd.org/changeset/ports/341038
QAT: https://qat.redports.org/buildarchive/r341038/

Log:
  MFH: r340310
  
  - Fix build with clang
  
  PR:		185334
  Submitted by:	ports fury

Modified:
  branches/2014Q1/security/poly1305aes/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/security/poly1305aes/Makefile
==============================================================================
--- branches/2014Q1/security/poly1305aes/Makefile	Sat Jan 25 13:22:38 2014	(r341037)
+++ branches/2014Q1/security/poly1305aes/Makefile	Sat Jan 25 13:27:29 2014	(r341038)
@@ -7,23 +7,36 @@ CATEGORIES=	security
 MASTER_SITES=	http://cr.yp.to/mac/
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	The poly1305 message authentication reference implementation using AES
+COMMENT=	Poly1305 message authentication reference implementation using AES
 
-CC+=		${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${STRIP}
 ALL_TARGET=	default
 
-REPLACE_HDRS=	aes.h cpucycles.h poly1305aes.h
-PROGRAM_FILES=	poly1305aes-speed test-aes test-poly1305aes
+CC+=		${CPPFLAGS} ${CFLAGS} ${LDFLAGS}
+
+NOT_FOR_ARCHS=	amd64
+
+.include <bsd.port.pre.mk>
+
+pre-build:
+.if ${ARCH} == "i386"
+	@${ECHO_CMD} "ppro" > ${WRKSRC}/poly1305aes.impl
+.endif
+
+post-build:
+.for i in aes.h cpucycles.h poly1305aes.h
+	@${REINPLACE_CMD} -e \
+		's|#include "|#include "poly1305/|' ${WRKSRC}/${i}
+.endfor
 
-NO_STAGE=	yes
 do-install:
-		${MKDIR} ${PREFIX}/include/poly1305
-		${INSTALL_DATA} ${WRKSRC}/*_*.h ${PREFIX}/include/poly1305/
-.for i in ${REPLACE_HDRS}
-		${REINPLACE_CMD} -e "s,#include \",#include \"poly1305/," ${WRKSRC}/$i > ${WRKSRC}/$i.fixed
-		${INSTALL_DATA} ${WRKSRC}/$i.fixed ${PREFIX}/include/poly1305/$i
-		${INSTALL_DATA} ${WRKSRC}/*.a ${PREFIX}/lib/
-		${INSTALL_DATA} ${PROGRAM_FILES:S,^,${WRKSRC}/,} ${PREFIX}/bin/
+.for i in poly1305aes-speed test-aes test-poly1305aes
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} \
+		${STAGEDIR}${PREFIX}/bin)
 .endfor
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/poly1305
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.h \
+		${STAGEDIR}${PREFIX}/include/poly1305)
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.a \
+		${STAGEDIR}${PREFIX}/lib)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>