diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-18 23:27:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-18 23:27:14 +0000 |
| commit | 4c09a7046a37710b750605348bba8c60f74347a3 (patch) | |
| tree | 6a1e94be400ffc55f4402c5344549e393d61835e /lang | |
| parent | a7c790b05225a4fa11d8d993d17e11d7a4f7a79b (diff) | |
| download | pkgsrc-4c09a7046a37710b750605348bba8c60f74347a3.tar.gz | |
Convert _FETCH_MESSAGE to plain old FETCH_MESSAGE. Remove _FETCH_MESSAGE
processing from mk/fetch/*.mk.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/sun-jre13/Makefile.common | 31 | ||||
| -rw-r--r-- | lang/sun-jre14/Makefile.common | 38 |
2 files changed, 32 insertions, 37 deletions
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index 665c1cad220..672e6d9f519 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2006/07/07 03:18:18 minskim Exp $ +# $NetBSD: Makefile.common,v 1.30 2006/07/18 23:27:14 jlam Exp $ # MASTER_SITES is very special, and must end in "=": CATEGORIES= lang java @@ -38,23 +38,18 @@ DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 .endif -_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}"; \ - ${ECHO} " or ${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} "======================================================================" - +FETCH_MESSAGE= \ + "The file ${DISTNAME}${EXTRACT_SUFX} containing:" \ + " ${COMMENT}" \ + "must be fetched into:" \ + " ${DISTDIR}" \ + "from:" \ + " ${DOWNLOAD}" \ + " or ${ARCHIVE}" \ + "" \ + "Choose 'Windows/Linux/Solaris SPARC/Solaris x86' from" \ + "the '${SHORT}' column, accept the license, then choose" \ + "'Linux self-extracting file'." post-fetch: @if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common index 79fb1389b3c..9ccf9c78524 100644 --- a/lang/sun-jre14/Makefile.common +++ b/lang/sun-jre14/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2006/04/22 09:22:10 rillig Exp $ +# $NetBSD: Makefile.common,v 1.30 2006/07/18 23:27:14 jlam Exp $ CATEGORIES= lang java EXTRACT_SUFX= .bin @@ -41,26 +41,26 @@ DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 .endif _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}"; \ - ${ECHO} " or ${ARCHIVE}"; \ - ${ECHO} ; \ - ${ECHO} " Click 'Download J2SE ${SHORT}', read and accept the"; \ - ${ECHO} " license, then choose 'Linux self-extracting file'."; \ - ${ECHO} -e ${END_MESSAGE}; \ - ${ECHO} "======================================================================" + "The file ${DISTNAME}${EXTRACT_SUFX} containing:" \ + " ${COMMENT}" \ + "must be fetched into:" \ + " {DISTDIR}" \ + "from:"; \ + " ${DOWNLOAD}" \ + " or ${ARCHIVE}" \ + "" \ + "Click 'Download J2SE ${SHORT}', read and accept the" \ + "license, then choose 'Linux self-extracting file'." \ + ${END_MESSAGE} .if !empty(PKG_OPTIONS:Msun-jre-jce) -END_MESSAGE="\n The file jce_policy-1_4_2.zip must be fetched into:\n" \ - " ${DISTDIR}/jce_policy-1_4_2.zip\n\n" \ - "Under 'Other Downloads' / 'Java Cryptography Extension'\n" \ - "click 'Download' and choose the .zip file.\n" +END_MESSAGE= \ + "" \ + "The file jce_policy-1_4_2.zip must be fetched into:" \ + " ${DISTDIR}/jce_policy-1_4_2.zip" \ + "" + "Under 'Other Downloads' / 'Java Cryptography Extension'" \ + "click 'Download' and choose the .zip file." .endif post-fetch: |