$OpenBSD: patch-check_py,v 1.10 2013/01/26 12:25:54 ajacoutot Exp $
--- check.py.orig	Tue Nov 20 10:55:15 2012
+++ check.py	Sat Jan 26 13:15:17 2013
@@ -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'"
@@ -218,7 +218,7 @@ def check_user_groups(str_grp, avl_grps):
         grps =re.sub(r'\s', '', str(grps))
         exp_grp_list = grps.split(',')
     else:
-        exp_grp_list.append('lp')
+        exp_grp_list.append('_cups')
 
     log.debug("Requied groups list =[%s]"%exp_grp_list)
 
@@ -337,7 +337,7 @@ class DependenciesCheck(CoreInstall):
             'pyqt4':            (True,  ['gui_qt4'], "Python-Qt4", self.check_pyqt4,'4.0','FUNC#get_pyQt4_version'), # PyQt 4.x )
             'pyqt4-dbus' :      (True,  ['gui_qt4'], "PyQt4-DBUS", self.check_pyqt4_dbus,'4.0','FUNC#get_pyQt4_version'), 
             'pyqt':            (True,  ['gui_qt'], "Python-Qt", self.check_pyqt,'2.3','FUNC#get_pyQt_version'), 
-            'python-devel' :    (True,  ['base'], "Python-SDK", self.check_python_devel,'2.2','python --version'),
+            'python-devel' :    (True,  ['base'], "Python-SDK", self.check_python_devel,'2.2','${MODPY_BIN} --version'),
             'python-notify' :   (False, ['gui_qt4'], "Desktop-notifications", self.check_pynotify,'-','python-notify --version'), # Optional for libnotify style popups from hp-systray
             'python-xml'  :     (True,  ['base'], "Python-XML-Lib", self.check_python_xml,'-','FUNC#get_python_xml_version'),
             'pil':              (False, ['scan'], "Python-Image-Lib", self.check_pil,'-','FUNC#get_pil_version'), #required for commandline scanning with hp-scan
@@ -348,7 +348,7 @@ class DependenciesCheck(CoreInstall):
             COMPILEDEP:
             { 'gcc' :             (True,  ['base'], 'gcc-Compiler', self.check_gcc, '-','gcc --version'),
             'libtool':          (True,  ['base'], "Build-tools", self.check_libtool,'-','libtool --version'),
-            'make' :            (True,  ['base'], "GNU-Build-tools", self.check_make,'3.0','make --version'),
+            'make' :            (True,  ['base'], "GNU-Build-tools", self.check_make,'-','-'),
             },
             PYEXT: 
              { 'cupsext' :         (True,  ['base'], 'CUPS-Extension', self.check_cupsext,'-','FUNC#get_HPLIP_version'),
@@ -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)
