diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 19ea1dc6e2d..03c4d71e680 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2000/04/22 12:12:07 turan Exp $
+# $OpenBSD: Makefile,v 1.16 2000/05/27 17:23:57 espie Exp $
 
 DISTNAME=	pgp50i-unix-src
 PKGNAME=	pgp-5.0i
 CATEGORIES=	security
 NEED_VERSION=	 1.230
-FAKE=No
 MASTER_SITES=	ftp://ftp.no.pgpi.com/pub/pgp/5.0/unix/ \
 		ftp://ftp.at.pgpi.com/pub/pgpi/5.0/unix/ \
 		ftp://ftp.cz.pgpi.com/pub/pgpi/5.0/unix/ \
@@ -19,6 +18,7 @@ MASTER_SITES=	ftp://ftp.no.pgpi.com/pub/pgp/5.0/unix/ \
 		ftp://ftp.es.pgpi.com/pub/pgp/5.0/unix/ \
 		ftp://ftp.se.pgpi.com/pub/pgp/5.0/unix/ \
 		ftp://ftp.ch.pgpi.com/pub/pgp/5.0/unix/
+FAKE=Yes
 
 MAINTAINER=	fgsch@openbsd.org
 
@@ -29,43 +29,50 @@ PERMIT_DISTFILES_FTP=	Yes
 
 FLAVORS=	usa intl
 
-.if defined(FLAVOR)
-.if ${FLAVOR} == "usa"
-USA_RESIDENT=	yes
-.elif ${FLAVOR} == "intl"
-USA_RESIDENT=	no
+
+.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)
+.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
+
 USE_AUTOCONF=	Yes
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 
-.if defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES
+.if ${FLAVOR:L} == "usa"
 LIB_DEPENDS=	rsaref.2::security/rsaref
 CONFIGURE_ARGS=	--with-rsaref
 .endif
 
 WRKDIST=	${WRKDIR}/pgp50i/src
 
-pre-fetch:
-.if !defined(NO_WARNINGS)
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT:U} != YES && ${USA_RESIDENT:U} != NO
-	@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\""
-	@false
-.endif
-.endif
-
 post-patch:
 	@mv ${WRKSRC}/man/pgp.1 ${WRKSRC}/man/pgp5.1
 
+post-configure:
+	@find ${WRKSRC} -name Makefile|xargs perl -pi.bak -e 's,MFLAGS,AM_MAKEFLAGS,'
+
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/pgp5
 	${INSTALL_DATA} ${WRKSRC}/language50.txt ${PREFIX}/lib/pgp5