aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2004-04-05 06:41:53 +0000
committerGreg Lewis <glewis@FreeBSD.org>2004-04-05 06:41:53 +0000
commitb96f3ee7cb0fb28cfd864f11171a5f31983fc9f8 (patch)
tree9c223872f920859cf6e89237bb387dbeb7ed3906 /Mk
parent09c882888444a8c12335f0c6ffcf932248f50007 (diff)
downloadports-b96f3ee7cb0fb28cfd864f11171a5f31983fc9f8.tar.gz
ports-b96f3ee7cb0fb28cfd864f11171a5f31983fc9f8.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.java.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index a555c443c5fa..8fa3e022a865 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -493,7 +493,9 @@ RUN_DEPENDS+= ${_DEPEND_JIKES}
@${FALSE}
. endif
_DEPEND_JAVA= ${JAVA}:${PORTSDIR}/${JAVA_PORT}
-. if !defined(JAVA_BUILD) && !defined(JAVA_RUN)
+. if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN)
+# In general, an EXTRACT_DEPENDS on java is not wanted, so only
+# automatically set up BUILD_DEPENDS and RUN_DEPENDS
. if !defined(NO_BUILD_DEPENDS_JAVA) && !defined(NO_BUILD)
BUILD_DEPENDS+= ${_DEPEND_JAVA}
. endif
@@ -501,6 +503,9 @@ BUILD_DEPENDS+= ${_DEPEND_JAVA}
RUN_DEPENDS+= ${_DEPEND_JAVA}
. endif
. else
+. if defined(JAVA_EXTRACT)
+EXTRACT_DEPENDS+= ${_DEPEND_JAVA}
+. endif
. if defined(JAVA_BUILD)
BUILD_DEPENDS+= ${_DEPEND_JAVA}
. endif