svn commit: r357516 - in head/java: jdk16-doc jdk7-doc jdk8-doc linux-oracle-jdk18 linux-sun-jdk17

[Jung-uk Kim]

Author: jkim
Date: Wed Jun 11 18:16:42 2014
New Revision: 357516
URL: http://svnweb.freebsd.org/changeset/ports/357516
QAT: https://qat.redports.org/buildarchive/r357516/

Log:
  Remove redundant uses of NO_CDROM with RESTRICTED.
  
  Reported by:	eadler

Modified:
  head/java/jdk16-doc/Makefile
  head/java/jdk7-doc/Makefile
  head/java/jdk8-doc/Makefile
  head/java/linux-oracle-jdk18/Makefile
  head/java/linux-sun-jdk17/Makefile

Modified: head/java/jdk16-doc/Makefile
==============================================================================
--- head/java/jdk16-doc/Makefile	Wed Jun 11 18:15:40 2014	(r357515)
+++ head/java/jdk16-doc/Makefile	Wed Jun 11 18:16:42 2014	(r357516)
@@ -13,7 +13,6 @@ MAINTAINER=	java at FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VER} Documentation
 
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_MAJOR_VER}
-NO_CDROM=	License does not allow distribution with fee.
 RESTRICTED=	This documentation is under license and export control.
 
 WRKSRC=		${WRKDIR}/docs

Modified: head/java/jdk7-doc/Makefile
==============================================================================
--- head/java/jdk7-doc/Makefile	Wed Jun 11 18:15:40 2014	(r357515)
+++ head/java/jdk7-doc/Makefile	Wed Jun 11 18:16:42 2014	(r357516)
@@ -11,7 +11,6 @@ MAINTAINER=	java at FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VER} Documentation
 
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_VERSION}
-NO_CDROM=	License does not allow distribution with fee.
 RESTRICTED=	This documentation is under license and export control.
 
 WRKSRC=		${WRKDIR}/docs

Modified: head/java/jdk8-doc/Makefile
==============================================================================
--- head/java/jdk8-doc/Makefile	Wed Jun 11 18:15:40 2014	(r357515)
+++ head/java/jdk8-doc/Makefile	Wed Jun 11 18:16:42 2014	(r357516)
@@ -11,7 +11,6 @@ MAINTAINER=	java at FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VER} Documentation
 
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_VERSION}
-NO_CDROM=	License does not allow distribution with fee.
 RESTRICTED=	This documentation is under license and export control.
 
 WRKSRC=		${WRKDIR}/docs

Modified: head/java/linux-oracle-jdk18/Makefile
==============================================================================
--- head/java/linux-oracle-jdk18/Makefile	Wed Jun 11 18:15:40 2014	(r357515)
+++ head/java/linux-oracle-jdk18/Makefile	Wed Jun 11 18:16:42 2014	(r357516)
@@ -15,7 +15,6 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/jav
 OPTIONS_DEFINE=	DEMO
 DEMO_DESC=	Install demos and samples
 
-NO_CDROM=	License does not allow distribution with fee
 RESTRICTED=	Redistribution of repackaged binaries not permitted
 PKGNAMESUFFIX=	1${JDK_VERSION}
 

Modified: head/java/linux-sun-jdk17/Makefile
==============================================================================
--- head/java/linux-sun-jdk17/Makefile	Wed Jun 11 18:15:40 2014	(r357515)
+++ head/java/linux-sun-jdk17/Makefile	Wed Jun 11 18:16:42 2014	(r357516)
@@ -16,7 +16,6 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/jav
 OPTIONS_DEFINE=	DEMO
 DEMO_DESC=	Install demos and samples
 
-NO_CDROM=	License does not allow distribution with fee
 RESTRICTED=	Redistribution of repackaged binaries not permitted
 PKGNAMESUFFIX=	1${JDK_VERSION}