diff options
| author | seb <seb@pkgsrc.org> | 2006-05-14 14:40:36 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2006-05-14 14:40:36 +0000 |
| commit | a05a8eb9ddcb16f43607f5858b17b27b623a8667 (patch) | |
| tree | b42a7fc2501d551638b195690a4c2507e2e5c5ac /lang/sun-jre15 | |
| parent | e12955fc46634fb3cd7df3815eeeaf3c67b1857b (diff) | |
| download | pkgsrc-a05a8eb9ddcb16f43607f5858b17b27b623a8667.tar.gz | |
Fix CHECK_FILES build
- use REQD_DIRS instead of OWN_DIRS as the latter ends up in
CHECK_FILES_SKIP causing a check-files error (files both listed in
PLIST and CHECK_FILES_SKIP are reported as an "error"). Besides
OWN_DIRS creation at ADDing time is subject to PKG_CONFIG setting,
so these directories might not be created which would cause problems.
- Add $JAVA_HOME/lib/$MACHINE_ARCH/client/classes.jsa to CHECK_FILES_SKIP
Diffstat (limited to 'lang/sun-jre15')
| -rw-r--r-- | lang/sun-jre15/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index 92cef8361d2..b331930aa10 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/14 14:09:34 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2006/05/14 14:40:36 seb Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -12,12 +12,12 @@ SHORT_NAME= JRE WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//} JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \ servertool tnameserv -OWN_DIRS= ${JAVA_HOME} -OWN_DIRS+= ${JAVA_HOME}/lib -OWN_DIRS+= ${JAVA_HOME}/lib/applet -OWN_DIRS+= ${JAVA_HOME}/lib/images -OWN_DIRS+= ${JAVA_HOME}/lib/images/cursors -OWN_DIRS+= ${JAVA_HOME}/lib/security +REQD_DIRS= ${JAVA_HOME} +REQD_DIRS+= ${JAVA_HOME}/lib +REQD_DIRS+= ${JAVA_HOME}/lib/applet +REQD_DIRS+= ${JAVA_HOME}/lib/images +REQD_DIRS+= ${JAVA_HOME}/lib/images/cursors +REQD_DIRS+= ${JAVA_HOME}/lib/security CONF_FILES= # empty .sinclude "sfiles.mk" .for FILE in ${SFILES} @@ -35,6 +35,8 @@ DEINSTALL_TEMPLATE+= ${PKGDIR}/DEINSTALL.tmpl FILES_SUBST+= JAVA_HOME=${JAVA_HOME:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} +CHECK_FILES_SKIP+= ${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa + .if !empty(PKG_OPTIONS:Msun-jre-jce) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip PLIST_SUBST+= SUN_JRE15_USE_JCE="" |