[pkgsrc/trunk]: pkgsrc/lang/sun-jre6 pkglint, use ${PLIST.x11} instead of PLI...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e7cf4a34380
branches:  trunk
changeset: 555681:2e7cf4a34380
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Mar 06 16:18:04 2009 +0000

description:
pkglint, use ${PLIST.x11} instead of PLIST_SUBST

diffstat:

 lang/sun-jre6/Makefile         |  17 ++++++++---------
 lang/sun-jre6/Makefile.common  |   7 ++++---
 lang/sun-jre6/PLIST.linux-i386 |   4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diffs (102 lines):

diff -r 1e091a32b71b -r 2e7cf4a34380 lang/sun-jre6/Makefile
--- a/lang/sun-jre6/Makefile    Fri Mar 06 15:53:21 2009 +0000
+++ b/lang/sun-jre6/Makefile    Fri Mar 06 16:18:04 2009 +0000
@@ -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 @@
 MASTER_SITES=  # empty
 
 DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u12
-SHORT_NAME=    JRE
 
 USE_TOOLS+=    pax
 
@@ -30,8 +29,8 @@
 
 .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 @@
 
 .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 @@
 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 -r 1e091a32b71b -r 2e7cf4a34380 lang/sun-jre6/Makefile.common
--- a/lang/sun-jre6/Makefile.common     Fri Mar 06 15:53:21 2009 +0000
+++ b/lang/sun-jre6/Makefile.common     Fri Mar 06 16:18:04 2009 +0000
@@ -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 @@
 
 .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+=        " 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 -r 1e091a32b71b -r 2e7cf4a34380 lang/sun-jre6/PLIST.linux-i386
--- a/lang/sun-jre6/PLIST.linux-i386    Fri Mar 06 15:53:21 2009 +0000
+++ b/lang/sun-jre6/PLIST.linux-i386    Fri Mar 06 16:18:04 2009 +0000
@@ -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/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