Date: Wed, 30 May 2007 21:26:58 +0200 From: Rene Ladan <r.c.ladan@gmail.com> To: knu@freebsd.org Cc: freebsd-x11@freebsd.org, bug-followup@freebsd.org Subject: Re: ports/113099: [PATCH] sysutils/libchk may skip $X11BASE now Message-ID: <465DD002.6020205@gmail.com> In-Reply-To: <200705292322.35299.dejan.lesjak@ijs.si> References: <20070528185007.03E9C16A50C@hub.freebsd.org> <465B2AEA.5050102@gmail.com> <200705292322.35299.dejan.lesjak@ijs.si>
next in thread | previous in thread | raw e-mail | index | archive | help
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?465DD002.6020205>