svn commit: r325598 - in head: astro/xephem audio/baudline audio/ventrilo-server comms/java-commapi emulators/ski java/infobus java/jaf java/jai-imageio java/jdk16-doc java/jdk7-doc java/jta java/l...

Thu Aug 29 14:16:08 UTC 2013

Author: bdrewery
Date: Thu Aug 29 14:16:03 2013
New Revision: 325598
URL: http://svnweb.freebsd.org/changeset/ports/325598

Log:
  - 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

Modified:
  head/astro/xephem/Makefile
  head/audio/baudline/Makefile
  head/audio/ventrilo-server/Makefile
  head/comms/java-commapi/Makefile
  head/emulators/ski/Makefile
  head/java/infobus/Makefile
  head/java/jaf/Makefile
  head/java/jai-imageio/Makefile
  head/java/jdk16-doc/Makefile
  head/java/jdk7-doc/Makefile
  head/java/jta/Makefile
  head/java/linux-sun-jdk16/Makefile
  head/java/linux-sun-jdk17/Makefile
  head/java/linux-sun-jre16/Makefile
  head/java/linux-sun-jre17/Makefile
  head/java/netbeans55/Makefile
  head/java/netcomponents/Makefile
  head/lang/gnat/Makefile
  head/net/rsmb/Makefile
  head/science/vmd/Makefile
  head/security/bdc/Makefile

Modified: head/astro/xephem/Makefile
==============================================================================

--- head/astro/xephem/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/astro/xephem/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -29,18 +29,13 @@ XEPHEMSRC=	${PORTNAME}-${PORTVERSION}.ta
 .include <bsd.port.pre.mk>
 
 .for file in ${XEPHEMSRC}
-.if !exists(${DISTDIR}/${file}) && !defined(PACKAGE_BUILDING)#{
-DISTFILE_INSTRUCTIONS=\n\
+.if !exists(${DISTDIR}/${file})
+ECHO_MSG=	${PRINTF}
+IGNORE=\n\
 Because of licensing restrictions, you must manually fetch \n\ ${file} from http://www.clearskyinstitute.com/xephem/, \n\ place it in ${DISTDIR} and then run make again.\n\n
 .endif
 .endfor
 
-pre-fetch:
-.if defined(DISTFILE_INSTRUCTIONS)
-	@${PRINTF} "${DISTFILE_INSTRUCTIONS}"
-	@exit 1
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|/usr/X11R6|${LOCALBASE}|g' \

Modified: head/audio/baudline/Makefile
==============================================================================
--- head/audio/baudline/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/audio/baudline/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -1,6 +1,5 @@
 # Created by: David Yeske <dyeske at gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	baudline
 PORTVERSION=	1.08

Modified: head/audio/ventrilo-server/Makefile
==============================================================================
--- head/audio/ventrilo-server/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/audio/ventrilo-server/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -28,7 +28,7 @@ GROUPS=		${USERS}
 WRKSRC=	${WRKDIR}/ventsrv
 SUB_FILES=	pkg-message
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	distfile can only be fetched if you accept the license. Go to http://www.ventrilo.com/dlprod.php?id=105 and put ${DISTFILES} into ${DISTDIR}
 .endif
 

Modified: head/comms/java-commapi/Makefile
==============================================================================
--- head/comms/java-commapi/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/comms/java-commapi/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -1,7 +1,5 @@
 # Created by: Ari Suutari <ari.suutari at syncrontech.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	java-commapi
 PORTVERSION=	2.0.3

Modified: head/emulators/ski/Makefile
==============================================================================
--- head/emulators/ski/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/emulators/ski/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -1,4 +1,4 @@
-# Created by:  David O'Brien (obrien at NUXI.com)
+# Created by: David O'Brien (obrien at NUXI.com)
 # $FreeBSD$
 
 PORTNAME=	ski
@@ -46,7 +46,7 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	${NOTICE}
 .endif
 

Modified: head/java/infobus/Makefile
==============================================================================
--- head/java/infobus/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/infobus/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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
 

Modified: head/java/jaf/Makefile
==============================================================================
--- head/java/jaf/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/jaf/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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
 

Modified: head/java/jai-imageio/Makefile
==============================================================================
--- head/java/jai-imageio/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/jai-imageio/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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
 

Modified: head/java/jdk16-doc/Makefile
==============================================================================
--- head/java/jdk16-doc/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/jdk16-doc/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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
 

Modified: head/java/jdk7-doc/Makefile
==============================================================================
--- head/java/jdk7-doc/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/jdk7-doc/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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:

Modified: head/java/jta/Makefile
==============================================================================
--- head/java/jta/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/jta/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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
 

Modified: head/java/linux-sun-jdk16/Makefile
==============================================================================
--- head/java/linux-sun-jdk16/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/linux-sun-jdk16/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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_VERSIO
 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

