ports/113099: [PATCH] sysutils/libchk may skip $X11BASE now

[Rene Ladan]

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

-------------- next part --------------
--- /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