6 files changed, 24 insertions, 30 deletions

diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 1649f42a4ef8..2a4e5cd89e70 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -32,9 +32,8 @@ HasXdmAuth?=		DEFAULT
 
 .if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-fetch:
-	@${ECHO}
-	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+pre-everything::
+	@${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
 .else
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
@@ -42,8 +41,8 @@ MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 EXTRACT_ONLY=	X410src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
-.endif
-.endif
+.endif	# USA_RESIDENT
+.endif	# HasXdmAuth
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 37d48e7ea0c7..0b99e1bda682 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -30,9 +30,8 @@ HasXdmAuth?=		DEFAULT
 
 .if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-fetch:
-	@${ECHO}
-	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+pre-everything::
+	@${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
 .else
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
@@ -40,8 +39,8 @@ MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 EXTRACT_ONLY=	X410src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
-.endif
-.endif
+.endif	# USA_RESIDENT
+.endif	# HasXdmAuth
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 98f86b38b842..2bcc6f19a092 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -158,17 +158,16 @@ post-install::
 
 .if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-fetch::
-	@${ECHO}
-	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+pre-everything::
+	@${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
 .else
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
-.endif
-.endif
+.endif	# USA_RESIDENT
+.endif	# HasXdmAuth
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 98f86b38b842..2bcc6f19a092 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -158,17 +158,16 @@ post-install::
 
 .if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-fetch::
-	@${ECHO}
-	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+pre-everything::
+	@${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
 .else
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
-.endif
-.endif
+.endif	# USA_RESIDENT
+.endif	# HasXdmAuth
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index c73ce2a4c8c9..771011da12f6 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -31,9 +31,8 @@ HasXdmAuth?=		DEFAULT
 
 .if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-fetch:
-	@${ECHO}
-	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+pre-everything::
+	@${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
 .else
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
@@ -41,8 +40,8 @@ MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 EXTRACT_ONLY=	X410src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
-.endif
-.endif
+.endif	# USA_RESIDENT
+.endif	# HasXdmAuth
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index fa2b0e0a8ff3..5f3687ae63e9 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -80,9 +80,8 @@ PLIST_SUB+=	OSMESA:=""
 
 .if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-fetch:
-	@${ECHO}
-	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+pre-everything::
+	@${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
 .else
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
@@ -90,8 +89,8 @@ MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 EXTRACT_ONLY=	X410src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
-.endif
-.endif
+.endif	# USA_RESIDENT
+.endif	# HasXdmAuth != NO
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure