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

[Artem Naluzhny]

>Number:         113099
>Category:       ports
>Synopsis:       [PATCH] sysutils/libchk may skip $X11BASE now
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 28 18:50:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Artem Naluzhny
>Release:        7.0-CURRENT
>Organization:
>Environment:
FreeBSD tut.intra 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Mon May 21 19:32:01 EEST 2007     root at tut.intra:/usr/obj/usr/src/sys/TUT  i386
>Description:
Since $X11BASE is a symlink to $LOCALBASE now (xorg 7.2 update), sysutils/libchk can skip searches for executables and libraries in following directories to reduce overall scanning time: $X11BASE/bin, $X11BASE/libexec and $X11BASE/sbin.
>How-To-Repeat:

>Fix:
diff -ruN libchk.bak/Makefile libchk/Makefile
--- libchk.bak/Makefile	Thu May 25 23:30:08 2006
+++ libchk/Makefile	Mon May 28 21:22:49 2007
@@ -7,6 +7,7 @@
 
 PORTNAME=	libchk
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
diff -ruN libchk.bak/files/patch-libchk.1 libchk/files/patch-libchk.1
--- libchk.bak/files/patch-libchk.1	Thu Jan  1 03:00:00 1970
+++ libchk/files/patch-libchk.1	Mon May 28 21:26:33 2007
@@ -0,0 +1,30 @@
+--- libchk.1.orig	Sun May  2 21:56:10 2004
++++ libchk.1	Mon May 28 21:25:24 2007
+@@ -1,6 +1,6 @@
+ .\" $Idaemons: /home/cvs/libchk/libchk.1,v 1.6 2004/05/02 18:56:10 knu Exp $
+ .\"
+-.Dd September 2, 2002
++.Dd May 28, 2007
+ .Dt LIBCHK 1
+ .Os FreeBSD
+ .Sh NAME
+@@ -37,9 +37,6 @@
+ .It Pa $LOCALBASE/bin
+ .It Pa $LOCALBASE/libexec
+ .It Pa $LOCALBASE/sbin
+-.It Pa $X11BASE/bin
+-.It Pa $X11BASE/libexec
+-.It Pa $X11BASE/sbin
+ .El
+ .Pp
+ And the directories listed in
+@@ -123,9 +120,6 @@
+ .It Ev LOCALBASE
+ The local base directory. (default:
+ .Pa /usr/local )
+-.It Ev X11BASE
+-The X11 base directory. (default:
+-.Pa /usr/X11R6 )
+ .El
+ .Sh SEE ALSO
+ .Xr ldconfig 8
diff -ruN libchk.bak/files/patch-libchk.rb libchk/files/patch-libchk.rb
--- libchk.bak/files/patch-libchk.rb	Thu Jan  1 03:00:00 1970
+++ libchk/files/patch-libchk.rb	Mon May 28 21:27:07 2007
@@ -0,0 +1,30 @@
+--- libchk.rb.orig	Fri May 14 20:11:09 2004
++++ libchk.rb	Mon May 28 21:22:24 2007
+@@ -43,7 +43,6 @@
+   $strict = false
+ 
+   $localbase = ENV['LOCALBASE'] || '/usr/local'
+-  $x11base = ENV['X11BASE'] || '/usr/X11R6'
+ 
+   $bindirs = [
+     "/bin",
+@@ -55,9 +54,6 @@
+     "#{$localbase}/bin",
+     "#{$localbase}/libexec",
+     "#{$localbase}/sbin",
+-    "#{$x11base}/bin",
+-    "#{$x11base}/libexec",
+-    "#{$x11base}/sbin",
+   ]
+ 
+   $exclude_dirs = []
+@@ -96,8 +92,7 @@
+     opts.def_tail_option '
+ Environment Variables [default]:
+     PATH             command search path
+-    LOCALBASE        local base directory [/usr/local]
+-    X11BASE          X11 base directory [/usr/X11R6]'
++    LOCALBASE        local base directory [/usr/local]'
+ 
+     begin
+       init_global
diff -ruN libchk.bak/pkg-descr libchk/pkg-descr
--- libchk.bak/pkg-descr	Mon Sep  2 15:41:59 2002
+++ libchk/pkg-descr	Mon May 28 21:20:55 2007
@@ -11,4 +11,4 @@
 libraries that look obsolete.
 
 Author: Akinori MUSHA <knu at FreeBSD.org>
-WWW:	http://www.iDaemons.org/cgi-bin/cvsweb.cgi/libchk/
+WWW:	http://www.idaemons.org/projects/libchk/


>Release-Note:
>Audit-Trail:
>Unformatted: