openbsd-ports/print/hplip/patches/patch-check_py

$OpenBSD: patch-check_py,v 1.8 2012/12/10 16:00:12 ajacoutot Exp $
--- check.py.orig	Tue Nov 20 10:55:15 2012
+++ check.py	Mon Dec 10 16:41:21 2012
@@ -115,9 +115,9 @@ def get_comment(package, Inst_status, installed_ver):
                 comment = "Python Programming is not supported if version is lessthan 2.2" 
     elif package == 'hpaio':
         if Inst_status == 'OK':
-            comment = "'hpaio found in /etc/sane.d/dll.conf'"
+            comment = "'hpaio found in ${SYSCONFDIR}/sane.d/dll.conf'"
         else:
-            comment = "'hpaio not found in /etc/sane.d/dll.conf. hpaio needs to be added in this file.'"
+            comment = "'hpaio not found in ${SYSCONFDIR}/sane.d/dll.conf. hpaio needs to be added in this file.'"
     elif package == 'cupsext' or package == 'pcardext' or package == 'hpmudext':
         if Inst_status != 'OK':
             comment = "'Not Found or Failed to load, Please reinstall HPLIP'"
@@ -533,9 +533,9 @@ try:
 
 
         log.info()
-        log.info(log.bold("Current contents of '/etc/hp/hplip.conf' file:"))
+        log.info(log.bold("Current contents of '${SYSCONFDIR}/hp/hplip.conf' file:"))
         try:
-            output = file('/etc/hp/hplip.conf', 'r').read()
+            output = file('${SYSCONFDIR}/hp/hplip.conf', 'r').read()
         except (IOError, OSError), e:
             log.error("Could not access file: %s. Check HPLIP installation." % e.strerror)
             num_errors += 1
@@ -543,9 +543,9 @@ try:
             log.info(output)
 
         log.info()
-        log.info(log.bold("Current contents of '/var/lib/hp/hplip.state' file:"))
+        log.info(log.bold("Current contents of '/var/db/hp/hplip.state' file:"))
         try:
-            output = file(os.path.expanduser('/var/lib/hp/hplip.state'), 'r').read()
+            output = file(os.path.expanduser('/var/db/hp/hplip.state'), 'r').read()
         except (IOError, OSError), e:
             log.info("Plugins are not installed. Could not access file: %s" % e.strerror)
         else:
@@ -752,7 +752,7 @@ try:
                 #log.info("Installed in HPLIP?: %s" % x)
                 log.info("Device URI: %s" % device_uri)
 
-                ppd = os.path.join('/etc/cups/ppd', printer_name + '.ppd')
+                ppd = os.path.join('${SYSCONFDIR}/cups/ppd', printer_name + '.ppd')
 
                 if os.path.exists(ppd):
                     log.info("PPD: %s" % ppd)