- Remove bogus conditional IGNORE for PACKAGE_BUILDING; these should

  be IGNOREd regardless of PACKAGE_BUILDING. Soem have no MASTER_SITES
  and require manual fetching, others are already marked RESTRICTED.
- Trim headers
- Convert some pre-fetch errors into IGNORE
- Remove needless quoting in java/jdk7-doc IGNORE

With hat:	portmgr

12 files changed, 17 insertions, 21 deletions

diff --git a/java/infobus/Makefile b/java/infobus/Makefile
index 067e02a6240a..fcdd00481d55 100644
--- a/java/infobus/Makefile
+++ b/java/infobus/Makefile
@@ -23,7 +23,7 @@ PORTDOCS=	*
 .endif
 
 .include <bsd.port.pre.mk>
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	You must manually fetch the distribution from http://java.sun.com/products/archive/javabeans/infobus/downloads.html and place it in ${DISTDIR} then run make again
 .endif
 
diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index d6c4b0081a09..170004cc3adb 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -28,7 +28,7 @@ PORTDOCS=	${DOCFILES1} ${DOCFILES2}
 PLIST_FILES=	%%JAVAJARDIR%%/activation.jar
 
 .include <bsd.port.pre.mk>
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=		you must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again
 .endif
 
diff --git a/java/jai-imageio/Makefile b/java/jai-imageio/Makefile
index 4307543a6efe..d37be7a77694 100644
--- a/java/jai-imageio/Makefile
+++ b/java/jai-imageio/Makefile
@@ -27,7 +27,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=		you must manually fetch the "Linux Install" distribution (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
diff --git a/java/jdk16-doc/Makefile b/java/jdk16-doc/Makefile
index 8a07da5d85cf..b8a93acbe68e 100644
--- a/java/jdk16-doc/Makefile
+++ b/java/jdk16-doc/Makefile
@@ -31,7 +31,7 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	you must manually fetch ${DISTNAME}${EXTRACT_SUFX} from ${DOWNLOAD_URL} by selecting the "Download" link for the "Java SE 6 Documentation", place it in ${DISTDIR} and then run make again
 .endif
 
diff --git a/java/jdk7-doc/Makefile b/java/jdk7-doc/Makefile
index 435a6fef72d5..8d6f64d9caa3 100644
--- a/java/jdk7-doc/Makefile
+++ b/java/jdk7-doc/Makefile
@@ -28,8 +28,8 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from ${DOWNLOAD_URL} by selecting the \"Download\" link for the \"Java SE 7 Documentation\", place it in ${DISTDIR} and then run make again
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from ${DOWNLOAD_URL} by selecting the "Download" link for the "Java SE 7 Documentation", place it in ${DISTDIR} and then run make again
 .endif
 
 do-install:
diff --git a/java/jta/Makefile b/java/jta/Makefile
index 736b3a1c6bce..321bbcb535d6 100644
--- a/java/jta/Makefile
+++ b/java/jta/Makefile
@@ -23,7 +23,7 @@ PORTDOCS=	${DISTNAME}.pdf javadocs
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 .include <bsd.port.pre.mk>
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=		you must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again
 .endif
 
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile
index 8b68a7ae9197..a5c8f3e3ace4 100644
--- a/java/linux-sun-jdk16/Makefile
+++ b/java/linux-sun-jdk16/Makefile
@@ -40,7 +40,7 @@ UNPACK_CMD=	${WRKSRC}/bin/unpack200
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE?=You must manually fetch the J2SE SDK self-extracting file for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
@@ -55,7 +55,7 @@ DEMO_WRKSRC=   ${WRKDIR}/jdk${JDK_VERSION}_${DEMO_UPDATE_VERSION}
 DEMO_DISTNAME=        ${DISTNAME}-demos
 DEMO_WRKSRC=  ${WRKSRC}
 .endif
-.if !exists(${DISTDIR}/${DEMO_DISTNAME}.tar.gz) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DEMO_DISTNAME}.tar.gz)
 IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}.tar.gz) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DEMO_DISTNAME}.tar.gz
diff --git a/java/linux-sun-jdk17/Makefile b/java/linux-sun-jdk17/Makefile
index 862d2e6d10bc..2a1cc2a8adeb 100644
--- a/java/linux-sun-jdk17/Makefile
+++ b/java/linux-sun-jdk17/Makefile
@@ -1,4 +1,4 @@
-# Created by:	Greg Lewis <glewis@FreeBSD.org>
+# Created by: Greg Lewis <glewis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	jdk
@@ -41,7 +41,7 @@ BIN_DIRS=	bin jre/bin
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE?=You must manually fetch the J2SE SDK download for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
@@ -56,7 +56,7 @@ DEMO_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_${DEMO_UPDATE_VERSION}
 DEMO_DISTNAME=	${DISTNAME}-demos
 DEMO_WRKSRC=	${WRKSRC}
 .endif
-.if !exists(${DISTDIR}/${DEMO_DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DEMO_DISTNAME}${EXTRACT_SUFX})
 IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DEMO_DISTNAME}${EXTRACT_SUFX}
diff --git a/java/linux-sun-jre16/Makefile b/java/linux-sun-jre16/Makefile
index 59085705584f..c833bae10ae0 100644
--- a/java/linux-sun-jre16/Makefile
+++ b/java/linux-sun-jre16/Makefile
@@ -36,7 +36,7 @@ UNPACK_CMD=	${WRKSRC}/bin/unpack200
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE?=You must manually fetch the JRE self-extracting file for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
diff --git a/java/linux-sun-jre17/Makefile b/java/linux-sun-jre17/Makefile
index 419e593a4113..260a11d8759a 100644
--- a/java/linux-sun-jre17/Makefile
+++ b/java/linux-sun-jre17/Makefile
@@ -37,7 +37,7 @@ BIN_DIRS=	bin
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE?=You must manually fetch the J2SE RE download for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
diff --git a/java/netbeans55/Makefile b/java/netbeans55/Makefile
index ff98c1917de7..92b6bfbfb797 100644
--- a/java/netbeans55/Makefile
+++ b/java/netbeans55/Makefile
@@ -25,7 +25,7 @@ SUB_FILES=	pkg-install pkg-deinstall
 
 .include <bsd.port.pre.mk>
 
-#.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+#.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 #IGNORE=		you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 #.endif
 
diff --git a/java/netcomponents/Makefile b/java/netcomponents/Makefile
index 752deb097c26..90b6b27fd429 100644
--- a/java/netcomponents/Makefile
+++ b/java/netcomponents/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	NetComponents
-# Date created:				November 9, 2002
-# Whom:					Ernst de Haan <znerd@FreeBSD.org>
-#
+# Created by: Ernst de Haan <znerd@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	netcomponents
 PORTVERSION=	1.3.8
@@ -27,7 +23,7 @@ JARFILE=	NetComponents.jar
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=		must be manually fetched from ${MASTER_SITES}.  Download\
 		${DISTFILES}, place it in ${DISTDIR} and restart this build
 .endif