10 files changed, 118 insertions, 178 deletions
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index d039196ae4c2..d102f3f1a78c 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,83 +1,27 @@
-# New ports collection makefile for: pgp
-# Version required:     MIT 2.6.2 / International 2.6.3ia
+# New ports collection makefile for: pgp5
+# Version required:     International PGP 5.0
 # International PGP homepage is http://www.ifi.uio.no/pgp/
 #
-# Date created:         8 Jul 1995
-# Whom:                 ache
+# Date created:         10 Feb 1998
+# Whom:                 markm
 #
-# $Id: Makefile,v 1.19 1997/02/02 21:45:31 ache Exp $
+# $Id$
 #
 
-# Pick an initial default, else it doesn't get set in the INDEX.
-DISTNAME=	pgp262s
+DISTNAME=	pgp50i
+PKGNAME=	pgp-5.0i
 CATEGORIES=	security
-
-MAINTAINER=	ache@FreeBSD.ORG
-
-# Need to define USA_RESIDENT to YES or NO
-IS_INTERACTIVE=	YES
-RESTRICTED=     "Crypto"
-MAKEFILE=       makefile
-ALL_TARGET=     freebsd
-PGPLIB=         ${PREFIX}/lib/pgp
-MAN1=		pgp.1
-
-do-install:
-	cd ${WRKSRC}; install -c -o bin -g bin -m 555 pgp ${PREFIX}/bin
-	cd ${WRKSRC}/../doc; \
-		  install -c -o bin -g bin -m 444 pgp.1 ${PREFIX}/man/man1
-	-mkdir -p ${PGPLIB}
-	chown bin.bin ${PGPLIB}
-	chmod 555 ${PGPLIB}
-	cd ${WRKSRC}/..; \
-	    install -c -o bin -g bin -m 444 pgp.hlp \
-			      doc/pgpdoc1.txt doc/pgpdoc2.txt ${PGPLIB}; \
-	    [ -f ${PGPLIB}/language.txt ] || \
-		      install -c -o bin -g bin -m 444 language.txt ${PGPLIB}; \
-	    [ -f ${PGPLIB}/config.txt ] || \
-		      install -c -o bin -g bin -m 444 config.txt ${PGPLIB}
-	-${PREFIX}/bin/pgp > /dev/null  2>&1  # update .idx file
-
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
-pre-fetch:
-	@echo
-	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
-	@echo or to NO, if you aren\'t USA resident to build this package
-	@false
-.elif defined(USA_RESIDENT)
-.if ${USA_RESIDENT} == YES
-DISTNAME=       pgp262s
-PKGNAME=	pgp-2.6.2
-MASTER_SITES=   ftp://utopia.hacktic.nl/pub/replay/pub/pgp/unix/ \
-		ftp://sable.ox.ac.uk/pub/crypto/pgp/unix/
-EXTRACT_SUFX=   .zip
-WRKSRC=         ${WRKDIR}/src
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS+=   rsaref\\.2\\.0:${PORTSDIR}/security/rsaref
-EXTRACT_CMD=    unzip
-EXTRACT_ARGS=   -q
-FILESDIR=       ${.CURDIR}/files.usa
-PATCHDIR=       ${.CURDIR}/patches.usa
-
-post-extract:
-	cd ${WRKDIR}; $(EXTRACT_CMD) $(EXTRACT_ARGS) -aa $(DISTNAME)i
-	cd ${WRKDIR}; rm -f *.zip
-
-.else
-DISTNAME=       pgp263is
-PKGNAME=        pgp-2.6.3ia
-MASTER_SITES=   ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
-		ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
-WRKSRC=         ${WRKDIR}/src
-FILESDIR=       ${.CURDIR}/files.non_usa
-PATCHDIR=       ${.CURDIR}/patches.non_usa
-
-post-extract:
-	cd ${WRKDIR}; $(EXTRACT_CMD) -xf pgp263ii.tar; \
-		rm -f pgp263ii.tar
-
-.endif
-.endif
+MASTER_SITES=   ftp://ftp.ifi.uio.no/pub/pgp/5.0/international/unix/ \
+		ftp.doc.ic.ac.uk/pub/Mirrors/ftp.ifi.uio.no/pub/pgp/5.0/international/unix/
+EXTRACT_SUFX=   -unix-src.tar.gz
+
+MAINTAINER=	markm@FreeBSD.ORG
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS= --prefix=${PREFIX}
+MAN1=		pgp.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
+MAN5=		pgp.cfg.5
+MAN7=		pgp-integration.7 pgp-intro.7
 
 .include <bsd.port.mk>
