diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-03 19:51:20 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-03 19:51:20 +0000 |
| commit | 7472947b849436f6342532ff4de8b36451d09556 (patch) | |
| tree | 480c4d4bd3bc8749ad55c9effa4e3b2c1bf44ab0 /mk | |
| parent | 368a3794f9fc393c439f4e374bc48ba80b302334 (diff) | |
| download | pkgsrc-7472947b849436f6342532ff4de8b36451d09556.tar.gz | |
Fix _JAVA_PKGBASE definition in "sun-jdk" case so that when used as a
pattern with "pkg_info -e <pattern>", we can actually match a full package
name.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 60086cc3539..0fd9e02e6b6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1025 2002/08/03 00:15:30 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1026 2002/08/03 19:51:20 jlam Exp $ # # This file is in the public domain. # @@ -109,7 +109,7 @@ DEPENDS+= sun-jre13-[0-9]*:../../lang/sun-jre13 . if ${MACHINE_PLATFORM:MNetBSD-1.5Z[A-Z]-i386} != "" || \ ${MACHINE_PLATFORM:MNetBSD-1.[6-9]*-i386} != "" || \ ${MACHINE_PLATFORM:MLinux-*-i386} != "" -_JAVA_PKGBASE= sun-jdk1[34] +_JAVA_PKGBASE= sun-jdk1[34]* _JAVA_PREFIX_DEFAULT= ${LOCALBASE}/java/sun-1.4.0 _JAVA_HOME= ${_JAVA_PREFIX} ${_JDK_DEPMETHOD}+= sun-jdk1[34]-[0-9]*:../../lang/sun-jdk14 @@ -117,7 +117,7 @@ DEPENDS+= sun-jre1[34]-[0-9]*:../../lang/sun-jre14 . elif ${MACHINE_PLATFORM:MNetBSD-*-i386} != "" || \ ${MACHINE_PLATFORM:MDarwin-*-*} != "" || \ ${MACHINE_PLATFORM:MLinux-*-i386} != "" -_JAVA_PKGBASE= sun-jdk1[34] +_JAVA_PKGBASE= sun-jdk1[34]* . if ${OPSYS} == "Darwin" _JAVA_PREFIX_DEFAULT= /usr . else |