[pkgsrc/trunk]: pkgsrc/security/gnupg - AIX fixes from Louis Guillaume

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7dca2e5d28ac
branches:  trunk
changeset: 565585:7dca2e5d28ac
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Sep 28 20:15:08 2009 +0000

description:
- AIX fixes from Louis Guillaume
- kill a trailing whitespace

diffstat:

 security/gnupg/Makefile |   8 ++++++--
 security/gnupg/hacks.mk |  10 +++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 1fcb47926984 -r 7dca2e5d28ac security/gnupg/Makefile
--- a/security/gnupg/Makefile   Mon Sep 28 18:26:38 2009 +0000
+++ b/security/gnupg/Makefile   Mon Sep 28 20:15:08 2009 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.103 2009/09/03 12:05:52 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2009/09/28 20:15:08 tnn Exp $
 
 DISTNAME=      gnupg-1.4.10
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/ \
                ftp://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \
                ftp://ftp.jyu.fi/pub/crypt/gcrypt/gnupg/ \
-               ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/ 
+               ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/
 EXTRACT_SUFX=  .tar.bz2
 # don't remove this -- we may add idea.c.gz to it in options.mk
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
@@ -39,6 +39,10 @@
 CONFIGURE_ARGS+=       --disable-asm
 .endif
 
+.if ${OPSYS} == "AIX" && defined(ABI) && ${ABI} == 64
+CONFIGURE_ARGS+=       --disable-asm
+.endif
+
 # XXX: still needed?
 .if ${OPSYS} == "FreeBSD"
 SUBST_CLASSES+=            fixme
diff -r 1fcb47926984 -r 7dca2e5d28ac security/gnupg/hacks.mk
--- a/security/gnupg/hacks.mk   Mon Sep 28 18:26:38 2009 +0000
+++ b/security/gnupg/hacks.mk   Mon Sep 28 20:15:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2007/02/22 19:27:07 wiz Exp $
+# $NetBSD: hacks.mk,v 1.5 2009/09/28 20:15:08 tnn Exp $
 
 .if !defined(GNUPG_HACKS_MK)
 GNUPG_HACKS_MK=        # defined
@@ -11,4 +11,12 @@
 BUILDLINK_TRANSFORM+=  rm:-mcpu=.*
 .endif
 
+# Turn off optimization in CFLAGS for AIX. Otherwise
+# decryption fails with, "Rijndael-128 test encryption failed."
+# at runtime.
+.if ${OPSYS} == "AIX"
+PKG_HACKS+=    aix-codegen
+CFLAGS:=       -O0 ${CFLAGS:C/-O[0-9]?//g}
 .endif
+
+.endif