svn commit: r471176 - head/www/servlet-api

[Antoine Brodin]

Author: antoine
Date: Wed May 30 21:43:48 2018
New Revision: 471176
URL: https://svnweb.freebsd.org/changeset/ports/471176

Log:
  Revert r471145, it's broken
  
  ===>  License not correctly defined: either LICENSE_FILE_GPLv2wCE or LICENSE_TEXT_GPLv2wCE must be defined
  
  With hat:	portmgr

Modified:
  head/www/servlet-api/Makefile

Modified: head/www/servlet-api/Makefile
==============================================================================
--- head/www/servlet-api/Makefile	Wed May 30 21:20:07 2018	(r471175)
+++ head/www/servlet-api/Makefile	Wed May 30 21:43:48 2018	(r471176)
@@ -3,7 +3,7 @@
 
 PORTNAME=	servlet-api
 PORTVERSION=	2.5
-PORTREVISION=	4
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	http://maven.ibiblio.org/maven2/javax/servlet/servlet-api/2.5/ \
 		http://repo1.maven.org/maven2/javax/servlet/servlet-api/2.5/
@@ -13,16 +13,11 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	The Servlet API
 
-LICENSE=	CDDL GPLv2wCE
-LICENSE_COMB=	multi
-LICENSE_NAME_GPLv2wCE=	GPLv2 with Classpath Exception
-LICENSE_PERMS_GPLv2wCE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
-PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
+PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 do-install:
 	${INSTALL_DATA} ${_DISTDIR}/${DISTFILES} \