[PATCH] java/collections: SIZEify, bsd.java.mk 2.0, (NO)PORTDOCS/DOCSDIR, JAVAJARDIR

[Herve Quiroz]

>Submitter-Id:	current-users
>Originator:	Herve Quiroz
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] java/collections: SIZEify, bsd.java.mk 2.0, (NO)PORTDOCS/DOCSDIR, JAVAJARDIR
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 5.2.1-RELEASE i386
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Fri Feb 27 11:36:17 CET 2004
>Description:

- bsd.java.mk compliance
- bsd.java.mk 2.0 compliance ;)
- Does not install documentation when NOPORTDOCS is set
- Install documentation in DOCSDIR
- Use PORTDOCS and PLIST_FILES to remove pkg-plist
- Use JAVAJARDIR
- Verbose statements regarding what's going on
- Added SIZE info

NOTE: Is there a way to have portlint stop complaining about the lack of
MASTER_SITES?

Port maintainer (java at freebsd.org) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- collections-1.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/java/collections.original/Makefile /usr/ports/java/collections/Makefile
--- /usr/ports/java/collections.original/Makefile	Mon Apr  5 17:09:29 2004
+++ /usr/ports/java/collections/Makefile	Mon Apr  5 17:32:31 2004
@@ -14,24 +14,40 @@
 MAINTAINER=	java at 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"
 .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_CMD} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
+	@${MKDIR} ${JAVAJARDIR}
+	@${CP} ${WRKSRC}/lib/${JARFILE} ${JAVAJARDIR}/
+	@${ECHO_CMD} " [ DONE ]"
+.if !defined(NOPORTDOCS)
+	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${MKDIR} ${DOCSDIR}
+.for DOCFILE in ${PORTDOCS}
+	@${CP} -R ${WRKSRC}/doc/${DOCFILE} ${DOCSDIR}/
+	@${ECHO_CMD} -n " ${DOCFILE}"
+.endfor
+	@${ECHO_CMD} " [ DONE ]"
+.endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/java/collections.original/distinfo /usr/ports/java/collections/distinfo
--- /usr/ports/java/collections.original/distinfo	Mon Apr  5 17:09:29 2004
+++ /usr/ports/java/collections/distinfo	Mon Apr  5 17:16:23 2004
@@ -1 +1,2 @@
 MD5 (collections1_1.zip) = 193d1748448f14614f9e20619e555896
+SIZE (collections1_1.zip) = 202298
diff -ruN --exclude=CVS /usr/ports/java/collections.original/pkg-plist /usr/ports/java/collections/pkg-plist
--- /usr/ports/java/collections.original/pkg-plist	Mon Apr  5 17:09:29 2004
+++ /usr/ports/java/collections/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -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
- at dirrm share/java/collections-1.1/javadoc
- at dirrm share/java/collections-1.1/
--- collections-1.1.patch ends here ---