From 1ad434a2a70efbfde1af951fd9924e49b47e59eb Mon Sep 17 00:00:00 2001 From: fredb Date: Tue, 26 Feb 2002 21:28:47 +0000 Subject: [PATCH] Wherever "make fetch" simply echos a message, let "make fetch-list|sh" echo the message, too. --- audio/realplayer/Makefile | 18 ++++++++++++------ cad/simian/Makefile | 15 ++++++++++++--- devel/ipv6socket_scrub/Makefile | 14 +++++++++++--- emulators/vmware-module/Makefile | 18 ++++++++++++------ fonts/acroread-jpnfont/Makefile | 22 ++++++++++++++-------- sysutils/storage-manager/Makefile | 18 ++++++++++++------ www/ap-aolserver/Makefile | 14 +++++++++++--- www/openacs/Makefile | 14 +++++++++++--- 8 files changed, 95 insertions(+), 38 deletions(-) diff --git a/audio/realplayer/Makefile b/audio/realplayer/Makefile index 05732c37e85b..d1740dc41f1f 100644 --- a/audio/realplayer/Makefile +++ b/audio/realplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/25 19:42:43 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/26 21:28:47 fredb Exp $ DISTNAME= rp8_linux20_libc6_i386_cs2 PKGNAME= realplayer-8.0.1 @@ -38,16 +38,22 @@ REALPLAYER_HOME= ${PREFIX}/lib/RealPlayer8 NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins MESSAGE_SUBST+= REALPLAYER_HOME=${REALPLAYER_HOME} +_FETCH_MESSAGE= \ + ${ECHO} "==============================================================="; \ + ${ECHO} " RealPlayer 8 for Linux 2.x (libc6 i386, Self-Extracting) must"; \ + ${ECHO} " be fetched into ${DISTDIR} from"; \ + ${ECHO} " ${DOWNLOAD}."; \ + ${ECHO} "===============================================================" + do-fetch: @if [ ! -f ${RP_INSTALLER} ]; then \ - ${ECHO_MSG} "==============================================================="; \ - ${ECHO_MSG} " RealPlayer 8 for Linux 2.x (libc6 i386, Self-Extracting) must"; \ - ${ECHO_MSG} " be fetched into ${DISTDIR} from"; \ - ${ECHO_MSG} " ${DOWNLOAD}."; \ - ${ECHO_MSG} "==============================================================="; \ + ${_FETCH_MESSAGE}; \ ${FALSE}; \ fi +fetch-list-one-pkg: + @${ECHO} ${_FETCH_MESSAGE:Q} + pre-extract: @delay=15; \ ${SED} -e "s|@WRKSRC@|${WRKSRC}|g" \ diff --git a/cad/simian/Makefile b/cad/simian/Makefile index e4a2385daf35..d3ace07c0205 100644 --- a/cad/simian/Makefile +++ b/cad/simian/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/12/07 21:02:18 jmc Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/26 21:28:48 fredb Exp $ # DISTNAME= simian_12_98 @@ -20,13 +20,22 @@ NO_BIN_ON_FTP= ${RESTRICTED} WRKSRC= ${WRKDIR}/Simian/src ALL_TARGET= simian +_FETCH_MESSAGE= \ + ${ECHO} '======================================================='; \ + ${ECHO} ' To build this package, please request a password on'; \ + ${ECHO} ' ${HOMEPAGE},'; \ + ${ECHO} ' with which to fetch "${DISTNAME}${EXTRACT_SUFX}" manually.'; \ + ${ECHO} '=======================================================' + do-fetch: @if ${TEST} \! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; then \ - ${ECHO} "===> You need to request a password on ${HOMEPAGE}"; \ - ${ECHO} " and fetch on your own source file."; \ + ${_FETCH_MESSAGE}; \ exit 1; \ fi +fetch-list-one-pkg: + @${ECHO} ${_FETCH_MESSAGE:Q} + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/simian ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/simian diff --git a/devel/ipv6socket_scrub/Makefile b/devel/ipv6socket_scrub/Makefile index 0be55c991210..4d0a33b22fed 100644 --- a/devel/ipv6socket_scrub/Makefile +++ b/devel/ipv6socket_scrub/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 14:38:31 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2002/02/26 21:28:48 fredb Exp $ # KAME Id: Makefile,v 1.6 1999/11/28 14:36:04 itojun Exp # @@ -22,13 +22,21 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} +_FETCH_MESSAGE= \ + ${ECHO} '======================================================='; \ + ${ECHO} ' You need to sign the agreement on ${HOMEPAGE}'; \ + ${ECHO} ' and fetch on your own.'; \ + ${ECHO} '=======================================================' + do-fetch: @if ${TEST} \! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; then \ - ${ECHO} "===> You need to sign the agreement on ${HOMEPAGE}"; \ - ${ECHO} " and fetch on your own."; \ + ${_FETCH_MESSAGE}; \ exit 1; \ fi +fetch-list-one-pkg: + @${ECHO} ${_FETCH_MESSAGE:Q} + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ipv6socket_scrub ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/../Docs/man/man1/ipv6socket_scrub.1 \ diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile index 76a21f36bfed..31bf44a854c2 100644 --- a/emulators/vmware-module/Makefile +++ b/emulators/vmware-module/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:23 agc Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/26 21:28:48 fredb Exp $ DISTNAME= vmware-netbsd-1.0 PKGNAME= vmware-module-1.0 @@ -22,16 +22,22 @@ NO_BIN_ON_CDROM= ${RESTRICTED} DOWNLOAD= http://www.wasabisystems.com/vmware-survey.html +_FETCH_MESSAGE= \ + ${ECHO} "==============================================================="; \ + ${ECHO} " The VMware kernel module must be fetched into \"${DISTDIR}\""; \ + ${ECHO} " via the Web formular available under this URL:"; \ + ${ECHO} " ${DOWNLOAD}"; \ + ${ECHO} "===============================================================" + do-fetch: @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG} "==============================================================="; \ - ${ECHO_MSG} " The VMware kernel module must be fetched into \"${DISTDIR}\""; \ - ${ECHO_MSG} " via the Web formular available under this URL:"; \ - ${ECHO_MSG} " ${DOWNLOAD}"; \ - ${ECHO_MSG} "==============================================================="; \ + ${_FETCH_MESSAGE}; \ ${FALSE}; \ fi +fetch-list-one-pkg: + @${ECHO} ${_FETCH_MESSAGE:Q} + # to override , MUST be set this way BEFORE bsd.prefs.mk BSDSRCDIR?= /nonexistent diff --git a/fonts/acroread-jpnfont/Makefile b/fonts/acroread-jpnfont/Makefile index 474817772cbf..31dde16b07d1 100644 --- a/fonts/acroread-jpnfont/Makefile +++ b/fonts/acroread-jpnfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:46:04 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/26 21:28:49 fredb Exp $ # DISTNAME= jpnfont @@ -11,16 +11,22 @@ DEPENDS+= acroread-font-share-4.0:../../fonts/acroread-font-share WRKSRC= ${WRKDIR}/JPNKIT TAR_FILE= ${WRKSRC}/LANGJPN.TAR +_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} "=======================================================" + do-fetch: @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${ECHO_MSG} "==============================================================="; \ - ${ECHO_MSG} " Be required to register with Adobe"; \ - ${ECHO_MSG} " before downloading the Japanese font pack."; \ - ${ECHO_MSG} " You should manual-fetch Japanese pack of \"Asian Font Packs\""; \ - ${ECHO_MSG} " to ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} from"; \ - ${ECHO_MSG} " http://www.adobe.com/prodindex/acrobat/readstep.html"; \ - ${ECHO_MSG} "==============================================================="; \ + ${_FETCH_MESSAGE}; \ ${FALSE}; \ fi +fetch-list-one-pkg: + @${ECHO} ${_FETCH_MESSAGE:Q} + .include "../acroread-font-share/Makefile.common" diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile index 40508aaad99e..a1df4a2dca49 100644 --- a/sysutils/storage-manager/Makefile +++ b/sysutils/storage-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/10/23 16:07:56 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/26 21:28:49 fredb Exp $ DISTNAME= sm_linux_v314_install PKGNAME= storage-manager-3.14 @@ -30,16 +30,22 @@ NO_BUILD= # defined 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} "=================================================================" + do-fetch: @if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \ - ${ECHO_MSG} "==============================================================="; \ - ${ECHO_MSG} " Adaptec Storage Manager 3.14 for RedHat Linux must be fetched"; \ - ${ECHO_MSG} " into ${DISTDIR} from"; \ - ${ECHO_MSG} " ${DOWNLOAD}."; \ - ${ECHO_MSG} "==============================================================="; \ + ${_FETCH_MESSAGE}; \ ${FALSE}; \ fi +fetch-list-one-pkg: + @${ECHO} ${_FETCH_MESSAGE:Q} + do-extract: ${MKDIR} ${WRKSRC} cd ${WRKSRC}; rpm2cpio ${DISTDIR}/${DISTNAME}.rpm > ${DISTNAME}.cpio diff --git a/www/ap-aolserver/Makefile b/www/ap-aolserver/Makefile index 259d8eae2f9b..61359e7c66d1 100644 --- a/www/ap-aolserver/Makefile +++ b/www/ap-aolserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/02/05 05:36:29 jmc Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/26 21:28:49 fredb Exp $ # DISTNAME= mod_aolserver-1.1 @@ -23,13 +23,21 @@ CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include/pgsql -I${PREFIX}/include/httpd" MESSAGE_SUBST+= PREFIX=${PREFIX} +_FETCH_MESSAGE= \ + ${ECHO} "===================================================================="; \ + ${ECHO} " Please fetch ${DISTFILES} into ${DISTDIR}" ; \ + ${ECHO} " from ${HOMEPAGE} ." ; \ + ${ECHO} "====================================================================" + do-fetch: @if [ ! -f ${DISTDIR}/${DISTFILES} ] ; then \ - ${ECHO} "Please fetch ${DISTFILES} into ${DISTDIR}" ; \ - ${ECHO} "from ${HOMEPAGE} ." ; \ + ${_FETCH_MESSAGE}; \ exit 1 ; \ fi +fetch-list-one-pkg: + @${ECHO} ${_FETCH_MESSAGE:Q} + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_aolserver ${INSTALL_DATA} ${FILESDIR}/README ${FILESDIR}/nsd.tcl.sample \ diff --git a/www/openacs/Makefile b/www/openacs/Makefile index 90361822a37d..a02b08d99432 100644 --- a/www/openacs/Makefile +++ b/www/openacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:54 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/26 21:28:49 fredb Exp $ # DISTNAME= openacs-3.2.5 @@ -22,13 +22,21 @@ NO_BUILD= # set MESSAGE_SUBST+= PREFIX=${PREFIX} +_FETCH_MESSAGE= \ + ${ECHO} "==============================================================="; \ + ${ECHO} "Please fetch ${DISTFILES} into ${DISTDIR}" ; \ + ${ECHO} "from ${HOMEPAGE} ." ; \ + ${ECHO} "===============================================================" + do-fetch: @if [ ! -f ${DISTDIR}/${DISTFILES} ] ; then \ - ${ECHO} "Please fetch ${DISTFILES} into ${DISTDIR}" ; \ - ${ECHO} "from ${HOMEPAGE} ." ; \ + ${_FETCH_MESSAGE}; \ exit 1 ; \ fi +fetch-list-one-pkg: + @${ECHO} ${_FETCH_MESSAGE:Q} + SEDFILES=${WRKSRC}/parameters/ad.tcl \ ${WRKSRC}/bin/aolserver-errors.pl \ ${WRKSRC}/bin/queue-message.pl \