Update fetch text, COMMENT, and DESCR to match Sun's newer phrasing of

the product name and version on their download pages.  Bump PKGREVISION.

5 files changed, 15 insertions, 17 deletions

diff --git a/lang/sun-jdk15/DESCR b/lang/sun-jdk15/DESCR
index c0c96871b20..bcf4442064d 100644
--- a/lang/sun-jdk15/DESCR
+++ b/lang/sun-jdk15/DESCR
@@ -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 --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index 370098cc7a1..668c77a0604 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -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 --git a/lang/sun-jre15/DESCR b/lang/sun-jre15/DESCR
index b7f007d579a..df0d98a3ae2 100644
--- a/lang/sun-jre15/DESCR
+++ b/lang/sun-jre15/DESCR
@@ -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 --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index 41021f9464c..ec444ad8153 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -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 --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common
index 655abe69144..40daef074cf 100644
--- a/lang/sun-jre15/Makefile.common
+++ b/lang/sun-jre15/Makefile.common
@@ -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
 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 @@ ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86
 _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};	\