My modification of the submitter's update didn't go far enough,

thereby causing breakage that was not present in the original.
Fix the test for distfile a different way, using fewer
variables and less gymnastics.

5 files changed, 15 insertions, 25 deletions

diff --git a/java/jdk-doc/Makefile b/java/jdk-doc/Makefile
index f18463c022ee..ec8a09c78a12 100644
--- a/java/jdk-doc/Makefile
+++ b/java/jdk-doc/Makefile
@@ -17,7 +17,7 @@ NO_CDROM=	"License does not allow distribution with fee."
 RESTRICTED=	"This software is under license and export control."
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE=	"You can not legally distribute packages"
+IGNORE=	"You cannot legally distribute packages"
 .endif
 
 PLIST_SUB+=	JDK_HOME=${JDK_HOME:S/^${PREFIX}\///}
@@ -29,11 +29,9 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-.for file in ${DISTFILES}
-.if !exists(${DISTDIR}/${file})
-IGNORE=You must manually fetch ${file} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again.
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again
 .endif
-.endfor
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile
index f18463c022ee..ec8a09c78a12 100644
--- a/java/jdk11-doc/Makefile
+++ b/java/jdk11-doc/Makefile
@@ -17,7 +17,7 @@ NO_CDROM=	"License does not allow distribution with fee."
 RESTRICTED=	"This software is under license and export control."
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE=	"You can not legally distribute packages"
+IGNORE=	"You cannot legally distribute packages"
 .endif
 
 PLIST_SUB+=	JDK_HOME=${JDK_HOME:S/^${PREFIX}\///}
@@ -29,11 +29,9 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-.for file in ${DISTFILES}
-.if !exists(${DISTDIR}/${file})
-IGNORE=You must manually fetch ${file} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again.
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again
 .endif
-.endfor
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile
index f18463c022ee..ec8a09c78a12 100644
--- a/java/jdk12-doc/Makefile
+++ b/java/jdk12-doc/Makefile
@@ -17,7 +17,7 @@ NO_CDROM=	"License does not allow distribution with fee."
 RESTRICTED=	"This software is under license and export control."
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE=	"You can not legally distribute packages"
+IGNORE=	"You cannot legally distribute packages"
 .endif
 
 PLIST_SUB+=	JDK_HOME=${JDK_HOME:S/^${PREFIX}\///}
@@ -29,11 +29,9 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-.for file in ${DISTFILES}
-.if !exists(${DISTDIR}/${file})
-IGNORE=You must manually fetch ${file} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again.
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again
 .endif
-.endfor
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile
index f18463c022ee..ec8a09c78a12 100644
--- a/java/jdk13-doc/Makefile
+++ b/java/jdk13-doc/Makefile
@@ -17,7 +17,7 @@ NO_CDROM=	"License does not allow distribution with fee."
 RESTRICTED=	"This software is under license and export control."
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE=	"You can not legally distribute packages"
+IGNORE=	"You cannot legally distribute packages"
 .endif
 
 PLIST_SUB+=	JDK_HOME=${JDK_HOME:S/^${PREFIX}\///}
@@ -29,11 +29,9 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-.for file in ${DISTFILES}
-.if !exists(${DISTDIR}/${file})
-IGNORE=You must manually fetch ${file} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again.
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again
 .endif
-.endfor
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile
index f18463c022ee..ec8a09c78a12 100644
--- a/java/jdk14-doc/Makefile
+++ b/java/jdk14-doc/Makefile
@@ -17,7 +17,7 @@ NO_CDROM=	"License does not allow distribution with fee."
 RESTRICTED=	"This software is under license and export control."
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE=	"You can not legally distribute packages"
+IGNORE=	"You cannot legally distribute packages"
 .endif
 
 PLIST_SUB+=	JDK_HOME=${JDK_HOME:S/^${PREFIX}\///}
@@ -29,11 +29,9 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-.for file in ${DISTFILES}
-.if !exists(${DISTDIR}/${file})
-IGNORE=You must manually fetch ${file} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again.
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from http://java.sun.com/jdk/1.1/docs.html, place it in ${DISTDIR} and then run make again
 .endif
-.endfor
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${PORTVERSION}