[pkgsrc/trunk]: pkgsrc/lang Don't duplicate the FETCH_MESSAGE, move it to Mak...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e84438a71f91
branches:  trunk
changeset: 464548:e84438a71f91
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Fri Dec 12 17:17:19 2003 +0000

description:
Don't duplicate the FETCH_MESSAGE, move it to Makefile.common instead.

diffstat:

 lang/sun-jdk14/Makefile        |  19 +++----------------
 lang/sun-jre14/Makefile        |  19 +++----------------
 lang/sun-jre14/Makefile.common |  20 +++++++++++++++++++-
 3 files changed, 25 insertions(+), 33 deletions(-)

diffs (114 lines):

diff -r 16bed63518ec -r e84438a71f91 lang/sun-jdk14/Makefile
--- a/lang/sun-jdk14/Makefile   Fri Dec 12 15:38:16 2003 +0000
+++ b/lang/sun-jdk14/Makefile   Fri Dec 12 17:17:19 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/12/12 15:38:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/12 17:17:19 jschauma Exp $
 
 DISTNAME=      j2sdk-1_4_2_03-linux-i586
 PKGNAME=       sun-jdk14-2.3
@@ -7,6 +7,8 @@
 
 COMMENT=       Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
 
+SHORT=         SDK
+
 DEPENDS=       sun-jre14>=2.0:../../lang/sun-jre14
 
 # Remove parts that are in common with the JRE
@@ -22,21 +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}/${DISTNAME}${EXTRACT_SUFX}"; \
-       ${ECHO} " from:"; \
-       ${ECHO} "       ${DOWNLOAD} or"; \
-       ${ECHO} "       ${ARCHIVE}"; \
-       ${ECHO} ; \
-       ${ECHO} " Choose 'Linux self-extracting file' from the 'SDK' column."; \
-       ${ECHO} ; \
-       ${ECHO} "======================================================================"
-
 .include "../../lang/sun-jre14/Makefile.common"
 
 PREFIX=                ${JVM_HOME}
diff -r 16bed63518ec -r e84438a71f91 lang/sun-jre14/Makefile
--- a/lang/sun-jre14/Makefile   Fri Dec 12 15:38:16 2003 +0000
+++ b/lang/sun-jre14/Makefile   Fri Dec 12 17:17:19 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/12/12 15:38:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2003/12/12 17:17:20 jschauma Exp $
 
 DISTNAME=      j2re-1_4_2_03-linux-i586
 PKGNAME=       sun-jre14-2.3
@@ -7,6 +7,8 @@
 
 COMMENT=       Sun's Java(tm) 2 Runtime Environment 1.4.2
 
+SHORT=         JRE
+
 USE_PKGINSTALL=        yes
 OWN_DIRS=      ${PREFIX}
 OWN_DIRS+=     ${PREFIX}/lib
@@ -32,21 +34,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} or"; \
-       ${ECHO} "       ${ARCHIVE}"; \
-       ${ECHO} ; \
-       ${ECHO} " Choose 'Linux self-extracting file' from the 'JRE' column."; \
-       ${ECHO} ; \
-       ${ECHO} "======================================================================"
-
 .include "../../lang/sun-jre14/Makefile.common"
 
 PREFIX=                ${JVM_HOME}
diff -r 16bed63518ec -r e84438a71f91 lang/sun-jre14/Makefile.common
--- a/lang/sun-jre14/Makefile.common    Fri Dec 12 15:38:16 2003 +0000
+++ b/lang/sun-jre14/Makefile.common    Fri Dec 12 17:17:19 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2003/12/12 15:38:16 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.16 2003/12/12 17:17:20 jschauma Exp $
 
 CATEGORIES=    lang java
 EXTRACT_SUFX=  .bin
@@ -35,6 +35,24 @@
 ONLY_FOR_PLATFORM=     NetBSD-1.6[U-Z]*-i386
 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} "       ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}";         \
+       ${ECHO} " from:";                                               \
+       ${ECHO} "       ${DOWNLOAD} or";                                \
+       ${ECHO} "       ${ARCHIVE}";                                    \
+       ${ECHO} ; \
+       ${ECHO} " Choose '32-bit/64-bit for Windows/Linux/Solaris SPARC' from"; \
+       ${ECHO} " the '${SHORT}' column, accept the license, then choose 'Linux ";\
+       ${ECHO} " self-extracting file'.";                              \
+       ${ECHO} ;                                                       \
+       ${ECHO} "======================================================================"
+
+
 post-fetch:
        @if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
                ${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};      \