4 files changed, 10 insertions, 38 deletions

diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 87e3f43afda5..cd7de2e33b31 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTVERSION=	1.0.5
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/%SUBDIR%/ \
 		ftp://pgp.iijlab.net/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/gnupg/&,}
 MASTER_SITE_SUBDIR=	gnupg
-PATCHFILES=	gnupg-1.0.4.security-patch1.diff
-PATCH_SITES=	${MASTER_SITES}
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index d6f0e93b5858..41de463a8b4c 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1,2 +1 @@
-MD5 (gnupg-1.0.4.tar.gz) = bef2267bfe9b74a00906a78db34437f9
-MD5 (gnupg-1.0.4.security-patch1.diff) = 4d7b547a7b85a877ad165a3a29ae08e5
+MD5 (gnupg-1.0.5.tar.gz) = 44c71c3f5a9edbf5738cafc37e8359e6
diff --git a/security/gnupg1/files/patch-misc.c b/security/gnupg1/files/patch-misc.c
deleted file mode 100644
index 4520e0045b72..000000000000
--- a/security/gnupg1/files/patch-misc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-Hi,
-
-some folks asked what the message
-
-  gpg: this cipher algorithm is depreciated; please use a more standard one!
-
-does mean.  Yes, gpg 1.0.4 should not emit this message.  I forgot
-to put the AES cipher algorithm into the list of "good" algorithms.
-
-Either ignore this message or apply the patch below.
-
-  Werner
-
-
-Index: g10/misc.c
-===================================================================
-RCS file: /home/koch/cvs/gnupg/g10/misc.c,v
-retrieving revision 1.16.2.4
-diff -u -r1.16.2.4 misc.c
---- g10/misc.c	2000/10/13 15:03:48	1.16.2.4
-+++ g10/misc.c	2000/10/18 13:34:01
-@@ -224,6 +224,9 @@
- 	     || algo == CIPHER_ALGO_CAST5
- 	     || algo == CIPHER_ALGO_BLOWFISH
- 	     || algo == CIPHER_ALGO_TWOFISH
-+	     || algo == CIPHER_ALGO_RIJNDAEL
-+	     || algo == CIPHER_ALGO_RIJNDAEL192
-+	     || algo == CIPHER_ALGO_RIJNDAEL256
- 	   )
- 	;
-     else {
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index 8ef7e4db9466..3ec7bf8ebaf7 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -1,5 +1,7 @@
 bin/gpg
 bin/gpgv
+info/gpg.info
+info/gpgv.info
 lib/gnupg/rndegd
 lib/gnupg/rndunix
 lib/gnupg/tiger
@@ -10,6 +12,7 @@ share/locale/da/LC_MESSAGES/gnupg.mo
 share/locale/de/LC_MESSAGES/gnupg.mo
 share/locale/eo/LC_MESSAGES/gnupg.mo
 share/locale/es_ES/LC_MESSAGES/gnupg.mo
+share/locale/et/LC_MESSAGES/gnupg.mo
 share/locale/fr/LC_MESSAGES/gnupg.mo
 share/locale/id/LC_MESSAGES/gnupg.mo
 share/locale/it/LC_MESSAGES/gnupg.mo
@@ -20,6 +23,7 @@ share/locale/pt_BR/LC_MESSAGES/gnupg.mo
 share/locale/pt_PT/LC_MESSAGES/gnupg.mo
 share/locale/ru/LC_MESSAGES/gnupg.mo
 share/locale/sv/LC_MESSAGES/gnupg.mo
+share/locale/tr/LC_MESSAGES/gnupg.mo
 share/doc/gnupg/README
 share/doc/gnupg/DETAILS
 share/doc/gnupg/FAQ
@@ -41,6 +45,8 @@ share/doc/gnupg/VERSION
 @unexec rmdir %D/share/locale/da 2>/dev/null || true
 @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/et 2>/dev/null || true
 @unexec rmdir %D/share/locale/es_ES/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/es_ES 2>/dev/null || true
 @unexec rmdir %D/share/locale/eo/LC_MESSAGES 2>/dev/null || true
@@ -65,5 +71,7 @@ share/doc/gnupg/VERSION
 @unexec rmdir %D/share/locale/ru 2>/dev/null || true
 @unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/tr 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
 @dirrm share/doc/gnupg