From a34c88dd09587b63d3f40be8e985a0400e4e9244 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Sun, 11 Sep 1994 12:01:05 +0000 Subject: [PATCH] Eliminate a few lurking bogons - this is almost close to being right! --- Mk/bsd.port.mk | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4b1178e46f9a..a58cbb58d6de 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1,10 +1,13 @@ +# -*- mode: Fundamental; tab-width: 4; -*- +# # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.29 1994/09/09 06:21:43 jkh Exp $ +# $Id: bsd.port.mk,v 1.30 1994/09/10 22:26:47 jkh Exp $ # # Please view me with 4 column tabs! + # Supported Variables and their behaviors: # # Variables that typically apply to all ports: @@ -92,6 +95,11 @@ SCRIPTDIR?= ${.CURDIR}/scripts FILESDIR?= ${.CURDIR}/files PKGDIR?= ${.CURDIR}/pkg +.if exists(${PORTSDIR}/../Makefile.inc) +.include "${PORTSDIR}/../Makefile.inc" +.endif + + # Change these if you'd prefer to keep the cookies someplace else. EXTRACT_COOKIE?= ${.CURDIR}/.extract_done CONFIGURE_COOKIE?= ${.CURDIR}/.configure_done @@ -276,11 +284,12 @@ fetch: pre-fetch if [ ! -d ${DISTDIR} ]; then mkdir -p ${DISTDIR}; fi \ cd ${DISTDIR}; \ if ${NCFTP} ${NCFTPFLAGS} ${MASTER_SITE}/$$file; then \ - ${EXTRACT_CMD} ${EXTRACT_ARGS} ${DISTFILE}; \ + echo ">> $$file Fetched!" ; \ else \ - echo ">> Couldn't fetch it - please retreive $$file manually from ${HOME_LOCATION} and try again."; \ + echo ">> Couldn't fetch it - please try to manually retreive";\ + echo ">> ${HOME_LOCATION}/$$file and try again."; \ exit 1; \ - fi; \ + fi \ fi \ done .endif