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.

7 files changed, 19 insertions, 9 deletions

diff --git a/security/botan/PLIST.Darwin b/security/botan/PLIST.Darwin
index af4001a9cb3..79e950574d4 100644
--- a/security/botan/PLIST.Darwin
+++ b/security/botan/PLIST.Darwin
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2009/03/23 13:16:13 jmmv Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.2 2011/12/08 03:01:03 jmmv Exp $
+${PLIST.x86_64}include/botan/eng_sse2.h
 include/botan/es_ftw.h
+${PLIST.x86_64}include/botan/sha1_sse2.h
diff --git a/security/botan/PLIST.DragonFly b/security/botan/PLIST.DragonFly
index f54b2c78160..f6cb6f0c8db 100644
--- a/security/botan/PLIST.DragonFly
+++ b/security/botan/PLIST.DragonFly
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.1 2006/03/01 00:33:30 joerg Exp $
+@comment $NetBSD: PLIST.DragonFly,v 1.2 2011/12/08 03:01:03 jmmv Exp $
+${PLIST.x86_64}include/botan/eng_amd64.h
 include/botan/es_ftw.h
+${PLIST.x86_64}include/botan/sha1_amd64.h
diff --git a/security/botan/PLIST.FreeBSD b/security/botan/PLIST.FreeBSD
index 62d3d2e5c13..117c74f24eb 100644
--- a/security/botan/PLIST.FreeBSD
+++ b/security/botan/PLIST.FreeBSD
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2006/02/05 01:25:12 rillig Exp $
+@comment $NetBSD: PLIST.FreeBSD,v 1.2 2011/12/08 03:01:03 jmmv Exp $
+${PLIST.x86_64}include/botan/eng_amd64.h
 include/botan/es_ftw.h
+${PLIST.x86_64}include/botan/sha1_amd64.h
diff --git a/security/botan/PLIST.Linux b/security/botan/PLIST.Linux
index 4740eeefc31..27897e05228 100644
--- a/security/botan/PLIST.Linux
+++ b/security/botan/PLIST.Linux
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2010/03/31 10:33:46 jmmv Exp $
+@comment $NetBSD: PLIST.Linux,v 1.3 2011/12/08 03:01:03 jmmv Exp $
 include/botan/asm_macr.h
+${PLIST.x86_64}include/botan/eng_amd64.h
 include/botan/eng_sse2.h
 include/botan/es_ftw.h
+${PLIST.x86_64}include/botan/sha1_amd64.h
 include/botan/sha1_sse2.h
 include/botan/tm_posix.h
diff --git a/security/botan/PLIST.NetBSD b/security/botan/PLIST.NetBSD
index 8ef986326fd..6aeeb9965c7 100644
--- a/security/botan/PLIST.NetBSD
+++ b/security/botan/PLIST.NetBSD
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.5 2011/12/04 22:39:40 riz Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.6 2011/12/08 03:01:03 jmmv Exp $
 ${PLIST.x86}include/botan/asm_macr.h
+${PLIST.x86_64}include/botan/eng_amd64.h
 ${PLIST.x86_64}include/botan/eng_sse2.h
 include/botan/es_ftw.h
+${PLIST.x86_64}include/botan/sha1_amd64.h
 ${PLIST.x86_64}include/botan/sha1_sse2.h
diff --git a/security/botan/PLIST.OpenBSD b/security/botan/PLIST.OpenBSD
index 041182e0c0a..b5c86630a0e 100644
--- a/security/botan/PLIST.OpenBSD
+++ b/security/botan/PLIST.OpenBSD
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.1.1.1 2006/02/05 01:25:12 rillig Exp $
+@comment $NetBSD: PLIST.OpenBSD,v 1.2 2011/12/08 03:01:03 jmmv Exp $
+${PLIST.x86_64}include/botan/eng_amd64.h
 include/botan/es_ftw.h
+${PLIST.x86_64}include/botan/sha1_amd64.h
diff --git a/security/botan/PLIST.common b/security/botan/PLIST.common
index b7750c54e09..1ab42d2c3dd 100644
--- a/security/botan/PLIST.common
+++ b/security/botan/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2011/11/25 21:25:26 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2011/12/08 03:01:03 jmmv Exp $
 bin/botan-config
 include/botan/adler32.h
 include/botan/aes.h
@@ -94,7 +94,6 @@ include/botan/emsa2.h
 include/botan/emsa3.h
 include/botan/emsa4.h
 include/botan/emsa_raw.h
-${PLIST.x86_64}include/botan/eng_amd64.h
 include/botan/engine.h
 include/botan/entropy_src.h
 include/botan/es_dev.h
@@ -206,7 +205,6 @@ include/botan/seed.h
 include/botan/selftest.h
 include/botan/serpent.h
 include/botan/sha160.h
-${PLIST.x86_64}include/botan/sha1_amd64.h
 include/botan/sha2_32.h
 include/botan/sha2_64.h
 include/botan/signed_obj.h