diff --git a/security/pgp5/distinfo b/security/pgp5/distinfo
index fd9280e3c215..473539d67ca3 100644
--- a/security/pgp5/distinfo
+++ b/security/pgp5/distinfo
@@ -1 +1 @@
-MD5 (pgp263is.tar.gz) = 73bbb87b8c77debcf9de3b9d49902892
+MD5 (pgp50i-unix-src.tar.gz) = 7a01203f0053aa78a781367461d52187
diff --git a/security/pgp5/pkg-comment b/security/pgp5/pkg-comment
index 76960df3574b..3a41939785b3 100644
--- a/security/pgp5/pkg-comment
+++ b/security/pgp5/pkg-comment
@@ -1 +1 @@
-PGP MIT or International version - Public-Key encryption for the masses
+Public-Key encryption for the masses
diff --git a/security/pgp5/pkg-descr b/security/pgp5/pkg-descr
index a034cf7afce6..969c174a8f15 100644
--- a/security/pgp5/pkg-descr
+++ b/security/pgp5/pkg-descr
@@ -1,7 +1,18 @@
-PGP (Pretty Good Privacy) is a public key encryption pack-
-age to protect E-mail and data files.  It lets you  commu-
-nicate  securely  with  people  you've  never met, with no
-secure channels needed for prior exchange of  keys.   It's
-well featured and fast, with sophisticated key management,
-digital signatures, data compression, and  good  ergonomic
-design.
+This is PGP 5.0, a significant step forward from 2.6.*
+
+CHANGES:
+
+There are a number of large changes from the 2.6.2 distribution.  Most
+notable is that the command line has changed substantially.  See
+the pgp(1) man page for a discussion of how to use the new command
+line.
+
+Also, to allow easy interoperation with older versions on the same
+system, a number of filename changes have been made.
+
+NEW FEATURES:
+
+PGP 5.0 contains support for new encryption methods (most notably
+DSS/Diffie-Hellman), and built-in keyserver support.  Also, the
+command line has been redesigned to be more Unix and scripting
+friendly.
diff --git a/security/pgp5/pkg-plist b/security/pgp5/pkg-plist
index 49c8b7d548d1..d88268bdb449 100644
--- a/security/pgp5/pkg-plist
+++ b/security/pgp5/pkg-plist
@@ -1,7 +1,22 @@
 bin/pgp
+bin/pgpe
+bin/pgps
+bin/pgpv
+bin/pgp_old
+bin/pgpk
+lib/libbn.a
+@exec ranlib %D/%F
+lib/libpgp.a
+@exec ranlib %D/%F
+lib/libpgptty.a
+@exec ranlib %D/%F
+lib/libsimple.a
+@exec ranlib %D/%F
 man/man1/pgp.1.gz
-lib/pgp/pgp.hlp
-lib/pgp/pgpdoc1.txt
-lib/pgp/pgpdoc2.txt
-lib/pgp/language.txt
-lib/pgp/config.txt
+man/man1/pgpe.1.gz
+man/man1/pgpk.1.gz
+man/man1/pgps.1.gz
+man/man1/pgpv.1.gz
+man/man5/pgp.cfg.5.gz
+man/man7/pgp-integration.7.gz
+man/man7/pgp-intro.7.gz
diff --git a/security/pgp6/Makefile b/security/pgp6/Makefile
index d039196ae4c2..d102f3f1a78c 100644
--- a/security/pgp6/Makefile
+++ b/security/pgp6/Makefile
@@ -1,83 +1,27 @@
-# New ports collection makefile for: pgp
-# Version required:     MIT 2.6.2 / International 2.6.3ia
+# New ports collection makefile for: pgp5
+# Version required:     International PGP 5.0
 # International PGP homepage is http://www.ifi.uio.no/pgp/
 #
