- Chase security/gnupg upgrade (but still 1.4.6) after repocopy.

  (not connected in ../Makefile)
- Tweak installation directory for documents to avoid conflict against
  coming gnupg upgrade (2.0.1).

I'm still testing my patch to upgrade to 2.0.1, so please wait. :-)

7 files changed, 43 insertions, 25 deletions

diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 902f7dcefaf7..63c5c7cb2978 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.5
-PORTREVISION=	2
+PORTVERSION=	1.4.6
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -21,13 +20,16 @@ USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
 .if ${MACHINE_CPU:Mi586}
 MACHINE_ARCH=	i586
 .endif
 CFLAGS:=	${CFLAGS:S/-pipe//g}
 MAN1=		gpg.1 gpgv.1 gpg.ru.1
 MAN7=		gnupg.7
-INFO=		gpg gpgv
+INFO=		gnupg1
+DOCSDIR=	${PREFIX}/share/doc/gnupg1
+LATEST_LINK=	gnupg1
 
 PORTDOCS=	*
 
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index b40c93e6faf9..3bb0d5afe9de 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnupg-1.4.5.tar.bz2) = 811525965b4c0987e6418a7729a6444d
-SHA256 (gnupg-1.4.5.tar.bz2) = f30a2679ed6bed71b4af6919cd9b963c896fca64e42eeb0536788cb41b2e1805
-SIZE (gnupg-1.4.5.tar.bz2) = 3089617
-MD5 (gnupg-1.4.5.tar.bz2.sig) = 5e34f226515d46d2c6c7a56ad1d95c1e
-SHA256 (gnupg-1.4.5.tar.bz2.sig) = e0284086b4468f5b9970fe2adb7cd632be69693f5590e7c9a27f9271fb8497a2
-SIZE (gnupg-1.4.5.tar.bz2.sig) = 158
+MD5 (gnupg-1.4.6.tar.bz2) = ec8dc6df1bd83c1d7e1a1ea10653f9f4
+SHA256 (gnupg-1.4.6.tar.bz2) = fd5a72418e55669b88076c2a6f11c3a59bf92a2071008567e65ae12b7372008e
+SIZE (gnupg-1.4.6.tar.bz2) = 3149454
+MD5 (gnupg-1.4.6.tar.bz2.sig) = 8b905292140d60fe493fab7d5b22c96d
+SHA256 (gnupg-1.4.6.tar.bz2.sig) = fb9294762932b34f2fd5a4b168f4c3a248aa7403c2aed8bffa5f67274b1b052d
+SIZE (gnupg-1.4.6.tar.bz2.sig) = 158
diff --git a/security/gnupg1/files/patch-configure b/security/gnupg1/files/patch-configure
new file mode 100644
index 000000000000..52fae6b7c7dc
--- /dev/null
+++ b/security/gnupg1/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Dec  8 17:02:30 2006
++++ configure	Fri Dec  8 17:02:52 2006
+@@ -27251,6 +27251,7 @@
+ exec_prefix=$exec_prefix
+ libdir=$libdir
+ libexecdir=$libexecdir
++datarootdir=$datarootdir
+ datadir=$datadir
+ DATADIRNAME=$DATADIRNAME
+ 
diff --git a/security/gnupg1/files/patch-doc:Makefile.in b/security/gnupg1/files/patch-doc:Makefile.in
new file mode 100644
index 000000000000..31695a542984
--- /dev/null
+++ b/security/gnupg1/files/patch-doc:Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Tue Aug  1 19:41:48 2006
++++ doc/Makefile.in	Mon Dec  4 09:34:23 2006
+@@ -35,7 +35,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/gnupg1
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
diff --git a/security/gnupg1/files/patch-g10:Makefile.in b/security/gnupg1/files/patch-g10:Makefile.in
new file mode 100644
index 000000000000..a5f512103295
--- /dev/null
+++ b/security/gnupg1/files/patch-g10:Makefile.in
@@ -0,0 +1,11 @@
+--- g10/Makefile.in.orig	Mon Dec  4 09:50:35 2006
++++ g10/Makefile.in	Mon Dec  4 09:50:46 2006
+@@ -36,7 +36,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/gnupg1
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
diff --git a/security/gnupg1/files/patch-openfile.c b/security/gnupg1/files/patch-openfile.c
index 833b06cdafbf..e69de29bb2d1 100644
--- a/security/gnupg1/files/patch-openfile.c
+++ b/security/gnupg1/files/patch-openfile.c
@@ -1,12 +0,0 @@
---- g10/openfile.c.orig	Tue Nov 28 07:13:53 2006
-+++ g10/openfile.c	Tue Nov 28 07:18:30 2006
-@@ -144,8 +144,8 @@
- 
-     s = _("Enter new filename");
- 
--    n = strlen(s) + namelen + 10;
-     defname = name && namelen? make_printable_string( name, namelen, 0): NULL;
-+    n = strlen(s) + (defname?strlen (defname):0) + 10;
-     prompt = xmalloc(n);
-     if( defname )
- 	sprintf(prompt, "%s [%s]: ", s, defname );
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index 5c2eb14f590a..3db11f3d783f 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -7,9 +7,6 @@ libexec/gnupg/gpgkeys_curl
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
 @dirrm libexec/gnupg
-%%DATADIR%%/FAQ
-%%DATADIR%%/faq.html
-%%DATADIR%%/options.skel
 %%NLS%%share/locale/be/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gnupg.mo
@@ -39,7 +36,6 @@ libexec/gnupg/gpgkeys_hkp
 %%NLS%%share/locale/tr/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
-@dirrm %%DATADIR%%
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
 @dirrmtry share/locale/ca/LC_MESSAGES