Update to 1.4.11, add some comments to patches and please pkglint.

Noteworthy changes in version 1.4.11 (2010-10-18)
-------------------------------------------------

    * Bug fixes and portability changes.

    * Minor changes for better interoperability with GnuPG-2.

5 files changed, 25 insertions, 22 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 72dc1a15429..361ccc37bf3 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2009/11/03 07:28:17 adam Exp $
+# $NetBSD: Makefile,v 1.107 2010/10/21 21:48:12 wiz Exp $
 
-DISTNAME=	gnupg-1.4.10
+DISTNAME=	gnupg-1.4.11
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \
@@ -25,7 +25,7 @@ USE_TOOLS+=		gmake msgfmt
 CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--with-mailprog=/usr/sbin/sendmail
 TEST_TARGET=		check
-INFO_FILES=		# PLIST
+INFO_FILES=		yes
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -41,15 +41,15 @@ CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 # XXX: still needed?
-.if ${OPSYS} == "FreeBSD"
-SUBST_CLASSES+=	    fixme
-SUBST_STAGE.fixme=  post-configure
-SUBST_FILES.fixme=  mpi/i386/mpih-add1.S mpi/i386/mpih-lshift.S \
-		    mpi/i386/mpih-mul1.S mpi/i386/mpih-mul2.S \
-		    mpi/i386/mpih-mul3.S mpi/i386/mpih-rshift.S \
-		    mpi/i386/mpih-sub1.S
-SUBST_SED.fixme=    -e "s,ALIGN (3),ALIGN (4),g"
-.endif
+#.if ${OPSYS} == "FreeBSD"
+#SUBST_CLASSES+=	    fixme
+#SUBST_STAGE.fixme=  post-configure
+#SUBST_FILES.fixme=  mpi/i386/mpih-add1.S mpi/i386/mpih-lshift.S \
+#		    mpi/i386/mpih-mul1.S mpi/i386/mpih-mul2.S \
+#		    mpi/i386/mpih-mul3.S mpi/i386/mpih-rshift.S \
+#		    mpi/i386/mpih-sub1.S
+#SUBST_SED.fixme=    -e "s,ALIGN (3),ALIGN (4),g"
+#.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/DETAILS \
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index 5344e36aa45..6922af2d55d 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/09/03 12:05:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2010/10/21 21:48:12 wiz Exp $
 bin/gpg
 bin/gpg-zip
 bin/gpgsplit
@@ -15,7 +15,6 @@ man/man1/gpgv.1
 man/man7/gnupg.7
 share/gnupg/DETAILS
 share/gnupg/FAQ
-share/gnupg/faq.html
 share/gnupg/options.skel
 share/locale/be/LC_MESSAGES/gnupg.mo
 share/locale/ca/LC_MESSAGES/gnupg.mo
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index dd520c61537..0f61ac01e09 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.49 2009/09/03 12:05:52 wiz Exp $
+$NetBSD: distinfo,v 1.50 2010/10/21 21:48:12 wiz Exp $
 
-SHA1 (gnupg-1.4.10.tar.bz2) = fd1b6a5f3b2dd836b598a1123ac257b8f105615d
-RMD160 (gnupg-1.4.10.tar.bz2) = d54063eaa5b25dc3c3f4ad924411ec69c25c1e62
-Size (gnupg-1.4.10.tar.bz2) = 3410814 bytes
+SHA1 (gnupg-1.4.11.tar.bz2) = 78e22f5cca88514ee71034aafff539c33f3c6676
+RMD160 (gnupg-1.4.11.tar.bz2) = 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378
+Size (gnupg-1.4.11.tar.bz2) = 3407075 bytes
 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
 RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d
 Size (idea.c.gz) = 5216 bytes
-SHA1 (patch-aa) = 91d55ca22b58e8a1f3c17a2fd0ad888d4c85c6cf
-SHA1 (patch-ab) = 29a7d0b736322eb1ecf0925a2419b513f323000e
+SHA1 (patch-aa) = ad76abec765e95209f884da7701ea4566ddf35f3
+SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8
 SHA1 (patch-ak) = 89a6a7552104f4d5b97a98889da88fca68c54f31
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
index eb3e24f8528..22a8b634752 100644
--- a/security/gnupg/patches/patch-aa
+++ b/security/gnupg/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2006/04/04 21:16:37 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2010/10/21 21:48:12 wiz Exp $
+
+Only check dlerror() if dlsym failed.
 
 --- cipher/idea-stub.c.orig	2005-12-08 06:58:36.000000000 +0000
 +++ cipher/idea-stub.c
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index 35edcd63aa4..f8b77b00ed5 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.24 2004/12/25 02:54:13 wiz Exp $
+$NetBSD: patch-ab,v 1.25 2010/10/21 21:48:12 wiz Exp $
+
+Support for m68k-netbsd.
 
 --- mpi/config.links.orig	2004-10-26 19:06:47.000000000 +0200
 +++ mpi/config.links