- Upgrade to 1.14.12 (minor bugfixes).

5 files changed, 30 insertions, 29 deletions

diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index ae9a96fc8cf0..70bc4b669c99 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.11
+PORTVERSION=	1.4.12
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index a6f1d8172314..2357f967c989 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gnupg-1.4.11.tar.bz2) = d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
-SIZE (gnupg-1.4.11.tar.bz2) = 3407075
-SHA256 (gnupg-1.4.11.tar.bz2.sig) = 403f14d944003058eb192a0453fbe43ae9302676cebdac776c2fe86ed40b75b0
-SIZE (gnupg-1.4.11.tar.bz2.sig) = 158
+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
diff --git a/security/gnupg1/files/patch-doc:Makefile.in b/security/gnupg1/files/patch-doc:Makefile.in
index ad4f7473b801..35ea621217b3 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	2010-10-18 18:53:58.000000000 +0900
-+++ doc/Makefile.in	2010-10-19 09:00:24.995576212 +0900
-@@ -32,7 +32,7 @@
+--- 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@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/gnupg1
- pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -299,7 +299,11 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -316,7 +316,11 @@
  
  # Need this to avoid building of dvis with automake 1.4
  DVIS = 
@@ -21,18 +21,18 @@
  
  # we can't add gpg.texi gpgv.texi here because automake does not like them to
  # be built files. 
-@@ -591,6 +595,8 @@
- 	  rm -f "$(DESTDIR)$(man7dir)/$$inst"; \
- 	done
+@@ -603,6 +607,8 @@
+ 	  echo " ( cd '$(DESTDIR)$(man7dir)' && rm -f" $$files ")"; \
+ 	  cd "$(DESTDIR)$(man7dir)" && rm -f $$files; }
  install-pkgdataDATA: $(pkgdata_DATA)
 +ifdef NOPORTDOCS
 +else
  	@$(NORMAL_INSTALL)
  	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- 	@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -599,6 +605,7 @@
- 	  echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
- 	  $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+@@ -614,6 +620,7 @@
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
  	done
 +endif
  
diff --git a/security/gnupg1/files/patch-g10:Makefile.in b/security/gnupg1/files/patch-g10:Makefile.in
index 56df6cf92d06..a7d5cd00ed5d 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	2008-03-27 02:30:47.000000000 +0900
-+++ g10/Makefile.in	2008-08-11 11:39:26.000000000 +0900
-@@ -34,7 +34,7 @@
+--- 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@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/gnupg1
- pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -346,7 +346,11 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -363,7 +363,11 @@
  	@LIBUSB_CPPFLAGS@ $(am__append_1)
  needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
  other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
@@ -21,7 +21,7 @@
  @ENABLE_BZIP2_SUPPORT_FALSE@bzip2_source = 
  @ENABLE_BZIP2_SUPPORT_TRUE@bzip2_source = compress-bz2.c
  common_source = \
-@@ -590,6 +594,8 @@
+@@ -622,6 +626,8 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
@@ -29,10 +29,10 @@
 +else
  	@$(NORMAL_INSTALL)
  	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- 	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
-@@ -598,6 +604,7 @@
- 	  echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
- 	  $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+@@ -633,6 +639,7 @@
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
  	done
 +endif
  
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index a8878f94030b..456c3a8b60ba 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -35,6 +35,7 @@ libexec/gnupg/gpgkeys_hkp
 %%NLS%%share/locale/sk/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/gnupg.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
 @unexec [ -r %D/bin/gpg2 ] && ln -s gpg2 %D/bin/gpg || true