[pkgsrc/trunk]: pkgsrc/security/botan Follow joerg's advice, use i386 as PLIS...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d302da7ced84
branches:  trunk
changeset: 348186:d302da7ced84
user:      he <he%pkgsrc.org@localhost>
date:      Thu Jun 09 08:20:43 2016 +0000

description:
Follow joerg's advice, use i386 as PLIST variable and revert to
just one PLIST.  Installs cleanly on NetBSD/i386 and NetBSD/amd64.

diffstat:

 security/botan/Makefile        |  9 ++-------
 security/botan/PLIST           |  8 +++++++-
 security/botan/PLIST.SunOS     |  3 ---
 security/botan/PLIST.non-SunOS |  5 -----
 4 files changed, 9 insertions(+), 16 deletions(-)

diffs (84 lines):

diff -r 98f4dab13e5b -r d302da7ced84 security/botan/Makefile
--- a/security/botan/Makefile   Thu Jun 09 08:18:41 2016 +0000
+++ b/security/botan/Makefile   Thu Jun 09 08:20:43 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2016/06/09 07:20:57 he Exp $
+# $NetBSD: Makefile,v 1.38 2016/06/09 08:20:43 he Exp $
 
 DISTNAME=      Botan-1.10.12
 PKGNAME=       ${DISTNAME:tl}
@@ -25,7 +25,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=   x86 x86_64
+PLIST_VARS+=   x86 x86_64 i386
 
 .if ${MACHINE_ARCH} == "x86_64"
 CONFIGURE_ARGS+=       --cpu=amd64
@@ -43,10 +43,5 @@
 CONFIGURE_ARGS+=       --cpu=arm
 .endif
 
-.if ${OPSYS} != "SunOS"
-PLIST_SRC+=    PLIST
-PLIST_SRC+=    PLIST.non-SunOS
-.endif
-
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98f4dab13e5b -r d302da7ced84 security/botan/PLIST
--- a/security/botan/PLIST      Thu Jun 09 08:18:41 2016 +0000
+++ b/security/botan/PLIST      Thu Jun 09 08:20:43 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/06/09 07:20:57 he Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/06/09 08:20:43 he Exp $
 bin/botan-config-1.10
 include/botan-1.10/botan/adler32.h
 include/botan-1.10/botan/aes.h
@@ -98,6 +98,7 @@
 include/botan-1.10/botan/hmac.h
 include/botan-1.10/botan/hmac_rng.h
 include/botan-1.10/botan/idea.h
+${PLIST.x86_64}include/botan-1.10/botan/idea_sse2.h
 include/botan-1.10/botan/if_algo.h
 include/botan-1.10/botan/init.h
 include/botan-1.10/botan/kasumi.h
@@ -118,7 +119,9 @@
 include/botan-1.10/botan/mars.h
 include/botan-1.10/botan/md2.h
 include/botan-1.10/botan/md4.h
+${PLIST.i386}include/botan-1.10/botan/md4_x86_32.h
 include/botan-1.10/botan/md5.h
+${PLIST.i386}include/botan-1.10/botan/md5_x86_32.h
 include/botan-1.10/botan/mdx_hash.h
 include/botan-1.10/botan/mem_ops.h
 include/botan-1.10/botan/mgf1.h
@@ -177,8 +180,11 @@
 include/botan-1.10/botan/seed.h
 include/botan-1.10/botan/selftest.h
 include/botan-1.10/botan/serp_simd.h
+${PLIST.i386}include/botan-1.10/botan/serp_x86_32.h
 include/botan-1.10/botan/serpent.h
 include/botan-1.10/botan/sha160.h
+${PLIST.i386}include/botan-1.10/botan/sha1_x86_32.h
+${PLIST.x86_64}include/botan-1.10/botan/sha1_sse2.h
 ${PLIST.x86_64}include/botan-1.10/botan/sha1_x86_64.h
 include/botan-1.10/botan/sha2_32.h
 include/botan-1.10/botan/sha2_64.h
diff -r 98f4dab13e5b -r d302da7ced84 security/botan/PLIST.SunOS
--- a/security/botan/PLIST.SunOS        Thu Jun 09 08:18:41 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2016/06/09 07:20:57 he Exp $
-${PLIST.x86}include/botan-1.10/botan/idea_sse2.h
-${PLIST.x86}include/botan-1.10/botan/sha1_sse2.h
diff -r 98f4dab13e5b -r d302da7ced84 security/botan/PLIST.non-SunOS
--- a/security/botan/PLIST.non-SunOS    Thu Jun 09 08:18:41 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.non-SunOS,v 1.1 2016/06/09 07:20:57 he Exp $
-${PLIST.x86}include/botan-1.10/botan/md4_x86_32.h
-${PLIST.x86}include/botan-1.10/botan/md5_x86_32.h
-${PLIST.x86}include/botan-1.10/botan/serp_x86_32.h
-${PLIST.x86}include/botan-1.10/botan/sha1_x86_32.h