4 files changed, 56 insertions, 36 deletions

diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index f20bf63170c8..e0ccbdb02a8b 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -8,12 +8,15 @@
 PORTNAME=		krb5
 PORTVERSION=		1.2.8
 CATEGORIES=		security
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO"
-MASTER_SITES=		http://www.crypto-publish.org/dist/mit-kerberos5/
-EXTRACT_SUFX=		.tar.gz
-.else
+# USE_MIT_TARBALL tells the port that the user has fetched the source
+# directly from MIT rather than the default crypto-publish.org.
+USE_MIT_TARBALL?=	NO
+.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 MASTER_SITES=		# manual download
 EXTRACT_SUFX=		.tar
+.else
+MASTER_SITES=		http://www.crypto-publish.org/dist/mit-kerberos5/
+EXTRACT_SUFX=		.tar.gz
 .endif
 
 MAINTAINER=		cy@FreeBSD.org
@@ -41,7 +44,7 @@ PLIST_SUB+=		KRB4=""
 PREFIX=			${KRB5_HOME}
 .endif
 
-# Set USA_RESIDENT appropriately in /etc/make.conf if you like
+# Set USE_MIT_TARBALL appropriately in /etc/make.conf if you like
 
 INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
 			krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \
@@ -67,14 +70,16 @@ HTML_DOCS=		admin.html install_foot.html user-guide.html          \
 			admin_toc.html krb425.html user-guide_toc.html        \
 			install.html krb425_toc.html
 
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} == "YES"
+.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
 	${ECHO} "";							\
 	${ECHO} ">> Kerberos V contains encryption software and is";    \
-	${ECHO} "   export restricted.  If you are not a USA resident,";\
-	${ECHO} "   then you cannot obtain the Kerberos V sources from";\
-	${ECHO} "   within the United States.";                         \
+	${ECHO} "   export restricted.  If you are not a USA or";       \
+	${ECHO} "   Canadian resident, you cannot obtain Kerberos V";   \
+	${ECHO} "   sources directly from MIT and must obtain the";     \
+	${ECHO} "   source from crypto-publish.org by unsetting";       \
+	${ECHO} "   USE_MIT_TARBALL or setting USE_MIT_TARBALL to NO."; \
 	${ECHO} "";							\
 	${ECHO} ">> The Kerberos V sources must be fetched manually.";  \
 	${ECHO} "   Please visit ${KERBEROSV_URL}";                     \
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index f20bf63170c8..e0ccbdb02a8b 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -8,12 +8,15 @@
 PORTNAME=		krb5
 PORTVERSION=		1.2.8
 CATEGORIES=		security
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO"
-MASTER_SITES=		http://www.crypto-publish.org/dist/mit-kerberos5/
-EXTRACT_SUFX=		.tar.gz
-.else
+# USE_MIT_TARBALL tells the port that the user has fetched the source
+# directly from MIT rather than the default crypto-publish.org.
+USE_MIT_TARBALL?=	NO
+.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 MASTER_SITES=		# manual download
 EXTRACT_SUFX=		.tar
+.else
+MASTER_SITES=		http://www.crypto-publish.org/dist/mit-kerberos5/
+EXTRACT_SUFX=		.tar.gz
 .endif
 
 MAINTAINER=		cy@FreeBSD.org
@@ -41,7 +44,7 @@ PLIST_SUB+=		KRB4=""
 PREFIX=			${KRB5_HOME}
 .endif
 
-# Set USA_RESIDENT appropriately in /etc/make.conf if you like
+# Set USE_MIT_TARBALL appropriately in /etc/make.conf if you like
 
 INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
 			krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \
@@ -67,14 +70,16 @@ HTML_DOCS=		admin.html install_foot.html user-guide.html          \
 			admin_toc.html krb425.html user-guide_toc.html        \
 			install.html krb425_toc.html
 
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} == "YES"
+.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
 	${ECHO} "";							\
 	${ECHO} ">> Kerberos V contains encryption software and is";    \
-	${ECHO} "   export restricted.  If you are not a USA resident,";\
-	${ECHO} "   then you cannot obtain the Kerberos V sources from";\
-	${ECHO} "   within the United States.";                         \
+	${ECHO} "   export restricted.  If you are not a USA or";       \
+	${ECHO} "   Canadian resident, you cannot obtain Kerberos V";   \
+	${ECHO} "   sources directly from MIT and must obtain the";     \
+	${ECHO} "   source from crypto-publish.org by unsetting";       \
+	${ECHO} "   USE_MIT_TARBALL or setting USE_MIT_TARBALL to NO."; \
 	${ECHO} "";							\
 	${ECHO} ">> The Kerberos V sources must be fetched manually.";  \
 	${ECHO} "   Please visit ${KERBEROSV_URL}";                     \
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index f20bf63170c8..e0ccbdb02a8b 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -8,12 +8,15 @@
 PORTNAME=		krb5
 PORTVERSION=		1.2.8
 CATEGORIES=		security
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO"
-MASTER_SITES=		http://www.crypto-publish.org/dist/mit-kerberos5/
-EXTRACT_SUFX=		.tar.gz
-.else
+# USE_MIT_TARBALL tells the port that the user has fetched the source
+# directly from MIT rather than the default crypto-publish.org.
+USE_MIT_TARBALL?=	NO
+.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 MASTER_SITES=		# manual download
 EXTRACT_SUFX=		.tar