Modified: head/java/linux-sun-jdk17/Makefile
==============================================================================
--- head/java/linux-sun-jdk17/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/linux-sun-jdk17/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -1,4 +1,4 @@
-# Created by:	Greg Lewis <glewis at FreeBSD.org>
+# Created by: Greg Lewis <glewis at 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
 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}

Modified: head/java/linux-sun-jre16/Makefile
==============================================================================
--- head/java/linux-sun-jre16/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/linux-sun-jre16/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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
 

Modified: head/java/linux-sun-jre17/Makefile
==============================================================================
--- head/java/linux-sun-jre17/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/linux-sun-jre17/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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
 

Modified: head/java/netbeans55/Makefile
==============================================================================
--- head/java/netbeans55/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/netbeans55/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -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
 

Modified: head/java/netcomponents/Makefile
==============================================================================
--- head/java/netcomponents/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/java/netcomponents/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	NetComponents
-# Date created:				November 9, 2002
-# Whom:					Ernst de Haan <znerd at FreeBSD.org>
-#
+# Created by: Ernst de Haan <znerd at 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

Modified: head/lang/gnat/Makefile
==============================================================================
--- head/lang/gnat/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/lang/gnat/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -1,11 +1,5 @@
 # Created by: hsu, nils at guru.ims.uni-stuttgart.de, maurice at serc.rmit.edu.au
 # $FreeBSD$
-#
-# Note:
-# - FreeBSD tasking libraries are included in the stock source.
-# - The default names of a number of binaries have been altered to avoid
-#   conflict with other gcc based products. Standard names can be provided
-#   using symbolic links.
 
 PORTNAME=		gnat
 PORTVERSION=		2010
@@ -124,7 +118,7 @@ PLIST_SUB+=		SHAREDLIB="@comment "
 .endif
 
 # Check for GNAT sources.
-.if !exists(${DISTDIR}/${gnat_srcfile}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${gnat_srcfile})
 IGNORE=	you must fetch the source distribution manually. Please access http://libre.adacore.com/ with a web browser and download the source files: ${gnat_srcfile} ${gcc_srcfile} placing them in ${DISTDIR}
 .endif
 

Modified: head/net/rsmb/Makefile
==============================================================================
--- head/net/rsmb/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/net/rsmb/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rsmb
-# Date created:	9 Nov 2009
-# Whom:	Andrew Stevenson <andrew at ugh.net.au>
-#
+# Created by: Andrew Stevenson <andrew at ugh.net.au>
 # $FreeBSD$
-#
 
 PORTNAME=	rsmb
 PORTVERSION=	1.1.0
@@ -29,14 +25,9 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-DISTFILE_INSTRUCTIONS=	${RESTRICTED}
-.endif
-
-pre-fetch:
-.if defined(DISTFILE_INSTRUCTIONS)
-	@${PRINTF} "${DISTFILE_INSTRUCTIONS}"
-	@${FALSE}
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+ECHO_MSG=	${PRINTF}
+IGNORE=		${RESTRICTED}
 .endif
 
 do-install:

Modified: head/science/vmd/Makefile
==============================================================================
--- head/science/vmd/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/science/vmd/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -52,7 +52,7 @@ VMD_TARGET=		freebsd.opengl
 PLIST_SUB+=		VMD_ARCH=${VMD_ARCH}
 
 # Check for VMD sources
-.if !exists(${DISTDIR}/${VMD_DIST}) # && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${VMD_DIST})
 IGNORE= Because of licensing restrictions, you must fetch the source distribution manually.  Please access http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD with a web browser.  You will be required to log in and register, but you can create an account on this page.  After registration and accepting the University of Illinois agreement, download the source file, ${VMD_DIST}.  Please place this file in ${DISTDIR}, and re-run make
 .endif
 

Modified: head/security/bdc/Makefile
==============================================================================
--- head/security/bdc/Makefile	Thu Aug 29 14:11:28 2013	(r325597)
+++ head/security/bdc/Makefile	Thu Aug 29 14:16:03 2013	(r325598)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   bdc
-# Date created:                        4 December 2004
-# Whom:                                Adi Pircalabu <apircalabu at bitdefender.com>
-#
+# Created by: Adi Pircalabu <apircalabu at bitdefender.com>
 # $FreeBSD$
-#
 
 PORTNAME=	bdc
 PORTVERSION=	7.0.1
@@ -29,7 +25,7 @@ BDREL=		5
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	you have to fetch ${DISTNAME}${EXTRACT_SUFX} manually after reading\
 and agreeing to the license at:\
 http://download.bitdefender.com/SMB/Workstation_Security_and_Management/BitDefender_Antivirus_Scanner_for_Unices/Unix/Old/EN/freebsd/Ver_${BDREL}/.\
