ports/140925: patch to improve behaviour of hp-check

[berend at pobox.com]

>Number:         140925
>Category:       ports
>Synopsis:       patch to improve behaviour of hp-check
>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:   Fri Nov 27 06:30:05 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Berend de Boer
>Release:        FreeBSD 6.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD bmach.nederware.nl 6.4-STABLE FreeBSD 6.4-STABLE #3: Wed Aug 19 17:52:40 NZST 2009 root at bmach.nederware.nl:/u1/obj/usr/src/sys/BMACH i386


>Description:
 hp-check will report spurious errors, which are not errors. This patch helps to avoid people waisting time for looking at the wrong things that are wrong. The main thing it does is find libsane in the right directory, so it won't complain.

>How-To-Repeat:
>Fix:


diff -Nupr hplip3.orig/files/patch-core_install.py hplip3/files/patch-core_install.py
--- hplip3.orig/files/patch-core_install.py	1970-01-01 12:00:00.000000000 +1200
+++ hplip3/files/patch-core_install.py	2009-11-27 18:58:07.000000000 +1300
@@ -0,0 +1,11 @@
+--- installer/core_install.py.orig	2009-08-05 09:37:17.000000000 +1200
++++ installer/core_install.py	2009-11-27 18:57:37.000000000 +1300
+@@ -896,7 +896,7 @@ class CoreInstall(object):
+ 
+ 
+     def check_sane_devel(self):
+-        return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
++        return len(locate_file_contains("sane.h", '/usr/local/include/sane', 'extern SANE_Status sane_init'))
+ 
+ 
+     def check_xsane(self):
diff -Nupr hplip3.orig/files/patch-dcheck.py hplip3/files/patch-dcheck.py
--- hplip3.orig/files/patch-dcheck.py	1970-01-01 12:00:00.000000000 +1200
+++ hplip3/files/patch-dcheck.py	2009-11-27 18:54:23.000000000 +1300
@@ -0,0 +1,11 @@
+--- installer/dcheck.py.orig	2009-08-05 09:37:17.000000000 +1200
++++ installer/dcheck.py	2009-11-27 18:53:56.000000000 +1300
+@@ -43,7 +43,7 @@ mod_output = ''
+ def update_ld_output():
+     # For library checks
+     global ld_output
+-    status, ld_output = utils.run('%s -p' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False)
++    status, ld_output = utils.run('%s -r' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False)
+ 
+     if status != 0:
+         log.debug("ldconfig failed.")

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