From owner-freebsd-x11@FreeBSD.ORG Wed May 30 19:27:02 2007 Return-Path: X-Original-To: freebsd-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 84CFF16A46E for ; Wed, 30 May 2007 19:27:02 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.174]) by mx1.freebsd.org (Postfix) with ESMTP id CC38013C484 for ; Wed, 30 May 2007 19:27:01 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: by ug-out-1314.google.com with SMTP id u2so291247uge for ; Wed, 30 May 2007 12:27:00 -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:content-type; b=kj04TQnPqQXmJ2FyBKpsnoyO4b7mozwJdHKy456lnnbN4aUcS3UKWB+v27HgzFJealfA3eyqfqK5sopYGDljQ7dMgniM4D6wrF4Qc1kllAq1Lj5ymdtf2ax0aDS9BIsVl9vTVb6KVhrY+1B8FVrXFSZomO/M+JZ6F0/um3fbhqw= 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:content-type; b=DGfqiUHvg1t5tvlPiF+EN7rbMp7h8+CJLk8wH8dLb98Yu9hNPEUra09e0yslGh6tRopFuUxeffAilNklslvPcYNT9bpptMGu6oGwnO2+mOM/exB/9dHI9J3oGjVrdm4NzoD1ae+JcQ3fYi6patTOGdPbgmivr+YlYw7kUQCBSYQ= Received: by 10.67.28.2 with SMTP id f2mr749576ugj.1180553220164; Wed, 30 May 2007 12:27:00 -0700 (PDT) Received: from 195-241-221-201.dsl.ip.tiscali.nl ( [195.241.221.201]) by mx.google.com with ESMTP id y7sm22394ugc.2007.05.30.12.26.58; Wed, 30 May 2007 12:26:58 -0700 (PDT) Message-ID: <465DD002.6020205@gmail.com> Date: Wed, 30 May 2007 21:26:58 +0200 From: Rene Ladan User-Agent: Thunderbird 2.0.0.0 (X11/20070526) MIME-Version: 1.0 To: knu@freebsd.org References: <20070528185007.03E9C16A50C@hub.freebsd.org> <465B2AEA.5050102@gmail.com> <200705292322.35299.dejan.lesjak@ijs.si> In-Reply-To: <200705292322.35299.dejan.lesjak@ijs.si> Content-Type: multipart/mixed; boundary="------------080601010909080703060101" Cc: freebsd-x11@freebsd.org, bug-followup@freebsd.org Subject: Re: ports/113099: [PATCH] sysutils/libchk may skip $X11BASE now 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: Wed, 30 May 2007 19:27:02 -0000 This is a multi-part message in MIME format. --------------080601010909080703060101 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Dejan Lesjak wrote: > USE_NONDEFAULT_X11BASE is only relevant on FreeBSD before 6.2 (as we cant set > the default X11BASE in ports infrastructure there). On newer versions one can > define different X11BASE even without also setting USE_NONDEFAULT_X11BASE. > The ability to do that is left intentionally. > Anyhow, perhaps a more general solution for libchk might be to skip $X11BASE > if it is the same as $LOCALBASE? > This sounds reasonable. Akinori, what do you think of the attached patch? -- GPG fingerprint = E738 5471 D185 7013 0EE0 4FC8 3C1D 6F83 12E1 84F6 (subkeys.pgp.net) "It won't fit on the line." -- me, 2001 --------------080601010909080703060101 Content-Type: text/plain; name="libchk.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="libchk.diff" --- /usr/local/sbin/libchk Mon May 28 01:27:15 2007 +++ libchk2 Wed May 30 21:25:48 2007 @@ -27,6 +27,8 @@ # SUCH DAMAGE. # +# (rene) 20070530 : skip $X11BASE if $X11BASE == $LOCALBASE + RCS_ID = %q$Idaemons: /home/cvs/libchk/libchk.rb,v 1.9 2004/05/14 17:11:09 knu Exp $ RCS_REVISION = RCS_ID.split[2] MYNAME = File.basename($0) @@ -55,10 +57,15 @@ "#{$localbase}/bin", "#{$localbase}/libexec", "#{$localbase}/sbin", - "#{$x11base}/bin", - "#{$x11base}/libexec", - "#{$x11base}/sbin", ] + + if $x11base != $localbase + $bindirs += [ + "#{$x11base}/bin", + "#{$x11base}/libexec", + "#{$x11base}/sbin", + ] + end $exclude_dirs = [] end --------------080601010909080703060101--