Remove intl/usa flavors as one port is OK for world wide use after

6 Sep 2000 (when RSA Security Inc. placed its public key encryption
algorithm into the public domain).   Remove configure patch that
added the no-longer-needed --with-rsaref option

security/pgp5/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2000/07/25 10:13:39 brad Exp $
+# $OpenBSD: Makefile,v 1.22 2000/09/06 18:14:04 marc Exp $
 
 DISTNAME=	pgp50i-unix-src
 PKGNAME=	pgp-5.0i
@@ -26,35 +26,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no commercial use"
 PERMIT_DISTFILES_FTP=	Yes
 
-FLAVORS=	usa intl
-
-# No default flavor, error.
-FLAVOR?=
-.if empty(FLAVOR)
-.BEGIN:
-	@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
-
 CONFIGURE_STYLE= autoconf
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 
-.if ${FLAVOR:L} == "usa"
-LIB_DEPENDS=	rsaref.2::security/rsaref
-CONFIGURE_ARGS=	--with-rsaref
-.endif
-
 WRKDIST=	${WRKDIR}/pgp50i/src
 
 post-patch:

security/pgp5/patches/patch-ao

@@ -1,63 +0,0 @@
---- configure.in.orig	Sat Feb  7 14:54:56 1998
-+++ configure.in	Thu Dec 23 23:59:20 1999
-@@ -148,13 +148,30 @@
- #source files (pgpRSAGlue[12].c, pgpRSAKeyGen.c and pgpAltRSAGlu.c)
- #is handled with the make distribution-* flags.
- 
-+WITH_RSAREF=0
-+AC_MSG_CHECKING(whether to use RSAREF)
-+AC_ARG_WITH(rsaref,
-+[  --with-rsaref           Use RSAREF],
-+[
-+ case "$withval" in
-+  yes)
-+       AC_MSG_RESULT(yes)
-+       WITH_RSAREF=1
-+       ;;
-+  *)
-+       AC_MSG_RESULT(no)
-+       ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
- AC_MSG_CHECKING(for internal RSA encrypt/sign support)
- RSALIB=""
- RSAINCS=""
- RSAKEYGEN=""
- RSAKEY="pgpRSAKey.o"
- HAVE_RSAREF=0
--if test -f "lib/pgp/pubkey/pgpRSAGlue1.c"; then
-+if test -f "lib/pgp/pubkey/pgpRSAGlue1.c" -a "x$WITH_RSAREF" = "x0"; then
-   AC_MSG_RESULT(yes)
-   RSAGLUE="pgpRSAGlue1.o pgpRSAGlue2.o"
-   AC_MSG_CHECKING(for lib/pgp/pubkey/pgpRSAKeyGen.c)
-@@ -170,15 +187,15 @@
-   AC_MSG_CHECKING(for lib/pgp/pubkey/pgpAltRSAGlu.c)
-   if test -f "lib/pgp/pubkey/pgpAltRSAGlu.c"; then
-     AC_MSG_RESULT(yes)
--    AC_MSG_CHECKING(for RSAREF in ../rsaref/install/unix)
--    if test -f "../rsaref/install/unix/rsaref.a"; then
-+    if test "x$WITH_RSAREF" = "x1"; then
-+    AC_MSG_CHECKING(for RSAREF in ${LOCALBASE})
-+    if test -f "${LOCALBASE}/lib/librsaref.a"; then
-       HAVE_RSAREF=1
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(USE_RSAREF_FULL, 1)
-       RSAGLUE="pgpAltRSAGlu.o"
--      RSALIB="\$(top_builddir)/../rsaref/install/unix/rsaref.a"
--      RSAINCS="-I \$(top_builddir)/../rsaref/test"
--      RSAINCS="$RSAINCS -I \$(top_builddir)/../rsaref/source"
-+      RSALIB="-L${LOCALBASE}/lib -lrsaref"
-+      RSAINCS="-I${LOCALBASE}/include"
-       AC_MSG_CHECKING(for lib/pgp/pubkey/pgpRSAKeyGen.c)
-       if test -f "lib/pgp/pubkey/pgpRSAKeyGen.c"; then
-         AC_MSG_RESULT(yes)
-@@ -189,6 +206,7 @@
-       fi
-     else
-       AC_MSG_RESULT(no)
-+    fi
-     fi
-   else
-     AC_MSG_RESULT(no)

security/pgp5/pkg/COMMENT

@@ -1 +1 @@
-Pretty Good Privacy 5.0i (international)
+Pretty Good Privacy 5.0i (world wide use)