3 files changed, 23 insertions, 46 deletions

diff --git a/java/collections/Makefile b/java/collections/Makefile
index 6cc16e16c12b..19e26b43e75f 100644
--- a/java/collections/Makefile
+++ b/java/collections/Makefile
@@ -14,24 +14,39 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	java@freebsd.org
 COMMENT=	JDK1.2 Collections' API for JDK1.1 environments
 
-RUN_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk11
+USE_JAVA=	yes
+JAVA_VERSION=	1.1
+JAVA_RUN=	jre
 
 USE_ZIP=	YES
 
 WRKSRC=		${WRKDIR}/1.1collections
-JDK_VERSION=	1.1.8
 NO_BUILD=	yes
 NO_CDROM=	"See the license"
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	LICENSE.TXT README.TXT javadoc
+.endif
+JARFILE=	collections.jar
+PLIST_FILES+=	${JAVAJARDIR:S,^${PREFIX}/,,}/${JARFILE}
+
 .include <bsd.port.pre.mk>
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	"You must manually fetch the distribution from http://java.sun.com/products/javabeans/infobus/index.html and place it in ${DISTDIR} then run make again"
+IGNORE=	"You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from http://java.sun.com/products/archive/javabeans/infobus/downloads.html and place it in ${DISTDIR} then run make again"
 .endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes/
-	@${CP} ${WRKSRC}/lib/*.jar ${PREFIX}/share/java/classes/
-	@${MKDIR} ${PREFIX}/share/java/${PKGNAME}/
-	@${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/java/${PKGNAME}/
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
+	@${MKDIR} ${JAVAJARDIR}
+	@${CP} ${WRKSRC}/lib/${JARFILE} ${JAVAJARDIR}/
+	@${ECHO_MSG} " [ DONE ]"
+.if !defined(NOPORTDOCS)
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${MKDIR} ${DOCSDIR}
+.for DOCFILE in ${PORTDOCS}
+	@${CP} -R ${WRKSRC}/doc/${DOCFILE} ${DOCSDIR}/
+.endfor
+	@${ECHO_MSG} " [ DONE ]"
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/java/collections/distinfo b/java/collections/distinfo
index 4247a17cfc8b..c8946cdc4e94 100644
--- a/java/collections/distinfo
+++ b/java/collections/distinfo
@@ -1 +1,2 @@
 MD5 (collections1_1.zip) = 193d1748448f14614f9e20619e555896
+SIZE (collections1_1.zip) = 202298
diff --git a/java/collections/pkg-plist b/java/collections/pkg-plist
deleted file mode 100644
index 94a013786891..000000000000
--- a/java/collections/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-share/java/classes/collections.jar
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.UnsupportedOperationException.html
-share/java/collections-1.1/javadoc/Package-com.sun.java.util.collections.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Collection.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Comparable.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Comparator.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Iterator.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.List.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.ListIterator.html
-share/java/collections-1.1/javadoc/AllNames.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Map.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Set.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.SortedMap.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.SortedSet.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.AbstractCollection.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.AbstractList.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.AbstractMap.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.AbstractSequentialList.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.AbstractSet.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Arrays.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.ArrayList.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Collections.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.HashMap.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.HashSet.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Hashtable.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.LinkedList.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Random.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.SubList.html
-share/java/collections-1.1/javadoc/tree.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.TreeMap.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.TreeSet.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.Vector.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.ConcurrentModificationException.html
-share/java/collections-1.1/javadoc/com.sun.java.util.collections.NoSuchElementException.html
-share/java/collections-1.1/javadoc/packages.html
-share/java/collections-1.1/README.TXT
-share/java/collections-1.1/LICENSE.TXT
-@dirrm share/java/collections-1.1/javadoc
-@dirrm share/java/collections-1.1/