Thu Dec 8 03:01:03 2011 UTC ()
Move the *_amd64 PLIST entries out of the common file and into all of the
platform files except Darwin.  Also add the *_sse2 entries to Darwin.

Note that both *_amd64 and *_sse2 are conditional on x86_64, so this
division of files per platform is easier to do by PLIST tweaks than by
further Makefile conditionals.

This fixes the build of botan under OS X Lion with ABI=64 and should be
a no-op for all other platforms.


(jmmv)
diff -r1.1 -r1.2 pkgsrc/security/botan/PLIST.Darwin
diff -r1.1 -r1.2 pkgsrc/security/botan/PLIST.DragonFly
diff -r1.1.1.1 -r1.2 pkgsrc/security/botan/PLIST.FreeBSD
diff -r1.1.1.1 -r1.2 pkgsrc/security/botan/PLIST.OpenBSD
diff -r1.2 -r1.3 pkgsrc/security/botan/PLIST.Linux
diff -r1.5 -r1.6 pkgsrc/security/botan/PLIST.NetBSD
diff -r1.5 -r1.6 pkgsrc/security/botan/PLIST.common
cvs diff -r1.1 -r1.2 pkgsrc/security/botan/Attic/PLIST.Darwin (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/PLIST.Darwin 2009/03/23 13:16:13 1.1
+++ pkgsrc/security/botan/Attic/PLIST.Darwin 2011/12/08 03:01:03 1.2
@@ -1,2 +1,4 @@ @@ -1,2 +1,4 @@
1@comment $NetBSD: PLIST.Darwin,v 1.1 2009/03/23 13:16:13 jmmv Exp $ 1@comment $NetBSD: PLIST.Darwin,v 1.2 2011/12/08 03:01:03 jmmv Exp $
 2${PLIST.x86_64}include/botan/eng_sse2.h
2include/botan/es_ftw.h 3include/botan/es_ftw.h
 4${PLIST.x86_64}include/botan/sha1_sse2.h
cvs diff -r1.1 -r1.2 pkgsrc/security/botan/Attic/PLIST.DragonFly (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/PLIST.DragonFly 2006/03/01 00:33:30 1.1
+++ pkgsrc/security/botan/Attic/PLIST.DragonFly 2011/12/08 03:01:03 1.2
@@ -1,2 +1,4 @@ @@ -1,2 +1,4 @@
1@comment $NetBSD: PLIST.DragonFly,v 1.1 2006/03/01 00:33:30 joerg Exp $ 1@comment $NetBSD: PLIST.DragonFly,v 1.2 2011/12/08 03:01:03 jmmv Exp $
 2${PLIST.x86_64}include/botan/eng_amd64.h
2include/botan/es_ftw.h 3include/botan/es_ftw.h
 4${PLIST.x86_64}include/botan/sha1_amd64.h
cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/botan/Attic/PLIST.FreeBSD (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/PLIST.FreeBSD 2006/02/05 01:25:12 1.1.1.1
+++ pkgsrc/security/botan/Attic/PLIST.FreeBSD 2011/12/08 03:01:03 1.2
@@ -1,2 +1,4 @@ @@ -1,2 +1,4 @@
1@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2006/02/05 01:25:12 rillig Exp $ 1@comment $NetBSD: PLIST.FreeBSD,v 1.2 2011/12/08 03:01:03 jmmv Exp $
 2${PLIST.x86_64}include/botan/eng_amd64.h
2include/botan/es_ftw.h 3include/botan/es_ftw.h
 4${PLIST.x86_64}include/botan/sha1_amd64.h
cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/botan/Attic/PLIST.OpenBSD (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/PLIST.OpenBSD 2006/02/05 01:25:12 1.1.1.1
+++ pkgsrc/security/botan/Attic/PLIST.OpenBSD 2011/12/08 03:01:03 1.2
@@ -1,2 +1,4 @@ @@ -1,2 +1,4 @@
1@comment $NetBSD: PLIST.OpenBSD,v 1.1.1.1 2006/02/05 01:25:12 rillig Exp $ 1@comment $NetBSD: PLIST.OpenBSD,v 1.2 2011/12/08 03:01:03 jmmv Exp $
 2${PLIST.x86_64}include/botan/eng_amd64.h
2include/botan/es_ftw.h 3include/botan/es_ftw.h
 4${PLIST.x86_64}include/botan/sha1_amd64.h
cvs diff -r1.2 -r1.3 pkgsrc/security/botan/Attic/PLIST.Linux (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/PLIST.Linux 2010/03/31 10:33:46 1.2
+++ pkgsrc/security/botan/Attic/PLIST.Linux 2011/12/08 03:01:03 1.3
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1@comment $NetBSD: PLIST.Linux,v 1.2 2010/03/31 10:33:46 jmmv Exp $ 1@comment $NetBSD: PLIST.Linux,v 1.3 2011/12/08 03:01:03 jmmv Exp $
2include/botan/asm_macr.h 2include/botan/asm_macr.h
 3${PLIST.x86_64}include/botan/eng_amd64.h
3include/botan/eng_sse2.h 4include/botan/eng_sse2.h
4include/botan/es_ftw.h 5include/botan/es_ftw.h
 6${PLIST.x86_64}include/botan/sha1_amd64.h
5include/botan/sha1_sse2.h 7include/botan/sha1_sse2.h
6include/botan/tm_posix.h 8include/botan/tm_posix.h
cvs diff -r1.5 -r1.6 pkgsrc/security/botan/Attic/PLIST.NetBSD (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/PLIST.NetBSD 2011/12/04 22:39:40 1.5
+++ pkgsrc/security/botan/Attic/PLIST.NetBSD 2011/12/08 03:01:03 1.6
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
1@comment $NetBSD: PLIST.NetBSD,v 1.5 2011/12/04 22:39:40 riz Exp $ 1@comment $NetBSD: PLIST.NetBSD,v 1.6 2011/12/08 03:01:03 jmmv Exp $
2${PLIST.x86}include/botan/asm_macr.h 2${PLIST.x86}include/botan/asm_macr.h
 3${PLIST.x86_64}include/botan/eng_amd64.h
3${PLIST.x86_64}include/botan/eng_sse2.h 4${PLIST.x86_64}include/botan/eng_sse2.h
4include/botan/es_ftw.h 5include/botan/es_ftw.h
 6${PLIST.x86_64}include/botan/sha1_amd64.h
5${PLIST.x86_64}include/botan/sha1_sse2.h 7${PLIST.x86_64}include/botan/sha1_sse2.h
cvs diff -r1.5 -r1.6 pkgsrc/security/botan/Attic/PLIST.common (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/PLIST.common 2011/11/25 21:25:26 1.5
+++ pkgsrc/security/botan/Attic/PLIST.common 2011/12/08 03:01:03 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.common,v 1.5 2011/11/25 21:25:26 joerg Exp $ 1@comment $NetBSD: PLIST.common,v 1.6 2011/12/08 03:01:03 jmmv Exp $
2bin/botan-config 2bin/botan-config
3include/botan/adler32.h 3include/botan/adler32.h
4include/botan/aes.h 4include/botan/aes.h
5include/botan/alg_id.h 5include/botan/alg_id.h
6include/botan/algo_cache.h 6include/botan/algo_cache.h
7include/botan/algo_factory.h 7include/botan/algo_factory.h
8include/botan/allocate.h 8include/botan/allocate.h
9include/botan/arc4.h 9include/botan/arc4.h
10include/botan/asn1_int.h 10include/botan/asn1_int.h
11include/botan/asn1_obj.h 11include/botan/asn1_obj.h
12include/botan/asn1_oid.h 12include/botan/asn1_oid.h
13include/botan/auto_rng.h 13include/botan/auto_rng.h
14include/botan/base64.h 14include/botan/base64.h
@@ -84,27 +84,26 @@ include/botan/eckaeg_op.h @@ -84,27 +84,26 @@ include/botan/eckaeg_op.h
84include/botan/elg_core.h 84include/botan/elg_core.h
85include/botan/elg_op.h 85include/botan/elg_op.h
86include/botan/elgamal.h 86include/botan/elgamal.h
87include/botan/eme.h 87include/botan/eme.h
88include/botan/eme1.h 88include/botan/eme1.h
89include/botan/eme_pkcs.h 89include/botan/eme_pkcs.h
90include/botan/emsa.h 90include/botan/emsa.h
91include/botan/emsa1.h 91include/botan/emsa1.h
92include/botan/emsa1_bsi.h 92include/botan/emsa1_bsi.h
93include/botan/emsa2.h 93include/botan/emsa2.h
94include/botan/emsa3.h 94include/botan/emsa3.h
95include/botan/emsa4.h 95include/botan/emsa4.h
96include/botan/emsa_raw.h 96include/botan/emsa_raw.h
97${PLIST.x86_64}include/botan/eng_amd64.h 
98include/botan/engine.h 97include/botan/engine.h
99include/botan/entropy_src.h 98include/botan/entropy_src.h
100include/botan/es_dev.h 99include/botan/es_dev.h
101include/botan/es_egd.h 100include/botan/es_egd.h
102include/botan/es_unix.h 101include/botan/es_unix.h
103include/botan/exceptn.h 102include/botan/exceptn.h
104include/botan/fd_unix.h 103include/botan/fd_unix.h
105include/botan/filter.h 104include/botan/filter.h
106include/botan/filters.h 105include/botan/filters.h
107include/botan/fork256.h 106include/botan/fork256.h
108include/botan/freestore.h 107include/botan/freestore.h
109include/botan/get_pbe.h 108include/botan/get_pbe.h
110include/botan/gfp_element.h 109include/botan/gfp_element.h
@@ -196,27 +195,26 @@ include/botan/rng.h @@ -196,27 +195,26 @@ include/botan/rng.h
196include/botan/rotate.h 195include/botan/rotate.h
197include/botan/rsa.h 196include/botan/rsa.h
198include/botan/rw.h 197include/botan/rw.h
199include/botan/s2k.h 198include/botan/s2k.h
200include/botan/safer_sk.h 199include/botan/safer_sk.h
201include/botan/salsa20.h 200include/botan/salsa20.h
202include/botan/scan_name.h 201include/botan/scan_name.h
203include/botan/secmem.h 202include/botan/secmem.h
204include/botan/secqueue.h 203include/botan/secqueue.h
205include/botan/seed.h 204include/botan/seed.h
206include/botan/selftest.h 205include/botan/selftest.h
207include/botan/serpent.h 206include/botan/serpent.h
208include/botan/sha160.h 207include/botan/sha160.h
209${PLIST.x86_64}include/botan/sha1_amd64.h 
210include/botan/sha2_32.h 208include/botan/sha2_32.h
211include/botan/sha2_64.h 209include/botan/sha2_64.h
212include/botan/signed_obj.h 210include/botan/signed_obj.h
213include/botan/skein_512.h 211include/botan/skein_512.h
214include/botan/skipjack.h 212include/botan/skipjack.h
215include/botan/square.h 213include/botan/square.h
216include/botan/ssl3_mac.h 214include/botan/ssl3_mac.h
217include/botan/stl_util.h 215include/botan/stl_util.h
218include/botan/stream_cipher.h 216include/botan/stream_cipher.h
219include/botan/sym_algo.h 217include/botan/sym_algo.h
220include/botan/symkey.h 218include/botan/symkey.h
221include/botan/tea.h 219include/botan/tea.h
222include/botan/tiger.h 220include/botan/tiger.h