[pkgsrc/trunk]: pkgsrc/lang Update fetch text, COMMENT, and DESCR to match Su...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a30889f5b6dc
branches:  trunk
changeset: 501747:a30889f5b6dc
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Oct 27 22:57:27 2005 +0000

description:
Update fetch text, COMMENT, and DESCR to match Sun's newer phrasing of
the product name and version on their download pages.  Bump PKGREVISION.

diffstat:

 lang/sun-jdk15/DESCR           |   2 +-
 lang/sun-jdk15/Makefile        |   7 +++----
 lang/sun-jre15/DESCR           |   2 +-
 lang/sun-jre15/Makefile        |   7 +++----
 lang/sun-jre15/Makefile.common |  14 +++++++-------
 5 files changed, 15 insertions(+), 17 deletions(-)

diffs (95 lines):

diff -r 88e8283c34f4 -r a30889f5b6dc lang/sun-jdk15/DESCR
--- a/lang/sun-jdk15/DESCR      Thu Oct 27 22:39:58 2005 +0000
+++ b/lang/sun-jdk15/DESCR      Thu Oct 27 22:57:27 2005 +0000
@@ -1,1 +1,1 @@
-This is the Linux port of the Sun Java(tm) Development Kit, version 1.5.
+This is the Linux port of the Sun Java(tm) Development Kit (J2SE 5.0).
diff -r 88e8283c34f4 -r a30889f5b6dc lang/sun-jdk15/Makefile
--- a/lang/sun-jdk15/Makefile   Thu Oct 27 22:39:58 2005 +0000
+++ b/lang/sun-jdk15/Makefile   Thu Oct 27 22:57:27 2005 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2005/10/11 18:07:48 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/27 22:57:27 tv Exp $
 
 DISTNAME=      jdk-1_5_0_05-linux-i586
 PKGNAME=       sun-jdk15-5.0.5
+PKGREVISION=   1
 MASTER_SITES=  # empty
 
-COMMENT=       Sun's Java(tm) 2 SDK, Standard Edition 1.5.0
-
-SHORT=         SDK
+SHORT_NAME=    JDK
 
 DEPENDS=       ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15
 
diff -r 88e8283c34f4 -r a30889f5b6dc lang/sun-jre15/DESCR
--- a/lang/sun-jre15/DESCR      Thu Oct 27 22:39:58 2005 +0000
+++ b/lang/sun-jre15/DESCR      Thu Oct 27 22:57:27 2005 +0000
@@ -1,1 +1,1 @@
-This is the Linux port of the Sun Java(tm) Runtime Environment, version 1.5.
+This is the Linux port of the Sun Java(tm) Runtime Environment (J2SE 5.0).
diff -r 88e8283c34f4 -r a30889f5b6dc lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Thu Oct 27 22:39:58 2005 +0000
+++ b/lang/sun-jre15/Makefile   Thu Oct 27 22:57:27 2005 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.22 2005/10/11 18:07:48 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/10/27 22:57:27 tv Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=      jre-1_5_0_05-linux-i586
 PKGNAME=       sun-jre15-5.0.5
+PKGREVISION=   1
 MASTER_SITES=  # empty
 
-COMMENT=       Sun's Java(tm) 2 Runtime Environment 1.5.0
-
-SHORT=         JRE
+SHORT_NAME=    JRE
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//}
 USE_PKGINSTALL=        yes
diff -r 88e8283c34f4 -r a30889f5b6dc lang/sun-jre15/Makefile.common
--- a/lang/sun-jre15/Makefile.common    Thu Oct 27 22:39:58 2005 +0000
+++ b/lang/sun-jre15/Makefile.common    Thu Oct 27 22:57:27 2005 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile.common,v 1.7 2005/05/20 21:34:30 markd Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/10/27 22:57:27 tv Exp $
 
 CATEGORIES=    lang java
+COMMENT=       Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
 EXTRACT_SUFX=  .bin
 
 MAINTAINER=    tv%duh.org@localhost
 HOMEPAGE=      http://java.sun.com/
 DOWNLOAD=      http://java.sun.com/j2se/1.5.0/download.html
+DOWNLOAD_NAME= ${SHORT_NAME} 5.0 Update ${PKGNAME_NOREV:C/^.*\.//}
 ARCHIVE=       http://java.sun.com/products/archive/index.html
 
 LICENSE=       jdk13-license
@@ -39,20 +41,18 @@
 _FETCH_MESSAGE=                                                        \
        ${ECHO} "======================================================================"; \
        ${ECHO} ;                                                       \
-       ${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing";      \
-       ${ECHO} " ${COMMENT} must be fetched";                          \
-       ${ECHO} " into:";                                               \
+       ${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}";     \
+       ${ECHO} " must be fetched into:";                               \
        ${ECHO} "       ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}";         \
        ${ECHO} " from:";                                               \
-       ${ECHO} "       ${DOWNLOAD}";                                   \
+       ${ECHO} "       ${DOWNLOAD}";                                   \
        ${ECHO} "       or ${ARCHIVE}";                                 \
        ${ECHO} ; \
-       ${ECHO} " Click 'Download J2SE ${SHORT}', read and accept the"; \
+       ${ECHO} " Click 'Download ${DOWNLOAD_NAME}', read and accept the"; \
        ${ECHO} " license, then choose 'Linux self-extracting file'.";  \
        ${ECHO} ;                                                       \
        ${ECHO} "======================================================================"
 
-
 post-fetch:
        @if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
                ${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};      \