From owner-freebsd-x11@FreeBSD.ORG Sun Apr 15 01:39:32 2007 Return-Path: X-Original-To: x11@freebsd.org Delivered-To: freebsd-x11@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 46ED916A401 for ; Sun, 15 Apr 2007 01:39:32 +0000 (UTC) (envelope-from kris@obsecurity.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 32E2413C45E for ; Sun, 15 Apr 2007 01:39:32 +0000 (UTC) (envelope-from kris@obsecurity.org) Received: from obsecurity.dyndns.org (elvis.mu.org [192.203.228.196]) by elvis.mu.org (Postfix) with ESMTP id 39EE41A3C1C; Sat, 14 Apr 2007 18:39:43 -0700 (PDT) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id 0C5FE51406; Sat, 14 Apr 2007 21:39:29 -0400 (EDT) Date: Sat, 14 Apr 2007 21:39:22 -0400 From: Kris Kennaway To: Dejan Lesjak Message-ID: <20070415013921.GA68262@xor.obsecurity.org> References: <20070414194028.GB2313@xor.obsecurity.org> <20070414195441.GA17321@xor.obsecurity.org> <200704142311.47387.dejan.lesjak@ijs.si> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Q68bSM7Ycu6FN28Q" Content-Disposition: inline In-Reply-To: <200704142311.47387.dejan.lesjak@ijs.si> User-Agent: Mutt/1.4.2.2i Cc: x11@freebsd.org, Kris Kennaway Subject: Re: Upgrade script X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Apr 2007 01:39:32 -0000 --Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 14, 2007 at 11:11:47PM +0200, Dejan Lesjak wrote: > On Saturday 14 April 2007 21:54:41 Kris Kennaway wrote: > > On Sat, Apr 14, 2007 at 03:40:28PM -0400, Kris Kennaway wrote: > > > * Before spamming /usr/local there needs to be a check that no files > > > will be skipped (since you are using tar -k to avoid overwriting > > > existing files). Probably something using find -type f -o -type l and > > > then comm(1) would be appropriate; the user should be warned about > > > these conflicts and either bail out until they resolve them, or just > > > proceed and let them deal with them by hand from the backup tarball. >=20 > I've updated the script with this and some other stuff, it's on the same= =20 > place. Thanks. One more thing I spotted is that it doesn't handle non-default X11BASE or LOCALBASE. Probably the way to do this is to use PORTSDIR?=3D/usr/ports X11BASE=3D`make -f ${PORTSDIR}/Mk/bsd.port.mk -V X11BASE` or similar. Using bsd.port.mk is so it picks up the default value, and includes /etc/make.conf to check for override. It also DTRT if X11BASE is set in the environment. Kris --Q68bSM7Ycu6FN28Q Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFGIYJIWry0BWjoQKURAvCRAJ9VX5RXL0tJDrnIWJFdYWevpngxaACg+9P8 N7ylV35LTde8xzhn139O3T4= =RhQW -----END PGP SIGNATURE----- --Q68bSM7Ycu6FN28Q--