From owner-freebsd-x11@FreeBSD.ORG Sat Apr 14 08:58:03 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 2286C16A400 for ; Sat, 14 Apr 2007 08:58:03 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.173]) by mx1.freebsd.org (Postfix) with ESMTP id AC13713C4B0 for ; Sat, 14 Apr 2007 08:58:02 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: by ug-out-1314.google.com with SMTP id 71so614849ugh for ; Sat, 14 Apr 2007 01:58:01 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:content-type:content-transfer-encoding; b=P0U/yGYgd/n7x3s/Oitf8fROJzPBgvJSDd3TJjOpVRruWrf8/YBaFlhVetMXbEB5zNZlKsViFeSnf/pB4iIDrXeOKnBmd8zC4OrUlgQWRUsujh1YFKub6VHGWJ9/90pzSb+3ETT1HMB81ybUScdLU73c0KiRHew85sNCKJBzyD0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:content-type:content-transfer-encoding; b=iUqVCwG/ZRc/xhQ7keLzsAZGczSwyix/1ub1hlwLnxb64Kx4cQFss1VohVdSZuBkzn61pqcFBMm0+T3XqB7J2AhsoIUIluJ0qVd85yehVS7FweTWmxi2iHU/CUgNkG1/ieDBh21U8AHTmvLAscEME/fUak3MSzUKoqbABq4ZvZI= Received: by 10.67.91.6 with SMTP id t6mr2619316ugl.1176539406474; Sat, 14 Apr 2007 01:30:06 -0700 (PDT) Received: from ?192.168.123.202? ( [195.241.221.201]) by mx.google.com with ESMTP id z34sm6916135ikz.2007.04.14.01.30.05; Sat, 14 Apr 2007 01:30:05 -0700 (PDT) Message-ID: <46209109.4010905@gmail.com> Date: Sat, 14 Apr 2007 10:30:01 +0200 From: Rene Ladan User-Agent: Thunderbird 1.5.0.10 (X11/20070320) MIME-Version: 1.0 To: Rong-en Fan References: <200704132331.50079.dejan.lesjak@ijs.si> <6eb82e0704140054h2ebd6b5t635eb06e85a32e2b@mail.gmail.com> In-Reply-To: <6eb82e0704140054h2ebd6b5t635eb06e85a32e2b@mail.gmail.com> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: x11@freebsd.org Subject: Re: HEADSUP for git X.org ports users: change of X11BASE 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: Sat, 14 Apr 2007 08:58:03 -0000 Rong-en Fan schreef: > On 4/14/07, Dejan Lesjak wrote: >> Greetings, >> >> So there it goes, the patch to change X11BASE to point to $LOCALBASE >> will go >> into git shortly. Before further updating of your ports, you will need to >> merge stuff that you now have in old X11BASE (/usr/X11R6 by default) onto >> LOCALBASE (/usr/local by default). here's a suggestion how to do that: >> - make a tar backup of /usr/X11R6 >> - extract that backup onto /usr/local with option to not overwrite >> existing >> files >> - remove /usr/X11R6 >> - create symlink /usr/X11R6 -> /usr/local for compatibility >> (configuration >> files, /var/db/pkg package database, ...) >> >> The above instructions are available in form of shell script here: >> http://people.freebsd.org/~lesi/mergebase.sh >> >> Feel free to come up with better suggestions. >> >> What is now in this git tree (with the mentioned change) is pretty >> much what >> will go into ports tree. >> If anyone plans on testing the upgrade from xorg 6.9 to 7.2, >> "portupgrade -a" >> or similar should do the right thing (preferably after merging bases). >> >> Do tell us your experiences, suggestions,... > > So, how do I have a correct package database in /var/db/pkg, > i.e., s/X11R6/local/g > Write some other script? :-P /var/db/pkg/*/+CONTENTS has a line @cwd $BASE where $BASE is e.g. /usr/local or /usr/X11R6 so it wouldn't be too hard to change each '@cwd /usr/X11R6' to '@cwd /usr/local' Maybe portupgrade users would have to regenerate their /var/db/pkg/pkgdb.db > In addition to this, your script works fine here (I have been > using git tree for some time). > +1 The only thing I saw was that these scripts ran twice: * /usr/local/etc/periodic/security/410.portaudit * /usr/local/etc/periodic/daily/502.pgsql and that makewhatis complained that /usr/X11R6/man (which is /usr/local/man) already exists. Regards, Rene -- GPG fingerprint = E738 5471 D185 7013 0EE0 4FC8 3C1D 6F83 12E1 84F6 (subkeys.pgp.net) "It won't fit on the line." -- me, 2001