2009-07-13 04:14:28 -04:00
|
|
|
$OpenBSD: patch-installer_dcheck_py,v 1.3 2009/07/13 08:14:28 ajacoutot Exp $
|
|
|
|
--- installer/dcheck.py.orig Thu Jul 2 17:45:31 2009
|
|
|
|
+++ installer/dcheck.py Thu Jul 2 17:46:28 2009
|
|
|
|
@@ -43,7 +43,7 @@ mod_output = ''
|
Import hplip-2.7.10
This port contains 3 subpackages:
* hplip
HPLIP is an HP developed solution for printing, scanning, and faxing
with HP inkjet and laser based printers in Unix.
The HPLIP project provides printing support for 1,248 printer models,
including Deskjet, Officejet, Photosmart, PSC (Print Scan Copy),
Business Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP.
* hpijs (supersed print/hpijs)
The Hewlett-Packard Co. Linux Inkjet Driver Project is an add-on to the
GNU Ghostscript application. This driver is based on the Hewlett Packard
Appliance APDK for deskjet printers.
* hplip-docs
Documentation for HPLIP in HTML format.
feedback from winiger@, reviewed by bernd@
"looks correct" jasper@ , "works for me" sthen@
2007-11-02 11:48:55 -04:00
|
|
|
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.")
|
2009-07-13 04:14:28 -04:00
|
|
|
@@ -98,7 +98,7 @@ def check_lib(lib, min_ver=0):
|
Import hplip-2.7.10
This port contains 3 subpackages:
* hplip
HPLIP is an HP developed solution for printing, scanning, and faxing
with HP inkjet and laser based printers in Unix.
The HPLIP project provides printing support for 1,248 printer models,
including Deskjet, Officejet, Photosmart, PSC (Print Scan Copy),
Business Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP.
* hpijs (supersed print/hpijs)
The Hewlett-Packard Co. Linux Inkjet Driver Project is an add-on to the
GNU Ghostscript application. This driver is based on the Hewlett Packard
Appliance APDK for deskjet printers.
* hplip-docs
Documentation for HPLIP in HTML format.
feedback from winiger@, reviewed by bernd@
"looks correct" jasper@ , "works for me" sthen@
2007-11-02 11:48:55 -04:00
|
|
|
log.debug("Not found.")
|
|
|
|
return False
|
|
|
|
|
|
|
|
-def check_file(f, dir="/usr/include"):
|
2009-02-02 05:47:11 -05:00
|
|
|
+def check_file(f, dir="${LOCALBASE}/include"):
|
Import hplip-2.7.10
This port contains 3 subpackages:
* hplip
HPLIP is an HP developed solution for printing, scanning, and faxing
with HP inkjet and laser based printers in Unix.
The HPLIP project provides printing support for 1,248 printer models,
including Deskjet, Officejet, Photosmart, PSC (Print Scan Copy),
Business Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP.
* hpijs (supersed print/hpijs)
The Hewlett-Packard Co. Linux Inkjet Driver Project is an add-on to the
GNU Ghostscript application. This driver is based on the Hewlett Packard
Appliance APDK for deskjet printers.
* hplip-docs
Documentation for HPLIP in HTML format.
feedback from winiger@, reviewed by bernd@
"looks correct" jasper@ , "works for me" sthen@
2007-11-02 11:48:55 -04:00
|
|
|
log.debug("Searching for file '%s' in '%s'..." % (f, dir))
|
|
|
|
for w in utils.walkFiles(dir, recurse=True, abs_paths=True, return_folders=False, pattern=f):
|
|
|
|
log.debug("File found at '%s'" % w)
|