From 4ad189fab9ae7e7a74d23be84108ce24caeba65b Mon Sep 17 00:00:00 2001
From: nyan <nyan@FreeBSD.org>
Date: Mon, 2 Jan 2006 13:29:58 +0000
Subject: Add EXTPORTSDIR like EXTSRCDIR and EXTDOCDIR.

PR:		misc/83287
Submitted by:	Gabor Kovesdan
MFC after:	1 week
---
 release/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'release/Makefile')

diff --git a/release/Makefile b/release/Makefile
index a392695..7c98351 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -35,6 +35,10 @@ BUILDNAME?=${BASE}-${DATE}-SNAP
 # be copied; cvs update will be used instead.
 #EXTSRCDIR=/usr/src
 #
+# To use a checked-out ports collection directory instead of
+# checking out from a local CVS repository, set this option.
+#EXTPORTSDIR=/usr/ports
+#
 # To add other options to the CVS subcommands (co,up), set
 #CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'"
 #
@@ -384,9 +388,15 @@ release rerelease:
 .endif
 	rm -rf ${CHROOTDIR}/usr/ports
 .if !defined(NOPORTSATALL)
+.if defined(EXTPORTSDIR)
+	cd ${CHROOTDIR}/usr && cp -R -H ${EXTPORTSDIR} ports
+	# If there are distfiles downloaded removing them
+	rm -rf ports/distfiles/*
+.else
 	cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} \
 	    co ${CVSCMDARGS} ${CVS_PORTSARGS} ${RELEASEPORTSMODULE}
 .endif
+.endif
 .if !defined(NODOC)
 	rm -rf ${CHROOTDIR}/usr/doc
 .if defined(EXTDOCDIR)
@@ -415,7 +425,7 @@ release rerelease:
 	    update ${CVSCMDARGS} -P -d -r ${RELEASETAG}
 .endif
 	rm -f ${CHROOTDIR}/tmp/.world_done 
-.if !defined(NOPORTS)
+.if !defined(NOPORTS) && !defined(EXTPORTSDIR)
 	cd ${CHROOTDIR}/usr/ports && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
 	    update ${CVSCMDARGS} -P -d
 	rm -f ${CHROOTDIR}/tmp/.skip_ports_index
-- 
cgit v1.1