From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 27 06:30:06 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32F10106568B for ; Fri, 27 Nov 2009 06:30:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E30678FC1D for ; Fri, 27 Nov 2009 06:30:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nAR6U5FV018222 for ; Fri, 27 Nov 2009 06:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nAR6U5VS018211; Fri, 27 Nov 2009 06:30:05 GMT (envelope-from gnats) Resent-Date: Fri, 27 Nov 2009 06:30:05 GMT Resent-Message-Id: <200911270630.nAR6U5VS018211@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, berend@pobox.com Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5EAC6106566C for ; Fri, 27 Nov 2009 06:28:40 +0000 (UTC) (envelope-from root@nederware.nl) Received: from sasl.smtp.pobox.com (b-pb-sasl-sd.pobox.com [64.74.157.63]) by mx1.freebsd.org (Postfix) with ESMTP id 2B0D28FC1A for ; Fri, 27 Nov 2009 06:28:39 +0000 (UTC) Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by b-pb-sasl-sd.pobox.com (Postfix) with ESMTP id 5B95E9325E for ; Fri, 27 Nov 2009 01:08:55 -0500 (EST) Received: from b-pb-sasl-sd.pobox.com (unknown [127.0.0.1]) by b-pb-sasl-sd.pobox.com (Postfix) with ESMTP id 510E69325D for ; Fri, 27 Nov 2009 01:08:55 -0500 (EST) Received: from bmach.nederware.nl (unknown [118.92.102.35]) by b-pb-sasl-sd.pobox.com (Postfix) with ESMTPA id E9BAE9325C for ; Fri, 27 Nov 2009 01:08:54 -0500 (EST) Received: by bmach.nederware.nl (Postfix, from userid 0) id 05A385E1E; Fri, 27 Nov 2009 19:09:04 +1300 (NZDT) Message-Id: <20091127060904.05A385E1E@bmach.nederware.nl> Date: Fri, 27 Nov 2009 19:09:03 +1300 (NZDT) From: berend@pobox.com To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/140925: patch to improve behaviour of hp-check X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Nov 2009 06:30:06 -0000 >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@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: