Date: Mon, 10 Apr 2000 10:28:57 -0400 (EDT) From: jim@thehousleys.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/17903: Allow CVS_UPDATE to be used with SUP_UPDATE w/o PORTSSUPFILE Message-ID: <200004101428.KAA50026@thehousleys.net>
next in thread | raw e-mail | index | archive | help
>Number: 17903
>Category: ports
>Synopsis: Allow CVS_UPDATE to be used with SUP_UPDATE w/o PORTSSUPFILE
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 10 07:30:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: James Housley
>Release: FreeBSD 3.4-STABLE i386
>Organization:
The Housleys dot Net
>Environment:
>Description:
The src/Makefile allows update to use both SUP_UPDATE and CVS_UPDATE
at the same time, ie. SUP to update the secure & crypto tree and
CVS to update from the local cvs tree.
ports/Makefile won't use CVS_UPDATE if SUP_UPDATE is defined. Not
only that but there is an error because PORTSSUPFILE is not defined.
The attached patch:
Uses SUP if SUP_UPDATE & PORTSSUPFILE are both defined
else uses CVS_UPDATE if defined
else produces an error (like before) if SUP_UPDATE is defined
but PORTSSUPFILE is not defined
else produces and error SUP_UPDATE or CVS_UPDATE must be defined
>How-To-Repeat:
>Fix:
--- Makefile Mon Apr 10 10:21:28 2000
+++ Makefile.new Mon Apr 10 10:20:48 2000
@@ -78,11 +86,7 @@
CVS?= cvs
update:
-.if defined(SUP_UPDATE)
-.if !defined(PORTSSUPFILE)
- @${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update."
- @exit 1
-.endif
+.if defined(SUP_UPDATE) && defined(PORTSSUPFILE)
@echo "--------------------------------------------------------------"
@echo ">>> Running ${SUP}"
@echo "--------------------------------------------------------------"
@@ -92,6 +96,9 @@
@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${CVS} -q update -P -d
+.elif defined(SUP_UPDATE) && !defined(PORTSSUPFILE)
+ @${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update."
+ @exit 1
.else
@${ECHO_MSG} "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200004101428.KAA50026>