From eaac3557fff0e1c14b6e6012b1cc48e0a48bbfe1 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Fri, 29 Aug 2014 14:22:59 +0000
Subject: Remove ten year old patch for Solaris 9/sparc/gcc that was never fed
 upstream. If this patch is still necessary for you, please discuss at
 https://bugs.g10code.com/gnupg/issue1703

Bump PKGREVISION.
---
 security/libgcrypt/Makefile         |  4 ++--
 security/libgcrypt/distinfo         |  3 +--
 security/libgcrypt/patches/patch-ad | 26 --------------------------
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 security/libgcrypt/patches/patch-ad

(limited to 'security')

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index e0c2d04ad33..129faff504f 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2014/08/29 10:29:14 richard Exp $
+# $NetBSD: Makefile,v 1.67 2014/08/29 14:22:59 wiz Exp $
 
 DISTNAME=	libgcrypt-1.6.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index e9cb1056c0e..61bfce18831 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.53 2014/08/29 10:29:14 richard Exp $
+$NetBSD: distinfo,v 1.54 2014/08/29 14:22:59 wiz Exp $
 
 SHA1 (libgcrypt-1.6.2.tar.bz2) = cc31aca87e4a3769cb86884a3f5982b2cc8eb7ec
 RMD160 (libgcrypt-1.6.2.tar.bz2) = 807df33a98468015293846fd589a213dad38be19
 Size (libgcrypt-1.6.2.tar.bz2) = 2476101 bytes
 SHA1 (patch-aa) = 3dd44b8745128a6788d24f9eb00002624a5fc52b
 SHA1 (patch-ab) = 1a72ac897fbccbd58f0108b36a9ab2a6ee579b59
-SHA1 (patch-ad) = e74c9471e26029aeafca23d385ee0162ffc1864b
 SHA1 (patch-configure) = b9abea2f665ed0d8e0f36cf207f2cb9667bdfb4d
 SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518
diff --git a/security/libgcrypt/patches/patch-ad b/security/libgcrypt/patches/patch-ad
deleted file mode 100644
index 6040ca9a53d..00000000000
--- a/security/libgcrypt/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2014/08/21 19:55:26 wiz Exp $
-
-Fix for compiling on Solaris SPARC with gcc.
-
-If __sparcv8 is defined, use the SPARC v8 version of udiv_qrnnd.  Without
-this change, udiv_qrnnd will not be defined using the SPARC v8 udiv
-instruction, and the default SPARC v7 case of defining it to be the native
-__gmpn_udiv_qrnnd will be used, but this does not exist on SPARC v8, so
-at link time, the user will get an error about _gmpn_udiv_qrnnd being
-undefined.  gcc defines __sparcv8.
-
-From PR pkg/26815.
-
-https://bugs.g10code.com/gnupg/issue1703
-
---- mpi/longlong.h.orig	2004-03-03 08:21:49.000000000 +0000
-+++ mpi/longlong.h
-@@ -1150,7 +1150,7 @@ extern USItype __udiv_qrnnd ();
- 	     "rJ" ((USItype)(al)),                                      \
- 	     "rI" ((USItype)(bl))                                       \
- 	   __CLOBBER_CC)
--#if defined (__sparc_v8__)
-+#if defined (__sparc_v8__) || defined(__sparcv8)
- /* Don't match immediate range because, 1) it is not often useful,
-    2) the 'I' flag thinks of the range as a 13 bit signed interval,
-    while we want to match a 13 bit interval, sign extended to 32 bits,
-- 
cgit v1.2.3