summaryrefslogtreecommitdiff
path: root/lang/sun-jre6
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2009-03-06 16:18:04 +0000
committerabs <abs@pkgsrc.org>2009-03-06 16:18:04 +0000
commite3ed8eb8c198394b2c9c0327fab8335bf5dbc562 (patch)
tree817cec9271fc8e573918337c35fa85182cc026fd /lang/sun-jre6
parent5d68b98b8d79dd02bc9511fa0425628053e227a4 (diff)
downloadpkgsrc-e3ed8eb8c198394b2c9c0327fab8335bf5dbc562.tar.gz
pkglint, use ${PLIST.x11} instead of PLIST_SUBST
Diffstat (limited to 'lang/sun-jre6')
-rw-r--r--lang/sun-jre6/Makefile17
-rw-r--r--lang/sun-jre6/Makefile.common7
-rw-r--r--lang/sun-jre6/PLIST.linux-i3864
3 files changed, 14 insertions, 14 deletions
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 58c5c6e5927..055abe3db7e 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/03/03 11:09:03 abs Exp $
+# $NetBSD: Makefile,v 1.20 2009/03/06 16:18:04 abs Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
# Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -9,7 +9,6 @@ PKGNAME= sun-jre6-6.0.12
MASTER_SITES= # empty
DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u12
-SHORT_NAME= JRE
USE_TOOLS+= pax
@@ -30,8 +29,8 @@ LICENSE= sun-jre6-license
.sinclude "sfiles-${EMUL_ARCH}.mk"
-.for FILE in ${SFILES}
-CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
+.for file in ${SFILES}
+CONF_FILES+= ${JAVA_HOME}/lib/${file}.default ${JAVA_HOME}/lib/${file}
.endfor
CHECK_FILES_SKIP+= ${JAVA_HOME}/lib/${EMUL_ARCH}/client/classes.jsa
@@ -42,7 +41,9 @@ PKG_SUPPORTED_OPTIONS= sun-jre-jce
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= jce
+PLIST_SRC= PLIST.linux-i386
+
+PLIST_VARS+= jce x11
.if !empty(PKG_OPTIONS:Msun-jre-jce)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-6.zip
PLIST.jce= yes
@@ -67,14 +68,12 @@ PKG_FAIL_REASON+= "${LIBX11} does not exist. Please install the" \
LIBX11= ${X11PREFIX}/lib/libX11.so.6
. endif
-PLIST_SUBST+= LIBX11=
-
.PHONY: create-library-symlinks
post-install: create-library-symlinks
create-library-symlinks:
${RUN}${LN} -fs ${LIBX11} ${DESTDIR}${JAVA_HOME}/lib/${EMUL_ARCH}
-.else
-PLIST_SUBST+= LIBX11="@comment "
+
+PLIST.x11= yes
.endif
post-extract:
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index 47fad949263..297c7ad761b 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.10 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile.common,v 1.11 2009/03/06 16:18:04 abs Exp $
+# used by lang/sun-jre6/Makefile
CATEGORIES= lang java
COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -40,7 +41,7 @@ BUILD_DIRS= # empty
.include "../../mk/bsd.prefs.mk"
-JAVA_HOME= ${LOCALBASE}/java/sun-6
+JAVA_HOME= ${PREFIX}/java/sun-6
JAVA_NAME= sun6
JAVA_UNLIMIT= datasize
JAVA_LD_LIBRARY_PATH= ${JAVA_HOME}/lib/${EMUL_ARCH}/jli
@@ -66,7 +67,7 @@ FETCH_MESSAGE+= " Click Download for '${DOWNLOAD_NAME}', read and accept the"
FETCH_MESSAGE+= " license, then choose 'Linux self-extracting file'."
post-fetch:
- @if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
+ if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \
fi
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index 1692dcbf098..337531f6af5 100644
--- a/lang/sun-jre6/PLIST.linux-i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.12 2009/02/20 11:56:55 abs Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.13 2009/03/06 16:18:04 abs Exp $
bin/sun6-java
bin/sun6-javaws
bin/sun6-keytool
@@ -146,7 +146,7 @@ java/sun-6/lib/i386/headless/libmawt.so
java/sun-6/lib/i386/jli/libjli.so
java/sun-6/lib/i386/jvm.cfg.default
java/sun-6/lib/i386/libJdbcOdbc.so
-${LIBX11}java/sun-6/lib/i386/libX11.so.6
+${PLIST.x11}java/sun-6/lib/i386/libX11.so.6
java/sun-6/lib/i386/libawt.so
java/sun-6/lib/i386/libcmm.so
java/sun-6/lib/i386/libdcpr.so