+.else
+MASTER_SITES=		http://www.crypto-publish.org/dist/mit-kerberos5/
+EXTRACT_SUFX=		.tar.gz
 .endif
 
 MAINTAINER=		cy@FreeBSD.org
@@ -41,7 +44,7 @@ PLIST_SUB+=		KRB4=""
 PREFIX=			${KRB5_HOME}
 .endif
 
-# Set USA_RESIDENT appropriately in /etc/make.conf if you like
+# Set USE_MIT_TARBALL appropriately in /etc/make.conf if you like
 
 INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
 			krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \
@@ -67,14 +70,16 @@ HTML_DOCS=		admin.html install_foot.html user-guide.html          \
 			admin_toc.html krb425.html user-guide_toc.html        \
 			install.html krb425_toc.html
 
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} == "YES"
+.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
 	${ECHO} "";							\
 	${ECHO} ">> Kerberos V contains encryption software and is";    \
-	${ECHO} "   export restricted.  If you are not a USA resident,";\
-	${ECHO} "   then you cannot obtain the Kerberos V sources from";\
-	${ECHO} "   within the United States.";                         \
+	${ECHO} "   export restricted.  If you are not a USA or";       \
+	${ECHO} "   Canadian resident, you cannot obtain Kerberos V";   \
+	${ECHO} "   sources directly from MIT and must obtain the";     \
+	${ECHO} "   source from crypto-publish.org by unsetting";       \
+	${ECHO} "   USE_MIT_TARBALL or setting USE_MIT_TARBALL to NO."; \
 	${ECHO} "";							\
 	${ECHO} ">> The Kerberos V sources must be fetched manually.";  \
 	${ECHO} "   Please visit ${KERBEROSV_URL}";                     \
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index f20bf63170c8..e0ccbdb02a8b 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -8,12 +8,15 @@
 PORTNAME=		krb5
 PORTVERSION=		1.2.8
 CATEGORIES=		security
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "NO"
-MASTER_SITES=		http://www.crypto-publish.org/dist/mit-kerberos5/
-EXTRACT_SUFX=		.tar.gz
-.else
+# USE_MIT_TARBALL tells the port that the user has fetched the source
+# directly from MIT rather than the default crypto-publish.org.
+USE_MIT_TARBALL?=	NO
+.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 MASTER_SITES=		# manual download
 EXTRACT_SUFX=		.tar
+.else
+MASTER_SITES=		http://www.crypto-publish.org/dist/mit-kerberos5/
+EXTRACT_SUFX=		.tar.gz
 .endif
 
 MAINTAINER=		cy@FreeBSD.org
@@ -41,7 +44,7 @@ PLIST_SUB+=		KRB4=""
 PREFIX=			${KRB5_HOME}
 .endif
 
-# Set USA_RESIDENT appropriately in /etc/make.conf if you like
+# Set USE_MIT_TARBALL appropriately in /etc/make.conf if you like
 
 INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
 			krb5-admin.info-2 krb5-admin.info-3 krb5-install.info \
@@ -67,14 +70,16 @@ HTML_DOCS=		admin.html install_foot.html user-guide.html          \
 			admin_toc.html krb425.html user-guide_toc.html        \
 			install.html krb425_toc.html
 
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} == "YES"
+.if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
 	${ECHO} "";							\
 	${ECHO} ">> Kerberos V contains encryption software and is";    \
-	${ECHO} "   export restricted.  If you are not a USA resident,";\
-	${ECHO} "   then you cannot obtain the Kerberos V sources from";\
-	${ECHO} "   within the United States.";                         \
+	${ECHO} "   export restricted.  If you are not a USA or";       \
+	${ECHO} "   Canadian resident, you cannot obtain Kerberos V";   \
+	${ECHO} "   sources directly from MIT and must obtain the";     \
+	${ECHO} "   source from crypto-publish.org by unsetting";       \
+	${ECHO} "   USE_MIT_TARBALL or setting USE_MIT_TARBALL to NO."; \
 	${ECHO} "";							\
 	${ECHO} ">> The Kerberos V sources must be fetched manually.";  \
 	${ECHO} "   Please visit ${KERBEROSV_URL}";                     \