Deorbit RESTRICTED && NO_CDROM, part two.

Move ports to the licenses framework.

RESTRICTED → auto-accept (unless expressly stated otherwise)
NO_CDROM → dist-mirror pkg-mirror auto-accept

Differential Revision:  https://reviews.freebsd.org/D30010

12 files changed, 71 insertions, 16 deletions

diff --git a/java/cos/Makefile b/java/cos/Makefile
index 5db68cf58c44..a7b5b0d0e0b7 100644
--- a/java/cos/Makefile
+++ b/java/cos/Makefile
@@ -12,11 +12,16 @@ DISTNAME=	${PORTNAME}-05Nov2002
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	The O'Reilly package of utility classes for servlet developers
 
+# Converted from RESTRICTED
+LICENSE=	cos
+LICENSE_NAME=	cos
+LICENSE_TEXT=	Special conditions apply for commercial use, see licence
+LICENSE_PERMS=	auto-accept
+
 NO_WRKSUBDIR=	yes
 USES=		zip
 USE_JAVA=	yes
 NO_BUILD=	yes
-RESTRICTED=	Special conditions apply for commercial use, see licence
 DATAFILES=	readme.txt license.txt doc
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
diff --git a/java/infobus/Makefile b/java/infobus/Makefile
index fd6f312e2832..b82f9cf5bbdd 100644
--- a/java/infobus/Makefile
+++ b/java/infobus/Makefile
@@ -9,6 +9,12 @@ DISTNAME=	ib12
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Enables dynamic exchange of data between JavaBeans(TM)
 
+# Converted from NO_CDROM
+LICENSE=	infobus
+LICENSE_NAME=	infobus
+LICENSE_TEXT=	See the license
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+
 OPTIONS_DEFINE=		DOCS EXAMPLES
 
 USES=		zip
@@ -16,7 +22,6 @@ USE_JAVA=	YES
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-NO_CDROM=	See the license
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/java/jai/Makefile b/java/jai/Makefile
index 6c1fe739dbbb..09fee14a8bb6 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -10,6 +10,12 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}-lib
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	High performance image processing libraries for Java
 
+# Converted from RESTRICTED
+LICENSE=	jai
+LICENSE_NAME=	jai
+LICENSE_TEXT=	Redistribution is not permitted
+LICENSE_PERMS=	auto-accept
+
 USES=		cpe zip
 CPE_VENDOR=	oracle
 USE_JAVA=	yes
@@ -19,8 +25,6 @@ NO_BUILD=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	TARGET_DIR=${TARGET_DIR}
 
-RESTRICTED=	Redistribution is not permitted
-
 DOWNLOAD_URL=	http://java.sun.com/products/java-media/jai/current.html
 
 TARGET_DIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile
index 98db68d1dd5c..36c58b3f7592 100644
--- a/java/jdk11-doc/Makefile
+++ b/java/jdk11-doc/Makefile
@@ -8,10 +8,15 @@ DISTNAME=	jdk-${PORTVERSION}_doc-all
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_VERSION} Documentation
 
+# Converted from RESTRICTED
+LICENSE=	jdk
+LICENSE_NAME=	jdk
+LICENSE_TEXT=	This documentation is under license and export control.
+LICENSE_PERMS=	auto-accept
+
 USES=		zip
 
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_VERSION}
-RESTRICTED=	This documentation is under license and export control.
 
 WRKSRC=		${WRKDIR}/docs
 JDK_VERSION=		11
diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile
index 9555c376705d..223e4c23e1da 100644
--- a/java/jdk12-doc/Makefile
+++ b/java/jdk12-doc/Makefile
@@ -8,10 +8,15 @@ DISTNAME=	jdk-${JDK_VERSION}.${JDK_UPDATE_VERSION}.${JDK_PATCH_VERSION}_doc-all
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_VERSION} Documentation
 
+# Converted from RESTRICTED
+LICENSE=	jdk
+LICENSE_NAME=	jdk
+LICENSE_TEXT=	This documentation is under license and export control.
+LICENSE_PERMS=	auto-accept
+
 USES=		zip
 
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_VERSION}
-RESTRICTED=	This documentation is under license and export control.
 
 WRKSRC=		${WRKDIR}/docs
 JDK_VERSION=		12
diff --git a/java/jdk8-doc/Makefile b/java/jdk8-doc/Makefile
index 8af412f2fb7b..e6174ce4460f 100644
--- a/java/jdk8-doc/Makefile
+++ b/java/jdk8-doc/Makefile
@@ -8,10 +8,15 @@ DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VER}-docs-all
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_VERSION} Documentation
 
+# Converted from RESTRICTED
+LICENSE=	jdk
+LICENSE_NAME=	jdk
+LICENSE_TEXT=	This documentation is under license and export control.
+LICENSE_PERMS=	auto-accept
+
 USES=		zip
 
 DOCSDIR?=	${PREFIX}/share/doc/jdk${JDK_VERSION}
-RESTRICTED=	This documentation is under license and export control.
 
 WRKSRC=		${WRKDIR}/docs
 JDK_VERSION=	8
diff --git a/java/jmf/Makefile b/java/jmf/Makefile
index cb76966434fb..816ea22f60d4 100644
--- a/java/jmf/Makefile
+++ b/java/jmf/Makefile
@@ -10,14 +10,18 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-alljava
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java Media Framework
 