-# Date created:         8 Jul 1995
-# Whom:                 ache
+# Date created:         10 Feb 1998
+# Whom:                 markm
 #
-# $Id: Makefile,v 1.19 1997/02/02 21:45:31 ache Exp $
+# $Id$
 #
 
-# Pick an initial default, else it doesn't get set in the INDEX.
-DISTNAME=	pgp262s
+DISTNAME=	pgp50i
+PKGNAME=	pgp-5.0i
 CATEGORIES=	security
-
-MAINTAINER=	ache@FreeBSD.ORG
-
-# Need to define USA_RESIDENT to YES or NO
-IS_INTERACTIVE=	YES
-RESTRICTED=     "Crypto"
-MAKEFILE=       makefile
-ALL_TARGET=     freebsd
-PGPLIB=         ${PREFIX}/lib/pgp
-MAN1=		pgp.1
-
-do-install:
-	cd ${WRKSRC}; install -c -o bin -g bin -m 555 pgp ${PREFIX}/bin
-	cd ${WRKSRC}/../doc; \
-		  install -c -o bin -g bin -m 444 pgp.1 ${PREFIX}/man/man1
-	-mkdir -p ${PGPLIB}
-	chown bin.bin ${PGPLIB}
-	chmod 555 ${PGPLIB}
-	cd ${WRKSRC}/..; \
-	    install -c -o bin -g bin -m 444 pgp.hlp \
-			      doc/pgpdoc1.txt doc/pgpdoc2.txt ${PGPLIB}; \
-	    [ -f ${PGPLIB}/language.txt ] || \
-		      install -c -o bin -g bin -m 444 language.txt ${PGPLIB}; \
-	    [ -f ${PGPLIB}/config.txt ] || \
-		      install -c -o bin -g bin -m 444 config.txt ${PGPLIB}
-	-${PREFIX}/bin/pgp > /dev/null  2>&1  # update .idx file
-
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
-pre-fetch:
-	@echo
-	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
-	@echo or to NO, if you aren\'t USA resident to build this package
-	@false
-.elif defined(USA_RESIDENT)
-.if ${USA_RESIDENT} == YES
-DISTNAME=       pgp262s
-PKGNAME=	pgp-2.6.2
-MASTER_SITES=   ftp://utopia.hacktic.nl/pub/replay/pub/pgp/unix/ \
-		ftp://sable.ox.ac.uk/pub/crypto/pgp/unix/
-EXTRACT_SUFX=   .zip
-WRKSRC=         ${WRKDIR}/src
-BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
-BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS+=   rsaref\\.2\\.0:${PORTSDIR}/security/rsaref
-EXTRACT_CMD=    unzip
-EXTRACT_ARGS=   -q
-FILESDIR=       ${.CURDIR}/files.usa
-PATCHDIR=       ${.CURDIR}/patches.usa
-
-post-extract:
-	cd ${WRKDIR}; $(EXTRACT_CMD) $(EXTRACT_ARGS) -aa $(DISTNAME)i
-	cd ${WRKDIR}; rm -f *.zip
-
-.else
-DISTNAME=       pgp263is
-PKGNAME=        pgp-2.6.3ia
-MASTER_SITES=   ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
-		ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
-WRKSRC=         ${WRKDIR}/src
-FILESDIR=       ${.CURDIR}/files.non_usa
-PATCHDIR=       ${.CURDIR}/patches.non_usa
-
-post-extract:
-	cd ${WRKDIR}; $(EXTRACT_CMD) -xf pgp263ii.tar; \
-		rm -f pgp263ii.tar
-
-.endif
-.endif
+MASTER_SITES=   ftp://ftp.ifi.uio.no/pub/pgp/5.0/international/unix/ \
+		ftp.doc.ic.ac.uk/pub/Mirrors/ftp.ifi.uio.no/pub/pgp/5.0/international/unix/
+EXTRACT_SUFX=   -unix-src.tar.gz
+
+MAINTAINER=	markm@FreeBSD.ORG
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS= --prefix=${PREFIX}
+MAN1=		pgp.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
+MAN5=		pgp.cfg.5
+MAN7=		pgp-integration.7 pgp-intro.7
 
 .include <bsd.port.mk>
