Convert _FETCH_MESSAGE to plain old FETCH_MESSAGE. Remove _FETCH_MESSAGE

processing from mk/fetch/*.mk.

10 files changed, 81 insertions, 108 deletions

diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile
index ec7e41d4d42..91d798ad8fb 100644
--- a/devel/gtl/Makefile
+++ b/devel/gtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/18 23:27:14 jlam Exp $
 
 DISTNAME=		GTL-1.2.1
 PKGNAME=		gtl-1.2.1
@@ -25,14 +25,10 @@ DOCDIR=		${PREFIX}/share/doc/GTL
 
 INTERACTIVE_STAGE=	fetch
 
-_FETCH_MESSAGE= \
-	${ECHO} "======================================================================"; \
-	${ECHO} ; \
-	${ECHO} " Follow the instructions at"; \
-	${ECHO} "	http://www.infosun.fmi.uni-passau.de/GTL/register.html"; \
-	${ECHO} " to download the distfile."; \
-	${ECHO} ; \
-	${ECHO} "======================================================================"
+FETCH_MESSAGE=								\
+	"Follow the instructions at:"					\
+	"    http://www.infosun.fmi.uni-passau.de/GTL/register.html"	\
+	"to download the distfile."
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index f81390ac8ed..ff74764642a 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2006/05/22 22:22:03 jlam Exp $
+#	$NetBSD: Makefile,v 1.6 2006/07/18 23:27:14 jlam Exp $
 
 DISTNAME=		ski-0.9.81-l6-i686
 PKGNAME=		ski-0.9.81.6
@@ -29,13 +29,12 @@ NO_BUILD=		YES
 
 DOWNLOAD=		http://www.hpl.hp.com/research/linux/ski/download.php
 
-_FETCH_MESSAGE= \
-	    ${ECHO} "==============================================================="; \
-	    ${ECHO} "  Due to licensing restrictions, "; \
-	    ${ECHO} "  the HP Ski IA-64 emulator for Linux 2.x (i686) must be fetched"; \
-	    ${ECHO} "  into ${DISTDIR} from"; \
-	    ${ECHO} "  ${DOWNLOAD}"; \
-	    ${ECHO} "==============================================================="
+FETCH_MESSAGE=								\
+	"Due to licensing restrictions, the HP Ski IA-64 emulator for"	\
+	"Linux 2.x (i686) must be fetched into:"			\
+	"    ${DISTDIR}"						\
+	"from:"								\
+	"    ${DOWNLOAD}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/nue/usr/bin/*ski* ${PREFIX}/bin
diff --git a/fonts/acroread-jpnfont/Makefile b/fonts/acroread-jpnfont/Makefile
index 0506f4351b8..83c2db3f1de 100644
--- a/fonts/acroread-jpnfont/Makefile
+++ b/fonts/acroread-jpnfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:07 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/18 23:27:14 jlam Exp $
 #
 
 DISTNAME=	jpnfont
@@ -15,13 +15,12 @@ TAR_FILE=	${WRKSRC}/LANGJPN.TAR
 
 INTERACTIVE_STAGE=	fetch
 
-_FETCH_MESSAGE= \
-	${ECHO} "======================================================="; \
-	${ECHO} "  Be required to register with Adobe"; \
-	${ECHO} "  before downloading the Japanese font pack."; \
-	${ECHO} "  You should manual-fetch Japanese pack of \"Asian Font Packs\""; \
-	${ECHO} "  to ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} from"; \
-	${ECHO} "    http://www.adobe.com/prodindex/acrobat/readstep.html"; \
-	${ECHO} "======================================================="
+FETCH_MESSAGE=								\
+	"Registration with Adobe is required before downloading"	\
+	"the Japanese font pack.  You should manually fetch the"	\
+	"\"Asian Font Packs\" to:"					\
+	"    ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"			\
+	"from:"								\
+	"    http://www.adobe.com/prodindex/acrobat/readstep.html"
 
 .include "../../fonts/acroread-font-share/Makefile.common"
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:
diff --git a/misc/molden/Makefile b/misc/molden/Makefile
index 7a32fbc2f51..41723d66803 100644
--- a/misc/molden/Makefile
+++ b/misc/molden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/22 09:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/07/18 23:27:14 jlam Exp $
 
 DISTNAME=	molden4.2
 PKGNAME=	${DISTNAME:S/molden/&-/}
@@ -27,14 +27,15 @@ NO_BIN_ON_CDROM=        ${RESTRICTED}
 NO_SRC_ON_FTP=          ${RESTRICTED}
 NO_BIN_ON_FTP=          ${RESTRICTED}
 
-_FETCH_MESSAGE=	\
-	${ECHO} "======================================================================"; \
-	${ECHO} " Please read the WWW page below to know how to get a copy of Molden."; \
-	${ECHO} ; \
-	${ECHO} "     http://www.cmbi.kun.nl/~schaft/molden/howtoget.html"; \
-	${ECHO} ; \
-	${ECHO} " Then put the file ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR}."; \
-	${ECHO} "======================================================================"
+FETCH_MESSAGE=								\
+	"Please read the following to learn how to get a copy of Molden:" \
+	""
+	"    http://www.cmbi.kun.nl/~schaft/molden/howtoget.html"	\
+	""
+	"Then put the file:"						\
+	"    ${DISTNAME}${EXTRACT_SUFX}"				\
+	"into"								\
+	"    ${DISTDIR}"						\
 
 INSTALLATION_DIRS=	bin
 
diff --git a/mk/fetch/fetch-list.mk b/mk/fetch/fetch-list.mk
index e1fdce62520..1fba10682cf 100644
--- a/mk/fetch/fetch-list.mk
+++ b/mk/fetch/fetch-list.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fetch-list.mk,v 1.1 2006/07/18 22:41:06 jlam Exp $
+# $NetBSD: fetch-list.mk,v 1.2 2006/07/18 23:27:14 jlam Exp $
 
 # Prints out a script to fetch all needed files (no checksumming).
 .PHONY: fetch-list
@@ -44,17 +44,7 @@ fetch-list-one-pkg:
 	@location=`${PWD_CMD} | ${AWK} -F / '{ print $$(NF-1) "/" $$NF }'`; \
 		${ECHO} '# Need additional files for ${PKGNAME} ('$$location')...'
 .    for fetchfile in ${_ALLFILES}
-.      if defined(_FETCH_MESSAGE)
-	@(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then			\
-		${ECHO};						\
-		filesize=`${AWK} '					\
-			/^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
-			' ${DISTINFO_FILE}` || true;			\
-		${ECHO} '# Prompt user to get ${fetchfile} ('$${filesize-???}' bytes) manually:'; \
-		${ECHO} '#';						\
-		${ECHO} ${_FETCH_MESSAGE:Q};				\
-	fi)
-.      elif defined(DYNAMIC_MASTER_SITES)
+.      if defined(DYNAMIC_MASTER_SITES)
 	@(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then			\
 		${ECHO};						\
 		filesize=`${AWK} '					\
@@ -93,7 +83,7 @@ fetch-list-one-pkg:
 		${ECHO} '	${ECHO} ${fetchfile:T} not fetched';	\
 		${ECHO}	done;						\
 	fi)
-.      endif # defined(_FETCH_MESSAGE) || defined(DYNAMIC_MASTER_SITES)
+.      endif # defined(DYNAMIC_MASTER_SITES)
 .    endfor
 .  endif # !empty(_ALLFILES)
 .endif # !target(fetch-list-one-pkg)
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk
index f831a6ccc24..dbb1d8599ce 100644
--- a/mk/fetch/fetch.mk
+++ b/mk/fetch/fetch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.10 2006/07/18 22:41:06 jlam Exp $
+# $NetBSD: fetch.mk,v 1.11 2006/07/18 23:27:14 jlam Exp $
 
 # If this host is behind a filtering firewall, use passive ftp(1)
 FETCH_BEFORE_ARGS+=	${PASSIVE_FETCH:D-p}
@@ -160,9 +160,6 @@ fetch-check-interactive: .USEBEFORE
 	${ERROR_MSG} "";						\
 	${ERROR_MSG} "======================================================================"; \
 	exit 1
-.elif defined(_FETCH_MESSAGE)
-	@${TEST} ! -f ${.TARGET} || exit 0;				\
-	${_FETCH_MESSAGE}
 .else
 	@${DO_NADA}
 .endif
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index 34b9c105378..2bea44f02e9 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/05/22 22:22:05 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/18 23:27:14 jlam Exp $
 
 DISTNAME=		sm_linux_v314_install
 PKGNAME=		storage-manager-3.14
@@ -36,12 +36,12 @@ INTERACTIVE_STAGE=	fetch
 
 DOWNLOAD=		http://www.adaptec.com/worldwide/support/driverdetail.html?cat=%2fOperating+System%2fLinux&filekey=sm_linux_v314_install.rpm
 
-_FETCH_MESSAGE= \
-	${ECHO} "================================================================="; \
-	${ECHO} "  Adaptec Storage Manager 3.14 for RedHat Linux must be fetched"; \
-	${ECHO} "  into ${DISTDIR} from"; \
-	${ECHO} "  ${DOWNLOAD}."; \
-	${ECHO} "================================================================="
+FETCH_MESSAGE=								\
+	"Adaptec Storage Manager 3.14 for RedHat Linux must be fetched"	\
+	"into:"								\
+	"    ${DISTDIR}"						\
+	"from"								\
+	"    ${DOWNLOAD}"
 
 INSTALLATION_DIRS=	etc/rc.d sbin
 
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index f13a2f2662e..991baa8668f 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/04/22 09:22:16 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/07/18 23:27:14 jlam Exp $
 # STOP!  Don't update this to a later version of this software.
 # The JSDK and Apache Jakarta projects have merged, making the
 # jakarta-tomcat package the current version of this software.
@@ -34,17 +34,13 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-_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} "	${ARCHIVE}";                                    \
-	${ECHO} ; 							\
-	${ECHO} "======================================================================"
+FETCH_MESSAGE= 								\
+	"The file ${DISTNAME}${EXTRACT_SUFX} containing" 		\
+	"    ${COMMENT}"						\
+	"must be fetched into:" 					\
+	"    ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}" 			\
+	"from:" 							\
+	"    ${ARCHIVE}"
 
 .include "../../mk/bsd.prefs.mk"