Date: Mon, 9 Aug 2004 16:22:24 +0200 (CEST) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: znerd@FreeBSD.org Subject: ports/70213: [PATCH] java/jakarta-commons-collections: update to 3.1 and USE_ANT Message-ID: <200408091422.i79EMOOR097953@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200408091430.i79EUMYO010363@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70213
>Category: ports
>Synopsis: [PATCH] java/jakarta-commons-collections: update to 3.1 and USE_ANT
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 09 14:30:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #5: Mon Aug 2 19:39:13 CEST
>Description:
- Update to 3.1
- Use USE_ANT
- Use %%JAVAJARDIR%%
- Use ${INSTALL_DATA} rather than ${CP}
Port maintainer (znerd@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- jakarta-commons-collections-3.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/java/jakarta-commons-collections/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- Makefile 15 Apr 2004 20:53:59 -0000 1.6
+++ Makefile 9 Aug 2004 14:13:52 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= commons-collections
-PORTVERSION= 3.0
+PORTVERSION= 3.1
CATEGORIES= java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= commons/collections/source/
@@ -16,42 +16,34 @@
MAINTAINER= znerd@FreeBSD.org
COMMENT= Classes that extend/augment the Java Collections Framework
-BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant
-
USE_JAVA= yes
JAVA_VERSION= 1.2+
+USE_ANT= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-ANT?= ${LOCALBASE}/bin/ant
-ANT_TARGET= jar
+ALL_TARGET= jar
.if !defined(NOPORTDOCS)
-ANT_TARGET+= javadoc
+ALL_TARGET+= javadoc
OTHERDOCS= DEVELOPERS-GUIDE.html LICENSE.txt PROPOSAL.html README.txt RELEASE-NOTES.html STATUS.html
PORTDOCS= apidocs ${OTHERDOCS}
.endif
JARFILE= ${PORTNAME}-${PORTVERSION}.jar
DESTJARFILE= ${PORTNAME}.jar
-PLIST_FILES+= ${JAVAJARDIR:S,^${PREFIX}/,,}/${DESTJARFILE}
-
-do-build:
- @cd ${WRKSRC} && ${ANT} ${ANT_TARGET}
+PLIST_FILES+= %%JAVAJARDIR%%/${DESTJARFILE}
do-install:
@${ECHO_CMD} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
@${MKDIR} ${JAVAJARDIR}
- @${CP} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
+ @${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
@${ECHO_CMD} " [ DONE ]"
.if !defined(NOPORTDOCS)
@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
- @${MKDIR} ${DOCSDIR}
- @${CP} -r ${WRKSRC}/build/docs/apidocs ${DOCSDIR}
- @${ECHO_CMD} -n " apidocs"
-.for DOCFILE in ${OTHERDOCS}
- @${CP} ${WRKSRC}/${DOCFILE} ${DOCSDIR}
- @${ECHO_CMD} -n " ${DOCFILE}"
-.endfor
+ @cd ${WRKSRC}/build/docs && ${FIND} apidocs -type d -exec ${MKDIR} ${DOCSDIR}/{} ";"
+ @cd ${WRKSRC}/build/docs && ${FIND} apidocs -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} ";"
+ @cd ${WRKSRC} && ${FIND} ${OTHERDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} ";"
+ @cd ${WRKSRC} && ${FIND} ${OTHERDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} ";"
@${ECHO_CMD} " [ DONE ]"
.endif
Index: distinfo
===================================================================
RCS file: /var/fcvs/ports/java/jakarta-commons-collections/distinfo,v
retrieving revision 1.4
diff -u -u -r1.4 distinfo
--- distinfo 15 Apr 2004 20:53:59 -0000 1.4
+++ distinfo 9 Aug 2004 14:05:59 -0000
@@ -1,2 +1,2 @@
-MD5 (commons-collections-3.0-src.tar.gz) = 94d08b038526781e9f757048bb68cbae
-SIZE (commons-collections-3.0-src.tar.gz) = 1067775
+MD5 (commons-collections-3.1-src.tar.gz) = 2da710d9c81ae85ee3a386e7ed1b1fe8
+SIZE (commons-collections-3.1-src.tar.gz) = 1137330
--- jakarta-commons-collections-3.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408091422.i79EMOOR097953>