Wed May 21 01:22:14 2014 UTC ()
Fix build on NetBSD/evbarm.


(joerg)
diff -r1.3 -r1.4 pkgsrc/security/botan-devel/Makefile
diff -r1.1 -r1.2 pkgsrc/security/botan-devel/PLIST
diff -r0 -r1.1 pkgsrc/security/botan-devel/patches/patch-src_build-data_arch_arm.txt
cvs diff -r1.3 -r1.4 pkgsrc/security/botan-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/botan-devel/Attic/Makefile 2014/05/17 16:10:48 1.3
+++ pkgsrc/security/botan-devel/Attic/Makefile 2014/05/21 01:22:14 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2014/05/17 16:10:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2014/05/21 01:22:14 joerg Exp $
2 2
3DISTNAME= Botan-1.11.8 3DISTNAME= Botan-1.11.8
4PKGNAME= ${DISTNAME:tl} 4PKGNAME= ${DISTNAME:tl}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= http://files.randombit.net/botan/ 7MASTER_SITES= http://files.randombit.net/botan/
8EXTRACT_SUFX= .tbz 8EXTRACT_SUFX= .tbz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://botan.randombit.net/ 11HOMEPAGE= http://botan.randombit.net/
12COMMENT= Portable, easy to use, and efficient C++ crypto library 12COMMENT= Portable, easy to use, and efficient C++ crypto library
13LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
14 14
@@ -20,17 +20,26 @@ PYTHON_FOR_BUILD_ONLY= yes @@ -20,17 +20,26 @@ PYTHON_FOR_BUILD_ONLY= yes
20CONFIG_SHELL= ${PYTHONBIN} 20CONFIG_SHELL= ${PYTHONBIN}
21CONFIGURE_SCRIPT= ./configure.py 21CONFIGURE_SCRIPT= ./configure.py
22CONFIGURE_ARGS+= --prefix=${PREFIX} --with-zlib --with-boost 22CONFIGURE_ARGS+= --prefix=${PREFIX} --with-zlib --with-boost
23 23
24.include "../../mk/compiler.mk" 24.include "../../mk/compiler.mk"
25.if !empty(PKGSRC_COMPILER:Mclang) 25.if !empty(PKGSRC_COMPILER:Mclang)
26CONFIGURE_ARGS+= --cc-bin=${CXX} --cc=clang 26CONFIGURE_ARGS+= --cc-bin=${CXX} --cc=clang
27.endif 27.endif
28 28
29MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} 29MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q}
30 30
31USE_TOOLS+= gmake 31USE_TOOLS+= gmake
32 32
 33PLIST_VARS+= x86 x86_64
 34
 35.if ${MACHINE_ARCH} == "x86_64"
 36PLIST.x86_64= yes
 37PLIST.x86= yes
 38.elif ${MACHINE_ARCH} == "i386"
 39PLIST.x86= yes
 40.endif
 41
