Fix build on NetBSD/evbarm.

3 files changed, 29 insertions, 8 deletions

diff --git a/security/botan-devel/Makefile b/security/botan-devel/Makefile
index 30227dcef55..8b3be16b435 100644
--- a/security/botan-devel/Makefile
+++ b/security/botan-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/05/17 16:10:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/21 01:22:14 joerg Exp $
 
 DISTNAME=	Botan-1.11.8
 PKGNAME=	${DISTNAME:tl}
@@ -30,6 +30,15 @@ MAKE_FLAGS+=	LIB_OPT=${CXXFLAGS:Q}
 
 USE_TOOLS+=	gmake
 
+PLIST_VARS+=	x86 x86_64
+
+.if ${MACHINE_ARCH} == "x86_64"
+PLIST.x86_64=	yes
+PLIST.x86=	yes
+.elif ${MACHINE_ARCH} == "i386"
+PLIST.x86=	yes
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/security/botan-devel/PLIST b/security/botan-devel/PLIST
index d7b8ae208c0..ecd77d9f32f 100644
--- a/security/botan-devel/PLIST
+++ b/security/botan-devel/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2014/02/24 20:49:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/05/21 01:22:14 joerg Exp $
 bin/botan
 bin/botan-config-1.11
 include/botan-1.11/botan/adler32.h
 include/botan-1.11/botan/aead_filt.h
 include/botan-1.11/botan/aead.h
 include/botan-1.11/botan/aes.h
-include/botan-1.11/botan/aes_ni.h
-include/botan-1.11/botan/aes_ssse3.h
+${PLIST.x86}include/botan-1.11/botan/aes_ni.h
+${PLIST.x86}include/botan-1.11/botan/aes_ssse3.h
 include/botan-1.11/botan/alg_id.h
 include/botan-1.11/botan/algo_factory.h
 include/botan-1.11/botan/asn1_alt_name.h
@@ -109,7 +109,7 @@ include/botan-1.11/botan/hmac.h
 include/botan-1.11/botan/hmac_rng.h
 include/botan-1.11/botan/http_util.h
 include/botan-1.11/botan/idea.h
-include/botan-1.11/botan/idea_sse2.h
+${PLIST.x86}include/botan-1.11/botan/idea_sse2.h
 include/botan-1.11/botan/if_algo.h
 include/botan-1.11/botan/init.h
 include/botan-1.11/botan/kasumi.h
@@ -194,8 +194,8 @@ include/botan-1.11/botan/selftest.h
 include/botan-1.11/botan/serpent.h
 include/botan-1.11/botan/serp_simd.h
 include/botan-1.11/botan/sha160.h
-include/botan-1.11/botan/sha1_sse2.h
-include/botan-1.11/botan/sha1_${MACHINE_ARCH}.h
+${PLIST.x86}include/botan-1.11/botan/sha1_sse2.h
+${PLIST.x86_64}include/botan-1.11/botan/sha1_x86_64.h
 include/botan-1.11/botan/sha2_32.h
 include/botan-1.11/botan/sha2_64.h
 include/botan-1.11/botan/siv.h
@@ -207,7 +207,7 @@ include/botan-1.11/botan/stream_cipher.h
 include/botan-1.11/botan/sym_algo.h
 include/botan-1.11/botan/symkey.h
 include/botan-1.11/botan/tea.h
-include/botan-1.11/botan/threefish_avx2.h
+${PLIST.x86_64}include/botan-1.11/botan/threefish_avx2.h
 include/botan-1.11/botan/threefish.h
 include/botan-1.11/botan/tiger.h
 include/botan-1.11/botan/tls_alert.h
diff --git a/security/botan-devel/patches/patch-src_build-data_arch_arm.txt b/security/botan-devel/patches/patch-src_build-data_arch_arm.txt
new file mode 100644
index 00000000000..df968563eb7
--- /dev/null
+++ b/security/botan-devel/patches/patch-src_build-data_arch_arm.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_build-data_arch_arm.txt,v 1.1 2014/05/21 01:22:14 joerg Exp $
+
+--- src/build-data/arch/arm.txt.orig	2014-05-20 11:40:23.000000000 +0000
++++ src/build-data/arch/arm.txt
+@@ -5,6 +5,7 @@ family arm
+ <aliases>
+ armel # For Debian
+ armhf # For Debian
++evbarm # NetBSD
+ </aliases>
+ 
+ <submodels>