diff options
| author | schmonz <schmonz@pkgsrc.org> | 2002-07-31 19:33:19 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2002-07-31 19:33:19 +0000 |
| commit | ee97dff574a69900e23ccf73c32ae7925cb9dc82 (patch) | |
| tree | 24806c5a9ca9829ef394ca7f1e89032797a204cc | |
| parent | 146c7b6f8860773ff18d5b542f76fb7faedb092e (diff) | |
| download | pkgsrc-ee97dff574a69900e23ccf73c32ae7925cb9dc82.tar.gz | |
Mechanically replace DEPENDS and BUILD_DEPENDS on a JDK with the
appropriate USE_JAVA and PKG_JVM incantations. Spotted by wiz.
| -rw-r--r-- | devel/javadeps/Makefile | 4 | ||||
| -rw-r--r-- | lang/jbuilder-jit/Makefile | 6 | ||||
| -rw-r--r-- | misc/openoffice/Makefile | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile index ddd06c3c835..aa01ae1da10 100644 --- a/devel/javadeps/Makefile +++ b/devel/javadeps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/10/17 12:32:17 agc Exp $ +# $NetBSD: Makefile,v 1.2 2002/07/31 19:33:19 schmonz Exp $ # DISTNAME= javadeps-1.1 @@ -10,7 +10,7 @@ MAINTAINER= ben@wongs.net HOMEPAGE= http://www.vet.com.au/java/javadeps/ COMMENT= Automatic dependency tracking for Java -DEPENDS= sun-jdk-[0-9]*:../../lang/sun-jdk13 +USE_JAVA= run WRKSRC= ${WRKDIR}/JavaDeps-1.1 diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile index fc28d7e4728..8a6f4f76622 100644 --- a/lang/jbuilder-jit/Makefile +++ b/lang/jbuilder-jit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/31 14:32:58 tv Exp $ +# $NetBSD: Makefile,v 1.7 2002/07/31 19:33:20 schmonz Exp $ # DISTNAME= unix_jb35foundation @@ -10,8 +10,8 @@ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.inprise.com/jbuilder/foundation/linux.html COMMENT= Just-In-Time compiler for Linux Java Virtual Machine -# works with both 1.2.2 and 1.3 JVMs -DEPENDS= sun-jre-[0-9]*:../../lang/sun-jre13 +USE_JAVA= run +PKG_JVM= sun-jdk13 # works with both 1.2.2 and 1.3 JVMs WRKSRC= ${WRKDIR}/javacomp-1.2.15 EXTRACT_ELEMENTS= LinuxJIT/javacomp-1.2.15.tar.gz diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 94f96a1b271..c221d05f225 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/06/15 21:08:50 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2002/07/31 19:33:20 schmonz Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 1 @@ -30,7 +30,9 @@ BUILD_DEPENDS+= gmake-[0-9]*:../../devel/gmake BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip BUILD_DEPENDS+= stlport>=4.0nb1:../../devel/stlport -BUILD_DEPENDS+= sun-jdk>=1.3.0:../../lang/sun-jdk13 + +USE_JAVA= build +PKG_JVM= sun-jdk .include "../../lang/perl5/buildlink.mk" .include "../../mk/pthread.buildlink.mk" |