33.include "../../devel/zlib/buildlink3.mk" 42.include "../../devel/zlib/buildlink3.mk"
34.include "../../devel/boost-libs/buildlink3.mk" 43.include "../../devel/boost-libs/buildlink3.mk"
35.include "../../lang/python/application.mk" 44.include "../../lang/python/application.mk"
36.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/security/botan-devel/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/security/botan-devel/Attic/PLIST 2014/02/24 20:49:14 1.1
+++ pkgsrc/security/botan-devel/Attic/PLIST 2014/05/21 01:22:14 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1@comment $NetBSD: PLIST,v 1.1 2014/02/24 20:49:14 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/05/21 01:22:14 joerg Exp $
2bin/botan 2bin/botan
3bin/botan-config-1.11 3bin/botan-config-1.11
4include/botan-1.11/botan/adler32.h 4include/botan-1.11/botan/adler32.h
5include/botan-1.11/botan/aead_filt.h 5include/botan-1.11/botan/aead_filt.h
6include/botan-1.11/botan/aead.h 6include/botan-1.11/botan/aead.h
7include/botan-1.11/botan/aes.h 7include/botan-1.11/botan/aes.h
8include/botan-1.11/botan/aes_ni.h 8${PLIST.x86}include/botan-1.11/botan/aes_ni.h
9include/botan-1.11/botan/aes_ssse3.h 9${PLIST.x86}include/botan-1.11/botan/aes_ssse3.h
10include/botan-1.11/botan/alg_id.h 10include/botan-1.11/botan/alg_id.h
11include/botan-1.11/botan/algo_factory.h 11include/botan-1.11/botan/algo_factory.h
12include/botan-1.11/botan/asn1_alt_name.h 12include/botan-1.11/botan/asn1_alt_name.h
13include/botan-1.11/botan/asn1_attribute.h 13include/botan-1.11/botan/asn1_attribute.h
14include/botan-1.11/botan/asn1_obj.h 14include/botan-1.11/botan/asn1_obj.h
15include/botan-1.11/botan/asn1_oid.h 15include/botan-1.11/botan/asn1_oid.h
16include/botan-1.11/botan/asn1_str.h 16include/botan-1.11/botan/asn1_str.h
17include/botan-1.11/botan/asn1_time.h 17include/botan-1.11/botan/asn1_time.h
18include/botan-1.11/botan/assert.h 18include/botan-1.11/botan/assert.h
19include/botan-1.11/botan/auto_rng.h 19include/botan-1.11/botan/auto_rng.h
20include/botan-1.11/botan/b64_filt.h 20include/botan-1.11/botan/b64_filt.h
21include/botan-1.11/botan/base64.h 21include/botan-1.11/botan/base64.h
22include/botan-1.11/botan/basefilt.h 22include/botan-1.11/botan/basefilt.h
@@ -99,27 +99,27 @@ include/botan-1.11/botan/global_state.h @@ -99,27 +99,27 @@ include/botan-1.11/botan/global_state.h
99include/botan-1.11/botan/gost_28147.h 99include/botan-1.11/botan/gost_28147.h
100include/botan-1.11/botan/gost_3410.h 100include/botan-1.11/botan/gost_3410.h
101include/botan-1.11/botan/gost_3411.h 101include/botan-1.11/botan/gost_3411.h
102include/botan-1.11/botan/has160.h 102include/botan-1.11/botan/has160.h
103include/botan-1.11/botan/hash.h 103include/botan-1.11/botan/hash.h
104include/botan-1.11/botan/hash_id.h 104include/botan-1.11/botan/hash_id.h
105include/botan-1.11/botan/hex_filt.h 105include/botan-1.11/botan/hex_filt.h
106include/botan-1.11/botan/hex.h 106include/botan-1.11/botan/hex.h
107include/botan-1.11/botan/hkdf.h 107include/botan-1.11/botan/hkdf.h
108include/botan-1.11/botan/hmac.h 108include/botan-1.11/botan/hmac.h
109include/botan-1.11/botan/hmac_rng.h 109include/botan-1.11/botan/hmac_rng.h
110include/botan-1.11/botan/http_util.h 110include/botan-1.11/botan/http_util.h
111include/botan-1.11/botan/idea.h 111include/botan-1.11/botan/idea.h
112include/botan-1.11/botan/idea_sse2.h 112${PLIST.x86}include/botan-1.11/botan/idea_sse2.h
113include/botan-1.11/botan/if_algo.h 113include/botan-1.11/botan/if_algo.h
114include/botan-1.11/botan/init.h 114include/botan-1.11/botan/init.h
115include/botan-1.11/botan/kasumi.h 115include/botan-1.11/botan/kasumi.h
116include/botan-1.11/botan/kdf1.h 116include/botan-1.11/botan/kdf1.h
117include/botan-1.11/botan/kdf2.h 117include/botan-1.11/botan/kdf2.h
118include/botan-1.11/botan/kdf.h 118include/botan-1.11/botan/kdf.h
119include/botan-1.11/botan/keccak.h 119include/botan-1.11/botan/keccak.h
120include/botan-1.11/botan/key_constraint.h 120include/botan-1.11/botan/key_constraint.h
121include/botan-1.11/botan/key_filt.h 121include/botan-1.11/botan/key_filt.h
122include/botan-1.11/botan/keypair.h 122include/botan-1.11/botan/keypair.h
123include/botan-1.11/botan/key_spec.h 123include/botan-1.11/botan/key_spec.h
124include/botan-1.11/botan/libstate.h 124include/botan-1.11/botan/libstate.h
125include/botan-1.11/botan/lion.h 125include/botan-1.11/botan/lion.h
@@ -184,40 +184,40 @@ include/botan-1.11/botan/rng.h @@ -184,40 +184,40 @@ include/botan-1.11/botan/rng.h
184include/botan-1.11/botan/rotate.h 184include/botan-1.11/botan/rotate.h
185include/botan-1.11/botan/rsa.h 185include/botan-1.11/botan/rsa.h
186include/botan-1.11/botan/rw.h 186include/botan-1.11/botan/rw.h
187include/botan-1.11/botan/safer_sk.h 187include/botan-1.11/botan/safer_sk.h
188include/botan-1.11/botan/salsa20.h 188include/botan-1.11/botan/salsa20.h
189include/botan-1.11/botan/scan_name.h 189include/botan-1.11/botan/scan_name.h
190include/botan-1.11/botan/secmem.h 190include/botan-1.11/botan/secmem.h
191include/botan-1.11/botan/secqueue.h 191include/botan-1.11/botan/secqueue.h
192include/botan-1.11/botan/seed.h 192include/botan-1.11/botan/seed.h
193include/botan-1.11/botan/selftest.h 193include/botan-1.11/botan/selftest.h
194include/botan-1.11/botan/serpent.h 194include/botan-1.11/botan/serpent.h
195include/botan-1.11/botan/serp_simd.h 195include/botan-1.11/botan/serp_simd.h
196include/botan-1.11/botan/sha160.h 196include/botan-1.11/botan/sha160.h
197include/botan-1.11/botan/sha1_sse2.h 197${PLIST.x86}include/botan-1.11/botan/sha1_sse2.h
198include/botan-1.11/botan/sha1_${MACHINE_ARCH}.h 198${PLIST.x86_64}include/botan-1.11/botan/sha1_x86_64.h
199include/botan-1.11/botan/sha2_32.h 199include/botan-1.11/botan/sha2_32.h
200include/botan-1.11/botan/sha2_64.h 200include/botan-1.11/botan/sha2_64.h
201include/botan-1.11/botan/siv.h 201include/botan-1.11/botan/siv.h
202include/botan-1.11/botan/skein_512.h 202include/botan-1.11/botan/skein_512.h
203include/botan-1.11/botan/srp6_files.h 203include/botan-1.11/botan/srp6_files.h
204include/botan-1.11/botan/srp6.h 204include/botan-1.11/botan/srp6.h
205include/botan-1.11/botan/ssl3_mac.h 205include/botan-1.11/botan/ssl3_mac.h
206include/botan-1.11/botan/stream_cipher.h 206include/botan-1.11/botan/stream_cipher.h
207include/botan-1.11/botan/sym_algo.h 207include/botan-1.11/botan/sym_algo.h
208include/botan-1.11/botan/symkey.h 208include/botan-1.11/botan/symkey.h
209include/botan-1.11/botan/tea.h 209include/botan-1.11/botan/tea.h
210include/botan-1.11/botan/threefish_avx2.h 210${PLIST.x86_64}include/botan-1.11/botan/threefish_avx2.h
211include/botan-1.11/botan/threefish.h 211include/botan-1.11/botan/threefish.h
212include/botan-1.11/botan/tiger.h 212include/botan-1.11/botan/tiger.h
213include/botan-1.11/botan/tls_alert.h 213include/botan-1.11/botan/tls_alert.h
214include/botan-1.11/botan/tls_blocking.h 214include/botan-1.11/botan/tls_blocking.h
215include/botan-1.11/botan/tls_channel.h 215include/botan-1.11/botan/tls_channel.h
216include/botan-1.11/botan/tls_ciphersuite.h 216include/botan-1.11/botan/tls_ciphersuite.h
217include/botan-1.11/botan/tls_client.h 217include/botan-1.11/botan/tls_client.h
218include/botan-1.11/botan/tls_exceptn.h 218include/botan-1.11/botan/tls_exceptn.h
219include/botan-1.11/botan/tls_handshake_msg.h 219include/botan-1.11/botan/tls_handshake_msg.h
220include/botan-1.11/botan/tls_magic.h 220include/botan-1.11/botan/tls_magic.h
221include/botan-1.11/botan/tls_policy.h 221include/botan-1.11/botan/tls_policy.h
222include/botan-1.11/botan/tls_server.h 222include/botan-1.11/botan/tls_server.h
223include/botan-1.11/botan/tls_server_info.h 223include/botan-1.11/botan/tls_server_info.h
File Added: pkgsrc/security/botan-devel/patches/Attic/patch-src_build-data_arch_arm.txt
$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>