$OpenBSD: patch-base_g_py,v 1.5 2012/10/12 21:56:07 ajacoutot Exp $ --- base/g.py.orig Wed Oct 10 08:14:21 2012 +++ base/g.py Fri Oct 12 23:40:53 2012 @@ -144,15 +144,15 @@ class ConfigBase(object): class SysConfig(ConfigBase): def __init__(self): - ConfigBase.__init__(self, '/etc/hp/hplip.conf') + ConfigBase.__init__(self, '${SYSCONFDIR}/hp/hplip.conf') class State(ConfigBase): def __init__(self): - if not os.path.exists('/var/lib/hp/') and os.geteuid() == 0: - os.makedirs('/var/lib/hp/') - os.system('chmod 644 /var/lib/hp/') - ConfigBase.__init__(self, '/var/lib/hp/hplip.state') + if not os.path.exists('/var/db/hp/') and os.geteuid() == 0: + os.makedirs('/var/db/hp/') + os.system('chmod 644 /var/db/hp/') + ConfigBase.__init__(self, '/var/db/hp/hplip.state') class UserConfig(ConfigBase): @@ -250,9 +250,9 @@ prop.max_message_len = 8192 prop.max_message_read = 65536 prop.read_timeout = 90 -prop.ppd_search_path = '/usr/share;/usr/local/share;/usr/lib;/usr/local/lib;/usr/libexec;/opt;/usr/lib64' +prop.ppd_search_path = '/usr/share;${LOCALBASE}/share;${LOCALBASE}/share/foomatic/db/source/PPD/HP;/usr/lib;/usr/local/lib;/usr/libexec;/opt;/usr/lib64' prop.ppd_search_pattern = 'HP-*.ppd.*' -prop.ppd_download_url = 'http://www.linuxprinting.org/ppd-o-matic.cgi' +prop.ppd_download_url = 'http://www.openprinting.org/ppd-o-matic.php' prop.ppd_file_suffix = '-hpijs.ppd' # Build and install configurations