- Upgrade to 1.4.11 (minor bugfixes).

References:	http://lists.gnupg.org/pipermail/gnupg-announce/2010q4/000303.html

4 files changed, 14 insertions, 26 deletions

diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 033f3316f9ca..d9c5cbe0f55a 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.10
-PORTREVISION=	2
+PORTVERSION=	1.4.11
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index c0610b758533..f18004cd5ee2 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnupg-1.4.10.tar.bz2) = dcf7ed712997888d616e029637bfc303
-SHA256 (gnupg-1.4.10.tar.bz2) = a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38
-SIZE (gnupg-1.4.10.tar.bz2) = 3410814
-MD5 (gnupg-1.4.10.tar.bz2.sig) = 4f602a424cc1b6cadfd83487c6723403
-SHA256 (gnupg-1.4.10.tar.bz2.sig) = 9f0180b278445d063780aee3a1d6272e38856d7227ea14872fdb059267b3e450
-SIZE (gnupg-1.4.10.tar.bz2.sig) = 158
+MD5 (gnupg-1.4.11.tar.bz2) = 411744e1ef8ce90b87938c4203f001f1
+SHA256 (gnupg-1.4.11.tar.bz2) = d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
+SIZE (gnupg-1.4.11.tar.bz2) = 3407075
+MD5 (gnupg-1.4.11.tar.bz2.sig) = 4fcc7f0f8cf8a729b3ffba0f602b8eea
+SHA256 (gnupg-1.4.11.tar.bz2.sig) = 403f14d944003058eb192a0453fbe43ae9302676cebdac776c2fe86ed40b75b0
+SIZE (gnupg-1.4.11.tar.bz2.sig) = 158
diff --git a/security/gnupg1/files/patch-doc:Makefile.in b/security/gnupg1/files/patch-doc:Makefile.in
index c2091b30024c..ad4f7473b801 100644
--- a/security/gnupg1/files/patch-doc:Makefile.in
+++ b/security/gnupg1/files/patch-doc:Makefile.in
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	2008-03-27 02:30:46.000000000 +0900
-+++ doc/Makefile.in	2008-08-11 11:30:00.000000000 +0900
+--- doc/Makefile.in.orig	2010-10-18 18:53:58.000000000 +0900
++++ doc/Makefile.in	2010-10-19 09:00:24.995576212 +0900
 @@ -32,7 +32,7 @@
  # along with this program; if not, see <http://www.gnu.org/licenses/>.
  
@@ -9,19 +9,19 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -296,7 +296,11 @@
+@@ -299,7 +299,11 @@
  
  # Need this to avoid building of dvis with automake 1.4
  DVIS = 
 +ifdef NOPORTDOCS 
 +pkgdata_DATA =
 +else
- pkgdata_DATA = FAQ faq.html
+ pkgdata_DATA = FAQ
 +endif
- BUILT_SOURCES = FAQ faq.html 
+ 
  # we can't add gpg.texi gpgv.texi here because automake does not like them to
  # be built files. 
-@@ -589,6 +593,8 @@
+@@ -591,6 +595,8 @@
  	  rm -f "$(DESTDIR)$(man7dir)/$$inst"; \
  	done
  install-pkgdataDATA: $(pkgdata_DATA)
@@ -30,7 +30,7 @@
  	@$(NORMAL_INSTALL)
  	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
  	@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -597,6 +603,7 @@
+@@ -599,6 +605,7 @@
  	  echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
  	  $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
  	done
diff --git a/security/gnupg1/files/patch-doc:gnupg1.info b/security/gnupg1/files/patch-doc:gnupg1.info
deleted file mode 100644
index ed538f450d65..000000000000
--- a/security/gnupg1/files/patch-doc:gnupg1.info
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/gnupg1.info.orig	Mon Dec 25 12:17:12 2006
-+++ doc/gnupg1.info	Mon Dec 25 12:17:22 2006
-@@ -13,7 +13,7 @@
- 
- INFO-DIR-SECTION GNU Utilities
- START-INFO-DIR-ENTRY
--* gpg: (gpg).            OpenPGP encryption and signing tool (v1).
-+* gpg: (gnupg1).            OpenPGP encryption and signing tool (v1).
- END-INFO-DIR-ENTRY
- 
-