Index: www/glassfish/Makefile
===================================================================
--- www/glassfish/Makefile	(revision 521787)
+++ www/glassfish/Makefile	(working copy)
@@ -1,4 +1,4 @@
-# Created by: cjr@cruwe.de 
+# Created by: cjr@cruwe.de
 # $FreeBSD$
 
 PORTNAME=	glassfish
@@ -6,7 +6,6 @@
 CATEGORIES=	www java
 MASTER_SITES=	ECLIPSE/glassfish
 PKGNAMEPREFIX=	eclipse-
-PKGNAMESUFFIX=	5
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Eclipse Jakarta EE Platform
@@ -16,11 +15,8 @@
 USES=		zip
 USE_JAVA=	yes
 
-JAVA_VERSION=	11+
 NO_BUILD=	yes
 
-CONFLICTS_INSTALL=	glassfish
-
 WRKSRC=		${WRKDIR}/glassfish5
 DATADIR=	${PREFIX}/${PORTNAME}-${PORTVERSION}