Date: Fri, 16 Apr 2004 14:36:22 +0200 (CEST) From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kris@obsecurity.org Subject: ports/65617: [PATCH] java/jakarta-commons-dbcp: fix build on bento, use MASTER_SITE_APACHE_JAKARTA Message-ID: <200404161236.i3GCaMVk053197@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200404161240.i3GCeNHn069354@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65617 >Category: ports >Synopsis: [PATCH] java/jakarta-commons-dbcp: fix build on bento, use MASTER_SITE_APACHE_JAKARTA >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Apr 16 05:40:22 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Herve Quiroz >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 >Description: - Fix build on bento: now JDK 1.4+ is used (required javax.sql package is not available with older JDKs) - Use MASTER_SITE_APACHE_JAKARTA (so portlint does not complain) - bsd.java.mk 2.0 compliant - Removed pkg-plist using PLIST_FILES for the JAR file The first point is critical, as the port does not currently build on bento. Port maintainer (toha@toha.org.ua) is cc'd. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- jakarta-commons-dbcp-1.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/java/jakarta-commons-dbcp.original/Makefile /usr/ports/java/jakarta-commons-dbcp/Makefile --- /usr/ports/java/jakarta-commons-dbcp.original/Makefile Fri Apr 16 13:35:37 2004 +++ /usr/ports/java/jakarta-commons-dbcp/Makefile Fri Apr 16 14:27:46 2004 @@ -8,7 +8,8 @@ PORTNAME= commons-dbcp PORTVERSION= 1.1 CATEGORIES= java -MASTER_SITES= http://www.apache.org/dist/jakarta/commons/dbcp/source/ +MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} +MASTER_SITE_SUBDIR= commons/dbcp/source PKGNAMEPREFIX= jakarta- DISTNAME= ${PORTNAME}-${PORTVERSION}-src DIST_SUBDIR= jakarta @@ -19,10 +20,10 @@ BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant \ ${JAVAJARDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool -USE_JAVA= 1.2+ +USE_JAVA= yes +JAVA_VERSION= 1.4+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} ANT?= ${LOCALBASE}/bin/ant .if defined(NOPORTDOCS) ANT_TARGET= build-jar @@ -34,6 +35,7 @@ JARDIR= ${JAVASHAREDIR}/classes JARFILE= ${PORTNAME}.jar DESTJARFILE= ${PORTNAME}.jar +PLIST_FILES+= ${JAVAJARDIR:S,^${PREFIX}/,,}/${DESTJARFILE} post-patch: @${CP} ${WRKSRC}/LICENSE.txt ${WRKSRC}/../LICENSE diff -ruN --exclude=CVS /usr/ports/java/jakarta-commons-dbcp.original/pkg-plist /usr/ports/java/jakarta-commons-dbcp/pkg-plist --- /usr/ports/java/jakarta-commons-dbcp.original/pkg-plist Fri Apr 16 13:35:38 2004 +++ /usr/ports/java/jakarta-commons-dbcp/pkg-plist Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -share/java/classes/commons-dbcp.jar --- jakarta-commons-dbcp-1.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?200404161236.i3GCaMVk053197>