From bd891ad121eef3252c5a13b189de0e717b2d7691 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Mon, 21 Dec 1998 17:34:33 +0000
Subject: Just fetch distfiles from a single location.  The change to
 textproc/docproj broke my fetch heuristic anyway.

---
 release/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'release')

diff --git a/release/Makefile b/release/Makefile
index 2dde080..f441c1b6 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.435 1998/12/09 15:11:11 jkh Exp $
+#	$Id: Makefile,v 1.436 1998/12/18 05:13:01 jkh Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
 #
@@ -43,6 +43,8 @@ OBJFORMAT?=		elf
 # in English only.
 ALLLANG=	yes
 DOCPORTS=	textproc/docproj
+# Set this to wherever the distfiles required by ${DOCPORTS} live.
+DISTFILES?=	${.CURDIR}/../../ports/distfiles
 
 DIST_DOCS= ABOUT.TXT ERRATA.TXT LAYOUT.TXT README.TXT HARDWARE.TXT \
            INSTALL.TXT RELNOTES.TXT TROUBLE.TXT UPGRADE.TXT
@@ -181,10 +183,7 @@ rerelease release:
 .endif
 .if !defined(NODOC)
 	cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEASEDOCMODULE}
-	cd ${CHROOTDIR}/usr/ports && for i in ${DOCPORTS}; do \
-	  (cd $$i; make fetch MASTER_SITE_OVERRIDE=file:/usr/ports/distfiles/ \
-	    DISTDIR=${CHROOTDIR}/usr/ports/distfiles ); \
-        done
+	[ -d ${DISTFILES}/ ] && cp -rp ${DISTFILES} ${CHROOTDIR}/usr/ports/distfiles
 .endif
 .endif
 .if make(rerelease)
-- 
cgit v1.1