Date: Fri, 12 Mar 2004 18:26:31 +0100 (CET) From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> To: FreeBSD-gnats-submit@FreeBSD.org Subject: java/64171: Update port: java/jakarta-commons-collections [PATCH] Message-ID: <200403121726.i2CHQVSA006094@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200403121730.i2CHU4e8065038@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64171 >Category: java >Synopsis: Update port: java/jakarta-commons-collections [PATCH] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-java >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Mar 12 09:30:03 PST 2004 >Closed-Date: >Last-Modified: >Originator: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: >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 root@arabica.esil.univ-mrs.fr:/usr/obj/usr/src/sys/ASSIMILATED i386 >Description: - Update to version 3.0 - Now using PORTDOCS macro for automated PLIST build (should fix the deinstall issue) - Now using MASTER_SITE_APACHE_JAKARTA - Now installs various additional docs: e.g. DEVELOPERS-GUIDE.html - Now using JAVAJARDIR instead of JAVASHAREDIR/classes >How-To-Repeat: >Fix: diff -ur jakarta-commons-collections.original/Makefile jakarta-commons-collections/Makefile --- jakarta-commons-collections.original/Makefile Fri Mar 12 17:33:19 2004 +++ jakarta-commons-collections/Makefile Fri Mar 12 18:23:06 2004 @@ -6,9 +6,10 @@ # PORTNAME= commons-collections -PORTVERSION= 2.1 +PORTVERSION= 3.0 CATEGORIES= java -MASTER_SITES= http://jakarta.apache.org/builds/jakarta-commons/release/${PORTNAME}/v${PORTVERSION}/ +MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} +MASTER_SITE_SUBDIR= commons/collections/source/ PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -18,30 +19,32 @@ BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant USE_JAVA= 1.2+ +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} ANT?= ${LOCALBASE}/bin/ant -.if defined(NOPORTDOCS) -ANT_TARGET= dist-jar -.else -ANT_TARGET= dist-jar doc-javadoc +ANT_TARGET= jar +.if !defined(NOPORTDOCS) +ANT_TARGET+= javadoc +OTHERDOCS= DEVELOPERS-GUIDE.html LICENSE.txt PROPOSAL.html README.txt RELEASE-NOTES.html STATUS.html +PORTDOCS= apidocs ${OTHERDOCS} .endif -JAVASHAREDIR= ${PREFIX}/share/java -JARDIR= ${JAVASHAREDIR}/classes -JARFILE= ${PORTNAME}.jar +JARFILE= ${PORTNAME}-${PORTVERSION}.jar do-build: @cd ${WRKSRC} && ${ANT} ${ANT_TARGET} do-install: - @${ECHO} -n ">> Installing JAR as ${JARDIR}/${JARFILE}..." - @${CP} ${WRKSRC}/dist/${JARFILE} ${JARDIR}/ + @${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..." + @${CP} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/ @${ECHO} " [ DONE ]" .if !defined(NOPORTDOCS) @${ECHO} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${DOCSDIR} - @${CP} -r ${WRKSRC}/dist/docs/api/* ${DOCSDIR} + @${CP} -r ${WRKSRC}/build/docs/apidocs ${DOCSDIR} +.for file in ${OTHERDOCS} + @${CP} ${WRKSRC}/${file} ${DOCSDIR} +.endfor @${ECHO} " [ DONE ]" .endif diff -ur jakarta-commons-collections.original/distinfo jakarta-commons-collections/distinfo --- jakarta-commons-collections.original/distinfo Fri Mar 12 17:33:19 2004 +++ jakarta-commons-collections/distinfo Fri Mar 12 17:33:57 2004 @@ -1 +1 @@ -MD5 (commons-collections-2.1-src.tar.gz) = ee30c02b1b57693f72cd86c899b925d9 +MD5 (commons-collections-3.0-src.tar.gz) = 94d08b038526781e9f757048bb68cbae diff -ur jakarta-commons-collections.original/pkg-plist jakarta-commons-collections/pkg-plist --- jakarta-commons-collections.original/pkg-plist Fri Mar 12 17:33:19 2004 +++ jakarta-commons-collections/pkg-plist Fri Mar 12 17:53:00 2004 @@ -1,85 +1 @@ -share/doc/commons-collections/org/apache/commons/collections/iterators/UniqueFilterIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/package-frame.html -share/doc/commons-collections/org/apache/commons/collections/iterators/ArrayIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/CollatingIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/EnumerationIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/FilterIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/FilterListIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/IteratorChain.html -share/doc/commons-collections/org/apache/commons/collections/iterators/IteratorEnumeration.html -share/doc/commons-collections/org/apache/commons/collections/iterators/ListIteratorWrapper.html -share/doc/commons-collections/org/apache/commons/collections/iterators/ProxyIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/ProxyListIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/SingletonIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/SingletonListIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/TransformIterator.html -share/doc/commons-collections/org/apache/commons/collections/iterators/package-summary.html -share/doc/commons-collections/org/apache/commons/collections/comparators/ComparatorChain.html -share/doc/commons-collections/org/apache/commons/collections/comparators/package-frame.html -share/doc/commons-collections/org/apache/commons/collections/comparators/ComparableComparator.html -share/doc/commons-collections/org/apache/commons/collections/comparators/package-summary.html -share/doc/commons-collections/org/apache/commons/collections/comparators/NullComparator.html -share/doc/commons-collections/org/apache/commons/collections/comparators/ReverseComparator.html -share/doc/commons-collections/org/apache/commons/collections/comparators/TransformingComparator.html -share/doc/commons-collections/org/apache/commons/collections/Bag.html -share/doc/commons-collections/org/apache/commons/collections/Buffer.html -share/doc/commons-collections/org/apache/commons/collections/Closure.html -share/doc/commons-collections/org/apache/commons/collections/Factory.html -share/doc/commons-collections/org/apache/commons/collections/MultiMap.html -share/doc/commons-collections/org/apache/commons/collections/Predicate.html -share/doc/commons-collections/org/apache/commons/collections/PriorityQueue.html -share/doc/commons-collections/org/apache/commons/collections/SortedBag.html -share/doc/commons-collections/org/apache/commons/collections/Transformer.html -share/doc/commons-collections/org/apache/commons/collections/ArrayStack.html -share/doc/commons-collections/org/apache/commons/collections/BagUtils.html -share/doc/commons-collections/org/apache/commons/collections/BeanMap.html -share/doc/commons-collections/org/apache/commons/collections/BeanMap.MyMapEntry.html -share/doc/commons-collections/org/apache/commons/collections/BinaryHeap.html -share/doc/commons-collections/org/apache/commons/collections/BoundedFifoBuffer.html -share/doc/commons-collections/org/apache/commons/collections/BufferUtils.html -share/doc/commons-collections/org/apache/commons/collections/CollectionUtils.html -share/doc/commons-collections/org/apache/commons/collections/ComparatorUtils.html -share/doc/commons-collections/org/apache/commons/collections/CursorableLinkedList.html -share/doc/commons-collections/org/apache/commons/collections/CursorableLinkedList.Cursor.html -share/doc/commons-collections/org/apache/commons/collections/DefaultMapBag.html -share/doc/commons-collections/org/apache/commons/collections/DefaultMapEntry.html -share/doc/commons-collections/org/apache/commons/collections/DoubleOrderedMap.html -share/doc/commons-collections/org/apache/commons/collections/ExtendedProperties.html -share/doc/commons-collections/org/apache/commons/collections/FastArrayList.html -share/doc/commons-collections/org/apache/commons/collections/FastHashMap.html -share/doc/commons-collections/org/apache/commons/collections/FastTreeMap.html -share/doc/commons-collections/org/apache/commons/collections/HashBag.html -share/doc/commons-collections/org/apache/commons/collections/IteratorUtils.html -share/doc/commons-collections/org/apache/commons/collections/ListUtils.html -share/doc/commons-collections/org/apache/commons/collections/LRUMap.html -share/doc/commons-collections/org/apache/commons/collections/MapUtils.html -share/doc/commons-collections/org/apache/commons/collections/MultiHashMap.html -share/doc/commons-collections/org/apache/commons/collections/ProxyMap.html -share/doc/commons-collections/org/apache/commons/collections/ReferenceMap.html -share/doc/commons-collections/org/apache/commons/collections/SequencedHashMap.html -share/doc/commons-collections/org/apache/commons/collections/SetUtils.html -share/doc/commons-collections/org/apache/commons/collections/StaticBucketMap.html -share/doc/commons-collections/org/apache/commons/collections/SynchronizedPriorityQueue.html -share/doc/commons-collections/org/apache/commons/collections/TreeBag.html -share/doc/commons-collections/org/apache/commons/collections/UnboundedFifoBuffer.html -share/doc/commons-collections/org/apache/commons/collections/BufferOverflowException.html -share/doc/commons-collections/org/apache/commons/collections/package-summary.html -share/doc/commons-collections/org/apache/commons/collections/BufferUnderflowException.html -share/doc/commons-collections/org/apache/commons/collections/package-frame.html -share/doc/commons-collections/serialized-form.html -share/doc/commons-collections/packages.html -share/doc/commons-collections/package-list -share/doc/commons-collections/overview-summary.html -share/doc/commons-collections/overview-frame.html -share/doc/commons-collections/index.html -share/doc/commons-collections/index-all.html -share/doc/commons-collections/stylesheet.css -share/doc/commons-collections/allclasses-frame.html -share/java/classes/commons-collections.jar -@dirrm share/doc/commons-collections/org/apache/commons/collections/iterators -@dirrm share/doc/commons-collections/org/apache/commons/collections/comparators -@dirrm share/doc/commons-collections/org/apache/commons/collections -@dirrm share/doc/commons-collections/org/apache/commons -@dirrm share/doc/commons-collections/org/apache -@dirrm share/doc/commons-collections/org -@dirrm share/doc/commons-collections +share/java/classes/commons-collections-3.0.jar >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403121726.i2CHQVSA006094>