[pkgsrc/trunk]: pkgsrc/security/botan Fix amd64 case. Simplify.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/323095e274a0
branches:  trunk
changeset: 399868:323095e274a0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Oct 06 18:34:14 2009 +0000

description:
Fix amd64 case. Simplify.

diffstat:

 security/botan/Makefile     |  20 +++++++-------------
 security/botan/PLIST.NetBSD |   8 ++++----
 security/botan/PLIST.common |   6 +++---
 3 files changed, 14 insertions(+), 20 deletions(-)

diffs (78 lines):

diff -r 1faeb771b30f -r 323095e274a0 security/botan/Makefile
--- a/security/botan/Makefile   Tue Oct 06 18:30:42 2009 +0000
+++ b/security/botan/Makefile   Tue Oct 06 18:34:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/10/03 18:02:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2009/10/06 18:34:14 joerg Exp $
 
 DISTNAME=      Botan-1.8.7
 PKGNAME=       botan-1.8.7
@@ -26,23 +26,17 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "amd64"
-PLIST_SUBST+=          AMD64=
-PLIST_SUBST+=          AMD64_OR_IA32=
+PLIST_VARS+=   x86 x86_64
+
+.if ${MACHINE_ARCH} == "x86_64"
+PLIST.x86_64=  yes
+PLIST.x86=     yes
 .elif ${MACHINE_ARCH} == "i386"
-PLIST_SUBST+=          AMD64="@comment "
-PLIST_SUBST+=          AMD64_OR_IA32=
+PLIST.x86=     yes
 .elif ${MACHINE_ARCH} == "powerpc"
 CONFIGURE_ARGS+=       --cpu=ppc
-PLIST_SUBST+=          AMD64="@comment "
-PLIST_SUBST+=          AMD64_OR_IA32="@comment "
 .elif ${MACHINE_ARCH} == "powerpc64"
 CONFIGURE_ARGS+=       --cpu=ppc64
-PLIST_SUBST+=          AMD64="@comment "
-PLIST_SUBST+=          AMD64_OR_IA32="@comment "
-.else
-PLIST_SUBST+=          AMD64="@comment "
-PLIST_SUBST+=          AMD64_OR_IA32="@comment "
 .endif
 
 .include "../../lang/python/application.mk"
diff -r 1faeb771b30f -r 323095e274a0 security/botan/PLIST.NetBSD
--- a/security/botan/PLIST.NetBSD       Tue Oct 06 18:30:42 2009 +0000
+++ b/security/botan/PLIST.NetBSD       Tue Oct 06 18:34:14 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2009/09/23 16:03:25 jmmv Exp $
-${AMD64_OR_IA32}include/botan/asm_macr.h
-${AMD64_OR_IA32}include/botan/eng_sse2.h
-${AMD64_OR_IA32}include/botan/sha1_sse2.h
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2009/10/06 18:34:14 joerg Exp $
+${PLIST.x86}include/botan/asm_macr.h
+${PLIST.x86}include/botan/eng_sse2.h
+${PLIST.x86}include/botan/sha1_sse2.h
diff -r 1faeb771b30f -r 323095e274a0 security/botan/PLIST.common
--- a/security/botan/PLIST.common       Tue Oct 06 18:30:42 2009 +0000
+++ b/security/botan/PLIST.common       Tue Oct 06 18:34:14 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2009/09/23 16:03:25 jmmv Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2009/10/06 18:34:14 joerg Exp $
 bin/botan-config
 include/botan/adler32.h
 include/botan/aes.h
@@ -94,7 +94,7 @@
 include/botan/emsa3.h
 include/botan/emsa4.h
 include/botan/emsa_raw.h
-${AMD64}include/botan/eng_amd64.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 +206,7 @@
 include/botan/selftest.h
 include/botan/serpent.h
 include/botan/sha160.h
-${AMD64}include/botan/sha1_amd64.h
+${PLIST.x86_64}include/botan/sha1_amd64.h
 include/botan/sha2_32.h
 include/botan/sha2_64.h
 include/botan/signed_obj.h