update to 6.5.8.

PR:		21656
Submitted by:	Cy Schubert <cschuber@uumail.gov.bc.ca>
maintainer seems unreachable:
<mike@fate.com>: host fate.com[192.153.249.5] said: 550 <mike@fate.com>...
    Relaying denied

3 files changed, 50 insertions, 35 deletions

diff --git a/security/pgp6/Makefile b/security/pgp6/Makefile
index bc853741b9c1..242b62a71925 100644
--- a/security/pgp6/Makefile
+++ b/security/pgp6/Makefile
@@ -6,31 +6,45 @@
 #
 
 PORTNAME=	pgp
-PORTVERSION=	6.5.1i
+PORTVERSION=	6.5.8
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.no.pgpi.org/pub/pgp/6.5/6.5.1i/unix/ \
-		ftp://ftp.fi.pgpi.org/pub/pgp/6.5/6.5.1i/unix/ \
-		ftp://ftp.se.pgpi.org/pub/pgp/6.5/6.5.1i/unix/ \
-		ftp://ftp.de.pgpi.org/pub/pgp/6.5/6.5.1i/unix/ \
-		ftp://ftp.dk.pgpi.org/pub/pgp/6.5/6.5.1i/unix/ \
-		ftp://ftp.nl.pgpi.org/pub/pgp/6.5/6.5.1i/unix/ \
-		ftp://ftp.ch.pgpi.org/pub/pgp/6.5/6.5.1i/unix/ \
-		ftp://ftp.ru.pgpi.org/pub/pgp/6.5/6.5.1i/unix/
-EXTRACT_SUFX=	-beta2.tar.gz
+MASTER_SITES=	ftp://ftp.no.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/ \
+		ftp://ftp.fi.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/ \
+		ftp://ftp.se.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/ \
+		ftp://ftp.de.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/ \
+		ftp://ftp.dk.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/ \
+		ftp://ftp.nl.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/ \
+		ftp://ftp.ch.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/ \
+		ftp://ftp.jp.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/ \
+		ftp://ftp.ru.pgpi.org/pub/pgp/${PORTVERSION:R}/${PORTVERSION}/
+DISTNAME=	pgpsrc658unix
 
 MAINTAINER=	mike@fate.com
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/pgpsrc
 USE_GMAKE=	yes
 
 RESTRICTED=	"Crypto"
 
 MAN1=		pgp.1
 
-do-install:
-	cd ${WRKSRC}/clients/pgp/cmdline ; ${GMAKE} install
-
+# the distfile is actually a tar of three compressed tars and their
+# signatures
 post-extract:
-	${CP} ${FILESDIR}/build.Makefile ${WRKDIR}/${PKGNAME}/Makefile
+	cd ${WRKDIR} && \
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.tar.gz \
+		${EXTRACT_AFTER_ARGS} && \
+	${RM} ${DISTNAME}.tar.gz ${DISTNAME}.tar.gz.sig
+.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
+	if [ `id -u` = 0 ]; then \
+		${CHMOD} -R ug-s ${WRKDIR}; \
+		${CHOWN} -R 0:0 ${WRKDIR}; \
+	fi
+.endif
+	${CP} ${FILESDIR}/build.Makefile ${WRKSRC}/Makefile
+
+do-install:
+	cd ${WRKSRC}/clients/pgp/cmdline ; ${GMAKE} install ; \
+	${INSTALL_MAN} packaging/pgp-6.0/man/man1/pgp.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/pgp6/distinfo b/security/pgp6/distinfo
index 1eccdf7cfd96..d60a1d35e5d4 100644
--- a/security/pgp6/distinfo
+++ b/security/pgp6/distinfo
@@ -1 +1 @@
-MD5 (pgp-6.5.1i-beta2.tar.gz) = ccfbd70fd0e08a8c13e9c15ea1db085a
+MD5 (pgpsrc658unix.tar.gz) = f8fca2bd514f291d9a6e0ce2cddd3e34
diff --git a/security/pgp6/files/patch-ap b/security/pgp6/files/patch-ap
index 0df2d5b005da..a5386cd9acc4 100644
--- a/security/pgp6/files/patch-ap
+++ b/security/pgp6/files/patch-ap
@@ -1,19 +1,20 @@
-*** clients/pgp/cmdline/Makefile.in	2000/01/26 03:55:17	1.1
---- clients/pgp/cmdline/Makefile.in	2000/01/26 03:55:41	1.2
-***************
-*** 51,57 ****
-  CFLAGS=@CFLAGS@
-  LDFLAGS=@LDFLAGS@
-  
-! CFLAGS+= -g
-  
-  TARGET=pgp
-  
---- 51,57 ----
-  CFLAGS=@CFLAGS@
-  LDFLAGS=@LDFLAGS@
-  
-! CFLAGS+= -g -pthread
-  
-  TARGET=pgp
-  
+--- clients/pgp/cmdline/Makefile.in.orig	Fri Sep  1 14:11:16 2000
++++ clients/pgp/cmdline/Makefile.in	Fri Sep 29 21:06:48 2000
+@@ -48,7 +48,7 @@
+         -I$(SDKDIR)/priv/include/opaque \
+         -I$(RSAINC)
+ 
+-LIBDIRS+=-L$(PFLDIR) -L$(SDKDIR)/unix -L$(RSALIBRARY)$(RSA_OS)
++LIBDIRS+=-L$(PFLDIR) -L$(SDKDIR)/unix
+ 
+ LIBS=-lPGPui -lPGPsdkNetwork -lPGPsdk -lpfl @THREADLIB@ $(RSALIBS) @LIBS@
+ 
+@@ -73,7 +73,7 @@
+ CFLAGS=@CFLAGS@
+ LDFLAGS=@LDFLAGS@
+ 
+-CFLAGS+= -g
++CFLAGS+= -g -pthread
+ 
+ TARGET=pgp
+