From 6baef942fd82a9f7a1351cb39f5e23b5c3707a41 Mon Sep 17 00:00:00 2001
From: marc <marc@openbsd.org>
Date: Wed, 6 Sep 2000 17:26:28 +0000
Subject: [PATCH] Remove intl and usa flavors.  There is now a single world
 wide version (RSA Security Inc. placed its public key encryption algorithm
 into the public domain, today).

---
 security/pgp/Makefile    | 38 +-------------------------------------
 security/pgp/pkg/COMMENT |  2 +-
 security/pgp/pkg/DESCR   | 20 ++++++--------------
 3 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 4c24cf22fe0..cebf3b491db 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2000/05/31 12:09:38 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2000/09/06 17:26:28 marc Exp $
 
 DISTNAME=       pgp263is
 PKGNAME=	pgp-2.6.3
@@ -22,47 +22,11 @@ FAKE=		Yes
 
 FLAVORS=	usa intl
 
-.if defined(USA_RESIDENT)
-.if ${USA_RESIDENT:L} == "yes"
-FLAVOR=usa
-.elif ${USA_RESIDENT:L} == "no"
-FLAVOR=intl
-.endif
-.endif
-
-# No default flavor, error.
-FLAVOR?=
-.if empty(FLAVOR)
-pre-fetch pre-extract:
-	@echo ""
-	@echo "The variable USA_RESIDENT must be set to either Yes or No"
-	@echo "in order to build this package.  USA residents that are"
-	@echo "not licensees of the RSA algorithm MUST set this variable"
-	@echo "to Yes.  Users outside the USA MUST set this variable to"
-	@echo "No.  Licensees may choose -- No is faster."
-	@echo ""
-	@echo "RSAREF2 will be automatically obtained and used to generate"
-	@echo "this program when given the command \"make USA_RESIDENT=Yes\""
-	@echo ""
-	@echo "The new port flavor system also allows you to use "
-	@echo "FLAVOR=usa or FLAVOR=intl"
-	@false
-.endif
-
-
 # common C flags
 CFLAGS+=-DUNIX -DPORTABLE -DMERIT -DIDEA32 -DMAX_NAMELEN=255 \
 	-DPGP_DOC_DIR=\\\"${PGP_DOC_DIR}\\\"
 
-.if ${FLAVOR:L} == "usa"
-LIB_DEPENDS=	rsaref.2::security/rsaref
-RSAOBJS= rsaglue2.o
-RSAINCDIR= -I${LOCALBASE}/include
-RSALIBS= -L${LOCALBASE}/lib -lrsaref
-CFLAGS+= -DUSA ${RSAINCDIR}
-.else
 RSAOBJS= rsaglue1.o
-.endif
 
 PGP_DOC_DIR=	${PREFIX}/share/doc/pgp
 
diff --git a/security/pgp/pkg/COMMENT b/security/pgp/pkg/COMMENT
index 78f21c7a951..605d1384090 100644
--- a/security/pgp/pkg/COMMENT
+++ b/security/pgp/pkg/COMMENT
@@ -1 +1 @@
-Intl and US versions of Pretty Good Privacy 2.6.3[i]a
+Pretty Good Privacy 2.6.3ia
diff --git a/security/pgp/pkg/DESCR b/security/pgp/pkg/DESCR
index b77497c4c77..2be0a80c2ce 100644
--- a/security/pgp/pkg/DESCR
+++ b/security/pgp/pkg/DESCR
@@ -1,18 +1,10 @@
-	    Pretty Good Privacy version 2.6.3ia (international)
-	    Pretty Good Privacy version 2.6.3a  (united states)
+	    Pretty Good Privacy version 2.6.3ia (world wide use)
 
-PGP 2.6.3[i]a is not an official PGP version. It is based on the source
-code for MIT PGP 2.6.2 and has been modified for international use. PGP
-2.6.3i (international) is probably illegal to use within the USA, but is
-fine in almost every other country in the world.  PGP 2.6.3a can be
-compiled from the same source and is legal even inside the USA.
-
-All changes in the source that are not applicable within the USA are
-enclosed in #ifdef's, thus enabling you to compile a PGP version that is
-legal to use within the USA. This is accomplished by adding the -DUSA
-option when building the program, and by linking it with the RSAREF
-library (rsaglue2) rather than MPILIB (rsaglue1).   When compiled this
-way PGP will identify itself as 2.6.3a.
+PGP 2.6.3ia is not an official PGP version. It is based on the source
+code for MIT PGP 2.6.2 and has been modified for world wide use. PGP
+2.6.3i (international) is legal in the United States after September
+6, 2000 (when RSA Security, Inc. placed its public key encryption
+algorithm in the public domain).
 
 For a more thorough installation and usage guide, refer to the file
 setup.doc and the documentation for PGP 2.6.2, which is included