[pkgsrc/trunk]: pkgsrc/lang Same as for 1.4:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb2a460fbe18
branches:  trunk
changeset: 465590:fb2a460fbe18
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Fri Jan 02 16:56:01 2004 +0000

description:
Same as for 1.4:
 Don't duplicate the FETCH_MESSAGE, move it to Makefile.common instead.
 Found a URL for older distfiles, so make that known.

diffstat:

 lang/sun-jdk13/Makefile        |  18 +++---------------
 lang/sun-jre13/Makefile        |  18 +++---------------
 lang/sun-jre13/Makefile.common |  21 ++++++++++++++++++++-
 3 files changed, 26 insertions(+), 31 deletions(-)

diffs (120 lines):

diff -r 62501f6e0bdb -r fb2a460fbe18 lang/sun-jdk13/Makefile
--- a/lang/sun-jdk13/Makefile   Fri Jan 02 16:17:40 2004 +0000
+++ b/lang/sun-jdk13/Makefile   Fri Jan 02 16:56:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/08/12 16:37:04 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/02 16:56:01 jschauma Exp $
 
 DISTNAME=      j2sdk-1_3_1_09-linux-i586
 PKGNAME=       sun-jdk13-1.0.9
@@ -7,6 +7,8 @@
 
 COMMENT=       Sun's Java(tm) Development Kit 1.3.1
 
+SHORT=         JDK
+
 DEPENDS=       sun-jre13>=1.0.9:../../lang/sun-jre13
 
 # Remove parts that are in common with the JRE.
@@ -22,20 +24,6 @@
        done
        ${LN} -sf . ${WRKSRC}/jre
 
-_FETCH_MESSAGE= \
-       ${ECHO} "======================================================================"; \
-       ${ECHO} ; \
-       ${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
-       ${ECHO} " Java(tm) 2 SDK, Standard Edition must be fetched"; \
-       ${ECHO} " into:"; \
-       ${ECHO} "       ${DISTDIR}"; \
-       ${ECHO} " from:"; \
-       ${ECHO} "       ${DOWNLOAD}"; \
-       ${ECHO} ; \
-       ${ECHO} " Choose 'Linux self-extracting file' from the 'SDK' column."; \
-       ${ECHO} ; \
-       ${ECHO} "======================================================================"
-
 .include "../../lang/sun-jre13/Makefile.common"
 
 PREFIX=                ${JVM_HOME}
diff -r 62501f6e0bdb -r fb2a460fbe18 lang/sun-jre13/Makefile
--- a/lang/sun-jre13/Makefile   Fri Jan 02 16:17:40 2004 +0000
+++ b/lang/sun-jre13/Makefile   Fri Jan 02 16:56:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/08/12 16:37:05 jschauma Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/02 16:56:01 jschauma Exp $
 
 DISTNAME=      j2re-1_3_1_09-linux-i586
 PKGNAME=       sun-jre13-1.0.9
@@ -7,6 +7,8 @@
 
 COMMENT=       Sun's Java(tm) Runtime Environment 1.3.1
 
+SHORT=         JRE
+
 USE_PKGINSTALL=        yes
 OWN_DIRS=      ${PREFIX}
 OWN_DIRS+=     ${PREFIX}/lib
@@ -28,20 +30,6 @@
                ${MV} -f $$file $$file.default;                         \
        done
 
-_FETCH_MESSAGE= \
-       ${ECHO} "======================================================================"; \
-       ${ECHO} ; \
-       ${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
-       ${ECHO} " Java(tm) 2 Runtime Environment, Standard Edition must be fetched"; \
-       ${ECHO} " into:"; \
-       ${ECHO} "       ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; \
-       ${ECHO} " from:"; \
-       ${ECHO} "       ${DOWNLOAD}"; \
-       ${ECHO} ; \
-       ${ECHO} " Choose 'Linux self-extracting file' from the 'JRE' column."; \
-       ${ECHO} ; \
-       ${ECHO} "======================================================================"
-
 .include "../../lang/sun-jre13/Makefile.common"
 
 PREFIX=                ${JVM_HOME}
diff -r 62501f6e0bdb -r fb2a460fbe18 lang/sun-jre13/Makefile.common
--- a/lang/sun-jre13/Makefile.common    Fri Jan 02 16:17:40 2004 +0000
+++ b/lang/sun-jre13/Makefile.common    Fri Jan 02 16:56:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2003/08/23 15:14:02 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.17 2004/01/02 16:56:01 jschauma Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=    lang java
@@ -7,6 +7,7 @@
 MAINTAINER=    jschauma%NetBSD.org@localhost
 HOMEPAGE=      http://java.sun.com/
 DOWNLOAD=      http://java.sun.com/j2se/1.3/download.html
+ARCHIVE=        http://java.sun.com/products/archive/index.html         
 
 EXTRACT_CMD=   ${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
 
@@ -50,6 +51,24 @@
 
 ONLY_FOR_PLATFORM=     NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-*
 
+_FETCH_MESSAGE=                                                        \
+       ${ECHO} "======================================================================"; \
+       ${ECHO} ;                                                       \
+       ${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing";      \
+       ${ECHO} " ${COMMENT} must be fetched";                          \
+       ${ECHO} " into:";                                               \
+       ${ECHO} "       ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}";         \
+       ${ECHO} " from:";                                               \
+       ${ECHO} "       ${DOWNLOAD} or";                                \
+       ${ECHO} "       ${ARCHIVE}";                                    \
+       ${ECHO} ;                                                       \
+       ${ECHO} " Choose 'Windows/Linux/Solaris SPARC/Solaris x86' from"; \
+       ${ECHO} " the '${SHORT}' column, accept the license, then choose 'Linux ";\
+        ${ECHO} " self-extracting file'.";                              \
+       ${ECHO} ;                                                       \
+       ${ECHO} "======================================================================"
+
+
 .if ${OPSYS} != "Darwin"
 post-fetch:
        @if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \