diff options
| author | joerg <joerg@pkgsrc.org> | 2009-10-06 18:34:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-10-06 18:34:14 +0000 |
| commit | 984dabc4df5aa1701c8456df7da557330f122f52 (patch) | |
| tree | 1cb1a76c7f15bd6e555a6421959bedd771d7d9e0 /security | |
| parent | c234c16f73f814e00555ae190d782479dd30a1be (diff) | |
| download | pkgsrc-984dabc4df5aa1701c8456df7da557330f122f52.tar.gz | |
Fix amd64 case. Simplify.
Diffstat (limited to 'security')
| -rw-r--r-- | security/botan/Makefile | 20 | ||||
| -rw-r--r-- | security/botan/PLIST.NetBSD | 8 | ||||
| -rw-r--r-- | security/botan/PLIST.common | 6 |
3 files changed, 14 insertions, 20 deletions
diff --git a/security/botan/Makefile b/security/botan/Makefile index 4e291479201..64d85b92076 100644 --- a/security/botan/Makefile +++ b/security/botan/Makefile @@ -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 @@ MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} .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 --git a/security/botan/PLIST.NetBSD b/security/botan/PLIST.NetBSD index 99f074fd523..401354e56e7 100644 --- a/security/botan/PLIST.NetBSD +++ b/security/botan/PLIST.NetBSD @@ -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 --git a/security/botan/PLIST.common b/security/botan/PLIST.common index b8bff033646..4a6988d16d4 100644 --- a/security/botan/PLIST.common +++ b/security/botan/PLIST.common @@ -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/emsa2.h 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/seed.h 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 |