4 files changed, 29 insertions, 33 deletions

diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 70bc4b669c99..3c4b6408d5dc 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	gnupg
-# Date created:		Sep 30, 1998
-# Whom:			kuriyama@FreeBSD.org
-#
 # $FreeBSD$
-#
+# Created by: kuriyama@FreeBSD.org
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.12
+PORTVERSION=	1.4.13
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index 2357f967c989..d49322287a6f 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gnupg-1.4.12.tar.bz2) = 4f03ca6902aaee79d0eda00eea0fefde7db9eb005d8ffd54fac9806bc24050ec
-SIZE (gnupg-1.4.12.tar.bz2) = 3584133
-SHA256 (gnupg-1.4.12.tar.bz2.sig) = 5341c94972cd7ef87444be95756cae07e7d295d7cc674e3507c2dbe19edb0995
-SIZE (gnupg-1.4.12.tar.bz2.sig) = 287
+SHA256 (gnupg-1.4.13.tar.bz2) = 72a24dd318472f0c8f0d00ebe19fb4bcf43e30845bcc92a8ae43c810df295d5a
+SIZE (gnupg-1.4.13.tar.bz2) = 3685873
+SHA256 (gnupg-1.4.13.tar.bz2.sig) = 570b3b34776c7ff17cfce0c21378fb780a0e0a51f7f650c0dfd966927856abee
+SIZE (gnupg-1.4.13.tar.bz2.sig) = 287
diff --git a/security/gnupg1/files/patch-doc:Makefile.in b/security/gnupg1/files/patch-doc:Makefile.in
index 35ea621217b3..6484306fec9e 100644
--- a/security/gnupg1/files/patch-doc:Makefile.in
+++ b/security/gnupg1/files/patch-doc:Makefile.in
@@ -1,15 +1,15 @@
---- doc/Makefile.in.orig	2012-01-30 23:20:15.000000000 +0900
-+++ doc/Makefile.in	2012-01-31 07:29:49.582744237 +0900
-@@ -33,7 +33,7 @@
- # along with this program; if not, see <http://www.gnu.org/licenses/>.
- 
- VPATH = @srcdir@
+--- doc/Makefile.in.orig	2012-12-21 04:30:34.000000000 +0900
++++ doc/Makefile.in	2012-12-21 09:36:23.407499114 +0900
+@@ -50,7 +50,7 @@
+     esac; \
+     test $$am__dry = yes; \
+   }
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/gnupg1
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -316,7 +316,11 @@
+@@ -352,7 +352,11 @@
  
  # Need this to avoid building of dvis with automake 1.4
  DVIS = 
@@ -20,17 +20,17 @@
 +endif
  
  # we can't add gpg.texi gpgv.texi here because automake does not like them to
- # be built files. 
-@@ -603,6 +607,8 @@
- 	  echo " ( cd '$(DESTDIR)$(man7dir)' && rm -f" $$files ")"; \
- 	  cd "$(DESTDIR)$(man7dir)" && rm -f $$files; }
+ # be built files.
+@@ -647,6 +651,8 @@
+ 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ 	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
  install-pkgdataDATA: $(pkgdata_DATA)
 +ifdef NOPORTDOCS
 +else
  	@$(NORMAL_INSTALL)
- 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
  	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-@@ -614,6 +620,7 @@
+ 	if test -n "$$list"; then \
+@@ -661,6 +667,7 @@
  	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
  	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
  	done
diff --git a/security/gnupg1/files/patch-g10:Makefile.in b/security/gnupg1/files/patch-g10:Makefile.in
index a7d5cd00ed5d..3105049e3ab7 100644
--- a/security/gnupg1/files/patch-g10:Makefile.in
+++ b/security/gnupg1/files/patch-g10:Makefile.in
@@ -1,15 +1,15 @@
---- g10/Makefile.in.orig	2012-01-30 23:20:15.000000000 +0900
-+++ g10/Makefile.in	2012-01-31 07:30:57.305617061 +0900
-@@ -35,7 +35,7 @@
- 
- 
- VPATH = @srcdir@
+--- g10/Makefile.in.orig	2012-12-21 04:30:34.000000000 +0900
++++ g10/Makefile.in	2012-12-21 09:37:38.552438682 +0900
+@@ -52,7 +52,7 @@
+     esac; \
+     test $$am__dry = yes; \
+   }
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/gnupg1
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -363,7 +363,11 @@
+@@ -399,7 +399,11 @@
  	@LIBUSB_CPPFLAGS@ $(am__append_1)
  needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
  other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
@@ -21,16 +21,16 @@
  @ENABLE_BZIP2_SUPPORT_FALSE@bzip2_source = 
  @ENABLE_BZIP2_SUPPORT_TRUE@bzip2_source = compress-bz2.c
  common_source = \
-@@ -622,6 +626,8 @@
+@@ -661,6 +665,8 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 +ifdef NOPORTDOCS
 +else
  	@$(NORMAL_INSTALL)
- 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
  	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-@@ -633,6 +639,7 @@
+ 	if test -n "$$list"; then \
+@@ -675,6 +681,7 @@
  	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
  	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
  	done