+# Converted from RESTRICTED
+LICENSE=	jmf
+LICENSE_NAME=	jmf
+LICENSE_TEXT=	Redistribution of pre-compiled binaries is not permitted
+LICENSE_PERMS=	auto-accept
+
 USES=		zip
 USE_JAVA=	yes
 NO_BUILD=	YES
 
 WRKSRC=		${WRKDIR}/JMF-${PORTVERSION}
 
-RESTRICTED=	Redistribution of pre-compiled binaries is not permitted
-
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
diff --git a/java/jta/Makefile b/java/jta/Makefile
index d95634fb7ffb..0a92e36f3a49 100644
--- a/java/jta/Makefile
+++ b/java/jta/Makefile
@@ -9,11 +9,16 @@ DISTNAME=	${PORTNAME}-spec${PORTVERSION:S/./_/g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java Transaction API (JTA)
 
+# Converted from NO_CDROM
+LICENSE=	jta
+LICENSE_NAME=	jta
+LICENSE_TEXT=	See the license
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
-NO_CDROM=	See the license
 DOWNLOAD_URL=	http://download.oracle.com/otndocs/jcp/7286-jta-${PORTVERSION}-spec-oth-JSpec/?submit=Download
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile
index 41a1986feb96..89bf171f7ecf 100644
--- a/java/linux-oracle-jdk18/Makefile
+++ b/java/linux-oracle-jdk18/Makefile
@@ -8,12 +8,17 @@ DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VERSION}-linux-${JAVA_DISTFILE_ARCH}
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Oracle Java ${JDK_VERSION} Development Kit for Linux
 
+# Converted from RESTRICTED
+LICENSE=	jdk
+LICENSE_NAME=	jdk
+LICENSE_TEXT=	Redistribution of repackaged binaries not permitted
+LICENSE_PERMS=	auto-accept
+
 RUN_DEPENDS=	javavm:java/javavmwrapper
 
 OPTIONS_DEFINE=	DEMO
 DEMO_DESC=	Install demos and samples
 
-RESTRICTED=	Redistribution of repackaged binaries not permitted
 PKGNAMESUFFIX=	1${JDK_VERSION}
 
 WRKSRC=		${WRKDIR}/jdk${DL_JDK_VERSION}
diff --git a/java/linux-oracle-jre18/Makefile b/java/linux-oracle-jre18/Makefile
index ed1fa644ae85..885257ba201c 100644
--- a/java/linux-oracle-jre18/Makefile
+++ b/java/linux-oracle-jre18/Makefile
@@ -8,10 +8,14 @@ DISTNAME=	jre-${JRE_VERSION}u${JRE_UPDATE_VERSION}-linux-${JAVA_DISTFILE_ARCH}
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Oracle Java ${JRE_VERSION} Runtime Environment for Linux
 
+# Converted from RESTRICTED
+LICENSE=	jre
+LICENSE_NAME=	jre
+LICENSE_TEXT=	Redistribution of repackaged binaries not permitted
+LICENSE_PERMS=	auto-accept
+
 RUN_DEPENDS=	javavm:java/javavmwrapper
 
-NO_CDROM=	License does not allow distribution with fee
-RESTRICTED=	Redistribution of repackaged binaries not permitted
 PKGNAMESUFFIX=	1${JRE_VERSION}
 
 WRKSRC=		${WRKDIR}/jre${DL_JRE_VERSION}
diff --git a/java/linux-oracle-serverjre10/Makefile b/java/linux-oracle-serverjre10/Makefile
index 5146ffb6436c..df69cddc442c 100644
--- a/java/linux-oracle-serverjre10/Makefile
+++ b/java/linux-oracle-serverjre10/Makefile
@@ -9,11 +9,15 @@ DISTNAME=	serverjre-${JRE_VERSION}.${JRE_UPDATE_VERSION}.${JRE_PATCH_VERSION}_li
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Oracle Java ${JRE_VERSION} Server Runtime Environment for Linux
 
+# Converted from RESTRICTED
+LICENSE=	serverjre
+LICENSE_NAME=	serverjre
+LICENSE_TEXT=	Redistribution of repackaged binaries not permitted
+LICENSE_PERMS=	auto-accept
+
 ONLY_FOR_ARCHS=	amd64
 RUN_DEPENDS=	javavm:java/javavmwrapper
 
-RESTRICTED=	Redistribution of repackaged binaries not permitted
-
 WRKSRC=		${WRKDIR}/jdk-${DL_JRE_VERSION}
 PLIST_SUB=	T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
 
diff --git a/java/netcomponents/Makefile b/java/netcomponents/Makefile
index 04c8bbf59cd9..ae12da6a6ddd 100644
--- a/java/netcomponents/Makefile
+++ b/java/netcomponents/Makefile
@@ -10,7 +10,11 @@ DISTNAME=	NetComponents-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java library with common network protocol implementations
 
-RESTRICTED=	May not redistribute except as part of a new software product
+# Converted from RESTRICTED
+LICENSE=	NetComponents
+LICENSE_NAME=	NetComponents
+LICENSE_TEXT=	May not redistribute except as part of a new software product
+LICENSE_PERMS=	auto-accept
 
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
 USES=		zip