From owner-freebsd-current@FreeBSD.ORG Mon Jun 15 18:31:56 2009 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3F42106566B; Mon, 15 Jun 2009 18:31:56 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (cl-162.ewr-01.us.sixxs.net [IPv6:2001:4830:1200:a1::2]) by mx1.freebsd.org (Postfix) with ESMTP id 2B3728FC22; Mon, 15 Jun 2009 18:31:55 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.3/8.14.3) with ESMTP id n5FIW7Nk009081; Mon, 15 Jun 2009 13:32:07 -0500 (CDT) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.3/8.14.3/Submit) id n5FIW7Wh009080; Mon, 15 Jun 2009 13:32:07 -0500 (CDT) (envelope-from brooks) Date: Mon, 15 Jun 2009 13:32:07 -0500 From: Brooks Davis To: Mark Murray Message-ID: <20090615183207.GC7180@lor.one-eyed-alien.net> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="TakKZr9L6Hm6aLOc" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17 (2007-11-01) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (lor.one-eyed-alien.net [127.0.0.1]); Mon, 15 Jun 2009 13:32:07 -0500 (CDT) Cc: current@freebsd.org Subject: Re: Knobs for src/Make* for SVN "make update" (patch attached) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2009 18:31:57 -0000 --TakKZr9L6Hm6aLOc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 14, 2009 at 11:08:19AM +0100, Mark Murray wrote: > Hi >=20 > Any comments on the attached patch to allow "make update" to work with > SVN? This time the actual patch is enclosed. :-] >=20 > Any brave soul prepared to officially review it? :-) It basically looks fine to me. I'm not sure why SVNFLAGS needs to be set at all though. Isn't -rHEAD implicit? -- Brooks Content-Description: src_makefile.diff > Index: Makefile.inc1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- Makefile.inc1 (revision 194177) > +++ Makefile.inc1 (working copy) > @@ -94,6 +94,8 @@ > =20 > CVS?=3D cvs > CVSFLAGS?=3D -A -P -d -I! > +SVN?=3D svn > +SVNFLAGS?=3D -r HEAD > SUP?=3D /usr/bin/csup > SUPFLAGS?=3D -g -L 2 > .if defined(SUPHOST) > @@ -854,11 +867,25 @@ > .endif > .endif > .if defined(CVS_UPDATE) > - @echo "--------------------------------------------------------------" > - @echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} > - @echo "--------------------------------------------------------------" > - cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS} > + @cd ${.CURDIR} ; \ > + if [ -d CVS ] ; then \ > + echo "--------------------------------------------------------------" = ; \ > + echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \ > + echo "--------------------------------------------------------------" = ; \ > + echo ${CVS} -R -q update ${CVSFLAGS} ; \ > + ${CVS} -R -q update ${CVSFLAGS} ; \ > + fi > .endif > +.if defined(SVN_UPDATE) > + @cd ${.CURDIR} ; \ > + if [ -d .svn ] ; then \ > + echo "--------------------------------------------------------------" = ; \ > + echo ">>> Updating ${.CURDIR} using Subversion" ; \ > + echo "--------------------------------------------------------------" = ; \ > + echo ${SVN} update ${SVNFLAGS} ; \ > + ${SVN} update ${SVNFLAGS} ; \ > + fi > +.endif > =20 > # > # ----------------------------------------------------------------------= -- > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" --TakKZr9L6Hm6aLOc Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iD8DBQFKNpOnXY6L6fI4GtQRAg5iAKCrDtotqxInQMnK2wqLpj3mfLNRFgCdFy2O xlVJ9B0MVvBhukYAjU9Gnjg= =CK+U -----END PGP SIGNATURE----- --TakKZr9L6Hm6aLOc--