diff --git a/security/pgp6/distinfo b/security/pgp6/distinfo
index fd9280e3c215..473539d67ca3 100644
--- a/security/pgp6/distinfo
+++ b/security/pgp6/distinfo
@@ -1 +1 @@
-MD5 (pgp263is.tar.gz) = 73bbb87b8c77debcf9de3b9d49902892
+MD5 (pgp50i-unix-src.tar.gz) = 7a01203f0053aa78a781367461d52187
diff --git a/security/pgp6/pkg-comment b/security/pgp6/pkg-comment
index 76960df3574b..3a41939785b3 100644
--- a/security/pgp6/pkg-comment
+++ b/security/pgp6/pkg-comment
@@ -1 +1 @@
-PGP MIT or International version - Public-Key encryption for the masses
+Public-Key encryption for the masses
diff --git a/security/pgp6/pkg-descr b/security/pgp6/pkg-descr
index a034cf7afce6..969c174a8f15 100644
--- a/security/pgp6/pkg-descr
+++ b/security/pgp6/pkg-descr
@@ -1,7 +1,18 @@
-PGP (Pretty Good Privacy) is a public key encryption pack-
-age to protect E-mail and data files.  It lets you  commu-
-nicate  securely  with  people  you've  never met, with no
-secure channels needed for prior exchange of  keys.   It's
-well featured and fast, with sophisticated key management,
-digital signatures, data compression, and  good  ergonomic
-design.
+This is PGP 5.0, a significant step forward from 2.6.*
+
+CHANGES:
+
+There are a number of large changes from the 2.6.2 distribution.  Most
+notable is that the command line has changed substantially.  See
+the pgp(1) man page for a discussion of how to use the new command
+line.
+
+Also, to allow easy interoperation with older versions on the same
+system, a number of filename changes have been made.
+
+NEW FEATURES:
+
+PGP 5.0 contains support for new encryption methods (most notably
+DSS/Diffie-Hellman), and built-in keyserver support.  Also, the
+command line has been redesigned to be more Unix and scripting
+friendly.
diff --git a/security/pgp6/pkg-plist b/security/pgp6/pkg-plist
index 49c8b7d548d1..d88268bdb449 100644
--- a/security/pgp6/pkg-plist
+++ b/security/pgp6/pkg-plist
@@ -1,7 +1,22 @@
 bin/pgp
+bin/pgpe
+bin/pgps
+bin/pgpv
+bin/pgp_old
+bin/pgpk
+lib/libbn.a
+@exec ranlib %D/%F
+lib/libpgp.a
+@exec ranlib %D/%F
+lib/libpgptty.a
+@exec ranlib %D/%F
+lib/libsimple.a
+@exec ranlib %D/%F
 man/man1/pgp.1.gz
-lib/pgp/pgp.hlp
-lib/pgp/pgpdoc1.txt
-lib/pgp/pgpdoc2.txt
-lib/pgp/language.txt
-lib/pgp/config.txt
+man/man1/pgpe.1.gz
+man/man1/pgpk.1.gz
+man/man1/pgps.1.gz
+man/man1/pgpv.1.gz
+man/man5/pgp.cfg.5.gz
+man/man7/pgp-integration.7.gz
+man/man7/pgp-intro.7.gz