pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Convert _FETCH_MESSAGE to plain old FETCH_MESSAGE. Re...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a2450bc1855a
branches: trunk
changeset: 516320:a2450bc1855a
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Jul 18 23:27:14 2006 +0000
description:
Convert _FETCH_MESSAGE to plain old FETCH_MESSAGE. Remove _FETCH_MESSAGE
processing from mk/fetch/*.mk.
diffstat:
devel/gtl/Makefile | 14 +++++---------
emulators/ski/Makefile | 15 +++++++--------
fonts/acroread-jpnfont/Makefile | 17 ++++++++---------
lang/sun-jre13/Makefile.common | 31 +++++++++++++------------------
lang/sun-jre14/Makefile.common | 38 +++++++++++++++++++-------------------
misc/molden/Makefile | 19 ++++++++++---------
mk/fetch/fetch-list.mk | 16 +++-------------
mk/fetch/fetch.mk | 5 +----
sysutils/storage-manager/Makefile | 14 +++++++-------
www/jsdk20/Makefile | 20 ++++++++------------
10 files changed, 81 insertions(+), 108 deletions(-)
diffs (truncated from 337 to 300 lines):
diff -r ca9debafdc8b -r a2450bc1855a devel/gtl/Makefile
--- a/devel/gtl/Makefile Tue Jul 18 23:26:54 2006 +0000
+++ b/devel/gtl/Makefile Tue Jul 18 23:27:14 2006 +0000
@@ -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 @@
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 -r ca9debafdc8b -r a2450bc1855a emulators/ski/Makefile
--- a/emulators/ski/Makefile Tue Jul 18 23:26:54 2006 +0000
+++ b/emulators/ski/Makefile Tue Jul 18 23:27:14 2006 +0000
@@ -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 @@
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 -r ca9debafdc8b -r a2450bc1855a fonts/acroread-jpnfont/Makefile
--- a/fonts/acroread-jpnfont/Makefile Tue Jul 18 23:26:54 2006 +0000
+++ b/fonts/acroread-jpnfont/Makefile Tue Jul 18 23:27:14 2006 +0000
@@ -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 @@
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 -r ca9debafdc8b -r a2450bc1855a lang/sun-jre13/Makefile.common
--- a/lang/sun-jre13/Makefile.common Tue Jul 18 23:26:54 2006 +0000
+++ b/lang/sun-jre13/Makefile.common Tue Jul 18 23:27:14 2006 +0000
@@ -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_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 -r ca9debafdc8b -r a2450bc1855a lang/sun-jre14/Makefile.common
--- a/lang/sun-jre14/Makefile.common Tue Jul 18 23:26:54 2006 +0000
+++ b/lang/sun-jre14/Makefile.common Tue Jul 18 23:27:14 2006 +0000
@@ -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 @@
.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 -r ca9debafdc8b -r a2450bc1855a misc/molden/Makefile
--- a/misc/molden/Makefile Tue Jul 18 23:26:54 2006 +0000
+++ b/misc/molden/Makefile Tue Jul 18 23:27:14 2006 +0000
@@ -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_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 -r ca9debafdc8b -r a2450bc1855a mk/fetch/fetch-list.mk
--- a/mk/fetch/fetch-list.mk Tue Jul 18 23:26:54 2006 +0000
+++ b/mk/fetch/fetch-list.mk Tue Jul 18 23:27:14 2006 +0000
@@ -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 @@
@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 @@
${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 -r ca9debafdc8b -r a2450bc1855a mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Tue Jul 18 23:26:54 2006 +0000
+++ b/mk/fetch/fetch.mk Tue Jul 18 23:27:14 2006 +0000
@@ -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 @@
${ERROR_MSG} ""; \
${ERROR_MSG} "======================================================================"; \
exit 1
-.elif defined(_FETCH_MESSAGE)
- @${TEST} ! -f ${.TARGET} || exit 0; \
- ${_FETCH_MESSAGE}
.else
@${DO_NADA}
.endif
diff -r ca9debafdc8b -r a2450bc1855a sysutils/storage-manager/Makefile
--- a/sysutils/storage-manager/Makefile Tue Jul 18 23:26:54 2006 +0000
+++ b/sysutils/storage-manager/Makefile Tue Jul 18 23:27:14 2006 +0000
@@ -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 @@
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}"
Home |
Main Index |
Thread Index |
Old Index