aboutsummaryrefslogtreecommitdiff
path: root/java/jakarta-commons-dbcp
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2004-04-16 15:26:10 +0000
committerGreg Lewis <glewis@FreeBSD.org>2004-04-16 15:26:10 +0000
commit8b76648e17c0c761e15b249dccbb0e5f3e5f5feb (patch)
tree696751c796f7f1e0a94c03e3347b1f3a08c76ef7 /java/jakarta-commons-dbcp
parentebec63ec353f944201217c8e1f5ae2c753b9c4c5 (diff)
downloadports-8b76648e17c0c761e15b249dccbb0e5f3e5f5feb.tar.gz
ports-8b76648e17c0c761e15b249dccbb0e5f3e5f5feb.zip
. Require JDK 1.4 or better (fixes bento build). [1, 2]
. Use MASTER_SITE_APACHE_JAKARTA. [1] . bsd.java.mk 2.0 compliant. [1] . Removed pkg-plist using PLIST_FILES. [1] . Forced ANT to use the selected version of Java. PR: 65617 [1], 65349 [2] Submitted by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr> Anton Yudin <toha@toha.org.ua> Approved by: Anton Yudin <toha@toha.org.ua> (maintainer)
Notes
Notes: svn path=/head/; revision=107242
Diffstat (limited to 'java/jakarta-commons-dbcp')
-rw-r--r--java/jakarta-commons-dbcp/Makefile11
-rw-r--r--java/jakarta-commons-dbcp/pkg-plist1
2 files changed, 7 insertions, 5 deletions
diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index 3d4e01a7867a..8b7feb884ae4 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -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 @@ COMMENT= The DBCP Component
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,13 +35,15 @@ JAVASHAREDIR= ${PREFIX}/share/java
JARDIR= ${JAVASHAREDIR}/classes
JARFILE= ${PORTNAME}.jar
DESTJARFILE= ${PORTNAME}.jar
+PLIST_FILES+= ${JAVAJARDIR:S,^${PREFIX}/,,}/${DESTJARFILE}
post-patch:
@${CP} ${WRKSRC}/LICENSE.txt ${WRKSRC}/../LICENSE
do-build:
@cd ${WRKSRC} && \
- ${SETENV} ANT_INCLUDE_SHARED_JARS=YES ${ANT} ${ANT_TARGET}
+ ${SETENV} JAVA_HOME=${JAVA_HOME} ANT_INCLUDE_SHARED_JARS=YES \
+ ${ANT} ${ANT_TARGET}
do-install:
@${ECHO} -n ">> Installing JAR as ${JARDIR}/${DESTJARFILE}..."
diff --git a/java/jakarta-commons-dbcp/pkg-plist b/java/jakarta-commons-dbcp/pkg-plist
deleted file mode 100644
index 32f95c279ae7..000000000000
--- a/java/jakarta-commons-dbcp/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-share/java/classes/commons-dbcp.jar