cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

take flavors into account in @pkgpath

Browse Source 
ok espie@
This commit is contained in:
steven 2006-11-24 21:30:13 +00:00
parent dd03bc9488
commit 330f0193b5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/jdk/1.5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2006/11/22 19:42:54 kurt Exp $ # $OpenBSD: Makefile,v 1.29 2006/11/24 21:30:13 steven Exp $
ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS= amd64 i386
@ -6,8 +6,8 @@ COMMENT-main= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}" COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.5.0 V= 1.5.0
DISTNAME= jdk-1_5_0 DISTNAME= jdk-1_5_0
PKGNAME-main= jdk-${V}p23 PKGNAME-main= jdk-${V}p24
PKGNAME-jre= jre-${V}p23 PKGNAME-jre= jre-${V}p24
CATEGORIES= devel/jdk java CATEGORIES= devel/jdk java
@ -115,7 +115,9 @@ MAKE_ENV+= DONT_BUILD_DEPLOY="YES"
JDKHOME= jdk-${V} JDKHOME= jdk-${V}
JREHOME= jre-${V} JREHOME= jre-${V}
SUBST_VARS= JDKHOME JREHOME MAINPATH= devel/jdk/1.5${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= JDKHOME JREHOME MAINPATH
.if ${MACHINE_ARCH} == "i386" .if ${MACHINE_ARCH} == "i386"
PKG_ARGS+= -Dclient_vm=1 PKG_ARGS+= -Dclient_vm=1

3
devel/jdk/1.5/pkg/PLIST-main
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/22 19:42:54 kurt Exp $ @comment $OpenBSD: PLIST-main,v 1.2 2006/11/24 21:30:13 steven Exp $
@option no-default-conflict @option no-default-conflict
@conflict jdk->=1.5,<1.6 @conflict jdk->=1.5,<1.6
@pkgpath devel/jdk/1.5,native_bootstrap @pkgpath devel/jdk/1.5,native_bootstrap
@pkgpath ${MAINPATH}
${JDKHOME}/ ${JDKHOME}/
${JDKHOME}/COPYRIGHT ${JDKHOME}/COPYRIGHT
${JDKHOME}/LICENSE ${JDKHOME}/LICENSE