[pkgsrc/trunk]: pkgsrc/security/gnupg Make build on m68kelf, and honour M6806...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ab85c3a4ece
branches:  trunk
changeset: 469868:8ab85c3a4ece
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Mar 01 19:12:25 2004 +0000

description:
Make build on m68kelf, and honour M68060 variable for quite a bit
of speedup on m68060 machines.
>From S.P. Zeidler in PR 24579.

diffstat:

 security/gnupg/Makefile         |  10 ++++++++--
 security/gnupg/distinfo         |   3 ++-
 security/gnupg/patches/patch-ab |  19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diffs (70 lines):

diff -r 4588a9e30092 -r 8ab85c3a4ece security/gnupg/Makefile
--- a/security/gnupg/Makefile   Mon Mar 01 17:58:19 2004 +0000
+++ b/security/gnupg/Makefile   Mon Mar 01 19:12:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2004/02/08 01:00:13 kleink Exp $
+# $NetBSD: Makefile,v 1.61 2004/03/01 19:12:25 wiz Exp $
 
 DISTNAME=      gnupg-1.2.4
 PKGREVISION=   1
@@ -33,7 +33,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=   USE_I586 USE_IDEA USE_OPENLDAP
+BUILD_DEFS+=   USE_I586 USE_IDEA USE_OPENLDAP M68060
 
 .if defined(USE_I586) && ${USE_I586} == YES
 # use assembler routines optimized for i586
@@ -41,6 +41,12 @@
 MACHINE_GNU_ARCH=      i586
 .endif
 
+.if defined(M68060) && ${M68060} == YES 
+# be more efficient on M68060 machines
+CONFIGURE_ENV+=                M68060=${M68060}
+CFLAGS+=                       -m68060
+.endif
+
 .if defined(USE_IDEA) && ${USE_IDEA} == YES
 # use of IDEA as crypto function
 LICENCE=       fee-based-commercial-use
diff -r 4588a9e30092 -r 8ab85c3a4ece security/gnupg/distinfo
--- a/security/gnupg/distinfo   Mon Mar 01 17:58:19 2004 +0000
+++ b/security/gnupg/distinfo   Mon Mar 01 19:12:25 2004 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.25 2003/12/25 14:05:02 wiz Exp $
+$NetBSD: distinfo,v 1.26 2004/03/01 19:12:25 wiz Exp $
 
 SHA1 (gnupg-1.2.4.tar.bz2) = 10972d11aeb9f88369557f351f0e9d95542e778b
 Size (gnupg-1.2.4.tar.bz2) = 2377277 bytes
 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
 Size (idea.c.gz) = 5216 bytes
 SHA1 (patch-aa) = 3babbdc4386f0edaed4a6e1bb851312528d6ff9e
+SHA1 (patch-ab) = 074bdc631b1558d11b4b640ea3aa6a9be04a9368
 SHA1 (patch-ac) = bf663caa3d7f9b9bb8c4b3f698038efc0683f9cd
 SHA1 (patch-ad) = fc9e85c88e53738faa47f55b769e98dce2c190dc
 SHA1 (patch-ae) = 287a24a881d6886e8a6be5f2826ffa2ea85aadbf
diff -r 4588a9e30092 -r 8ab85c3a4ece security/gnupg/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnupg/patches/patch-ab   Mon Mar 01 19:12:25 2004 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.22 2004/03/01 19:12:25 wiz Exp $
+
+--- mpi/config.links.orig      Wed Dec  3 11:10:16 2003
++++ mpi/config.links
+@@ -200,6 +200,14 @@ case "${target}" in
+       cat  $srcdir/mpi/m68k/syntax.h      >>./mpi/asm-syntax.h
+       path="m68k"
+       ;;
++    m68k*-*-netbsdelf)
++      echo '#define ELF_SYNTAX'           >>./mpi/asm-syntax.h
++      cat  $srcdir/mpi/m68k/syntax.h      >>./mpi/asm-syntax.h
++      path="m68k"
++      if ! test x$M68060 = xYES; then
++              path="m68k/mc68020 m68k"
++      fi
++      ;;
+     m68k-atari-mint)
+       echo '#define MIT_SYNTAX'           >>./mpi/asm-syntax.h
+       cat  $srcdir/mpi/m68k/syntax.h      >>./mpi/asm-syntax.h