From 1c00fa77a4964651de4e5ce4a0febca7cef31da2 Mon Sep 17 00:00:00 2001 From: linimon Date: Mon, 31 May 2004 00:15:48 +0000 Subject: Add "ant" build dependancy; correct ${PKGINSTALL} usage (picked up by Andreas Kasparz ) PR: ports/67282 Submitted by: Jonathan Chen (maintainer) --- java/jboss3/Makefile | 4 +++- java/jboss4/Makefile | 4 +++- java/jboss5/Makefile | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/java/jboss3/Makefile b/java/jboss3/Makefile index 933417114ce5..774699c44fc2 100644 --- a/java/jboss3/Makefile +++ b/java/jboss3/Makefile @@ -16,6 +16,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= jonc@chen.org.nz COMMENT= JBoss 3.x, an open-source J2EE application server +BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant + LATEST_LINK= jboss3 USE_JAVA= 1.4+ @@ -101,7 +103,7 @@ do-build: (cd ${WRKSRC}/build && ${SETENV} JAVA_HOME=${JAVA_HOME} PATH=${PATH}:${JAVA_HOME}/bin ${SH} build.sh) pre-install: - @PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: ${MKDIR} ${APP_HOME} && ${CHOWN} ${USER}:${GROUP} ${APP_HOME} diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile index 933417114ce5..774699c44fc2 100644 --- a/java/jboss4/Makefile +++ b/java/jboss4/Makefile @@ -16,6 +16,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= jonc@chen.org.nz COMMENT= JBoss 3.x, an open-source J2EE application server +BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant + LATEST_LINK= jboss3 USE_JAVA= 1.4+ @@ -101,7 +103,7 @@ do-build: (cd ${WRKSRC}/build && ${SETENV} JAVA_HOME=${JAVA_HOME} PATH=${PATH}:${JAVA_HOME}/bin ${SH} build.sh) pre-install: - @PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: ${MKDIR} ${APP_HOME} && ${CHOWN} ${USER}:${GROUP} ${APP_HOME} diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile index 933417114ce5..774699c44fc2 100644 --- a/java/jboss5/Makefile +++ b/java/jboss5/Makefile @@ -16,6 +16,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= jonc@chen.org.nz COMMENT= JBoss 3.x, an open-source J2EE application server +BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant + LATEST_LINK= jboss3 USE_JAVA= 1.4+ @@ -101,7 +103,7 @@ do-build: (cd ${WRKSRC}/build && ${SETENV} JAVA_HOME=${JAVA_HOME} PATH=${PATH}:${JAVA_HOME}/bin ${SH} build.sh) pre-install: - @PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: ${MKDIR} ${APP_HOME} && ${CHOWN} ${USER}:${GROUP} ${APP_HOME} -- cgit