[pkgsrc/trunk]: pkgsrc/lang/sun-jre15 Fixed some pkglint warnings.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/29ccc06dcbe4
branches:  trunk
changeset: 514211:29ccc06dcbe4
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Jun 08 21:21:21 2006 +0000

description:
Fixed some pkglint warnings.

diffstat:

 lang/sun-jre15/Makefile.common |  26 +++++++++++---------------
 lang/sun-jre15/buildlink3.mk   |   4 ++--
 lang/sun-jre15/builtin.mk      |   4 ++--
 3 files changed, 15 insertions(+), 19 deletions(-)

diffs (77 lines):

diff -r c031f32b1872 -r 29ccc06dcbe4 lang/sun-jre15/Makefile.common
--- a/lang/sun-jre15/Makefile.common    Thu Jun 08 21:13:53 2006 +0000
+++ b/lang/sun-jre15/Makefile.common    Thu Jun 08 21:21:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2006/04/22 09:22:10 rillig Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/06/08 21:21:21 rillig Exp $
 
 CATEGORIES=    lang java
 COMMENT=       Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -46,20 +46,16 @@
 DEPENDS+=      suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
-_FETCH_MESSAGE=                                                        \
-       ${ECHO} "======================================================================"; \
-       ${ECHO} ;                                                       \
-       ${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}";     \
-       ${ECHO} " must be fetched into:";                               \
-       ${ECHO} "       ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}";         \
-       ${ECHO} " from:";                                               \
-       ${ECHO} "       ${DOWNLOAD}";                                   \
-       ${ECHO} "       or ${ARCHIVE}";                                 \
-       ${ECHO} ; \
-       ${ECHO} " Click 'Download ${DOWNLOAD_NAME}', read and accept the"; \
-       ${ECHO} " license, then choose 'Linux self-extracting file'.";  \
-       ${ECHO} ;                                                       \
-       ${ECHO} "======================================================================"
+FETCH_MESSAGE+=        " The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}"
+FETCH_MESSAGE+=        ""
+FETCH_MESSAGE+=        " must be fetched into:"
+FETCH_MESSAGE+=        "       ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"
+FETCH_MESSAGE+=        " from:"
+FETCH_MESSAGE+=        "       ${DOWNLOAD}"
+FETCH_MESSAGE+=        "       or ${ARCHIVE}"
+FETCH_MESSAGE+=        ""
+FETCH_MESSAGE+=        " Click 'Download ${DOWNLOAD_NAME}', read and accept the"
+FETCH_MESSAGE+=        " license, then choose 'Linux self-extracting file'."
 
 post-fetch:
        @if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
diff -r c031f32b1872 -r 29ccc06dcbe4 lang/sun-jre15/buildlink3.mk
--- a/lang/sun-jre15/buildlink3.mk      Thu Jun 08 21:13:53 2006 +0000
+++ b/lang/sun-jre15/buildlink3.mk      Thu Jun 08 21:21:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:22 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/06/08 21:21:21 rillig Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 SUN_JRE15_BUILDLINK3_MK:=      ${SUN_JRE15_BUILDLINK3_MK}+
@@ -15,8 +15,8 @@
 BUILDLINK_ABI_DEPENDS.sun-jre15?=              sun-jre15>=5.0.6nb2
 BUILDLINK_PKGSRCDIR.sun-jre15?=                ../../lang/sun-jre15
 BUILDLINK_JAVA_PREFIX.sun-jre15=       ${PREFIX}/java/sun-1.5
-.endif # SUN_JRE15_BUILDLINK3_MK
 
 UNLIMIT_RESOURCES+=    datasize        # Must be at least 131204
+.endif # SUN_JRE15_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r c031f32b1872 -r 29ccc06dcbe4 lang/sun-jre15/builtin.mk
--- a/lang/sun-jre15/builtin.mk Thu Jun 08 21:13:53 2006 +0000
+++ b/lang/sun-jre15/builtin.mk Thu Jun 08 21:21:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2006/05/10 07:14:33 minskim Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/06/08 21:21:21 rillig Exp $
 
 BUILTIN_PKG:=  sun-jre15
 
@@ -29,7 +29,7 @@
     !empty(IS_BUILTIN.sun-jre15:M[yY][eE][sS]) && \
     empty(JAVAVM15:M__nonexistent__)
 BUILTIN_VERSION.sun-jre15!=                                            \
-       ${BASENAME} /System/Library/Frameworks/JavaVM.framework/Versions/1.5.* 
+       ${BASENAME} /System/Library/Frameworks/JavaVM.framework/Versions/1.5.*
 BUILTIN_PKG.sun-jre15= sun-jre15-${BUILTIN_VERSION.sun-jre15}
 .endif
 MAKEVARS+=     BUILTIN_PKG.sun-jre15