pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print/hplip
Module Name: pkgsrc
Committed By: gutteridge
Date: Sun Mar 13 05:46:56 UTC 2022
Modified Files:
pkgsrc/print/hplip: Makefile PLIST.qt5 distinfo options.mk
pkgsrc/print/hplip/patches: patch-diagnose_queues.py
patch-installer_dcheck.py patch-prnt_hpijs_foomatic-rip-hplip
patch-scan.py
Log Message:
hplip: fix botched patches and qt5 option packaging
When some patches were last updated, some incorrect changes were
inadvertently added. This broke some of the functionality, since there
were hard-coded paths added (e.g., "/usr/pkg/bin/python3.7").
Also fix qt5 option packaging so this actually builds again. There are
still issues that need investigation, but at least an executable can
now run and be interacted with (e.g., attaching as a plugin in Xfce).
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/print/hplip/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/hplip/PLIST.qt5
cvs rdiff -u -r1.41 -r1.42 pkgsrc/print/hplip/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/hplip/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/hplip/patches/patch-diagnose_queues.py
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/hplip/patches/patch-installer_dcheck.py \
pkgsrc/print/hplip/patches/patch-scan.py
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/hplip/Makefile
diff -u pkgsrc/print/hplip/Makefile:1.99 pkgsrc/print/hplip/Makefile:1.100
--- pkgsrc/print/hplip/Makefile:1.99 Tue Mar 8 22:55:41 2022
+++ pkgsrc/print/hplip/Makefile Sun Mar 13 05:46:55 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2022/03/08 22:55:41 gutteridge Exp $
+# $NetBSD: Makefile,v 1.100 2022/03/13 05:46:55 gutteridge Exp $
DISTNAME= hplip-3.19.12
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/}
Index: pkgsrc/print/hplip/PLIST.qt5
diff -u pkgsrc/print/hplip/PLIST.qt5:1.1 pkgsrc/print/hplip/PLIST.qt5:1.2
--- pkgsrc/print/hplip/PLIST.qt5:1.1 Sat May 28 21:03:56 2016
+++ pkgsrc/print/hplip/PLIST.qt5 Sun Mar 13 05:46:55 2022
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST.qt5,v 1.1 2016/05/28 21:03:56 schnoebe Exp $
+@comment $NetBSD: PLIST.qt5,v 1.2 2022/03/13 05:46:55 gutteridge Exp $
bin/hp-toolbox
share/PolicyKit/policy/com.hp.hplip.policy
+share/applications/hp-uiscan.desktop
share/applications/hplip.desktop
share/dbus-1/system-services/com.hp.hplip.service
share/examples/hplip/dbus-1/system.d/com.hp.hplip.conf
@@ -292,6 +293,7 @@ share/hplip/data/images/other/confidenti
share/hplip/data/images/other/confidential_title.png
share/hplip/data/images/other/fax.png
share/hplip/data/images/other/fax2.png
+share/hplip/data/images/other/flat1.png
share/hplip/data/images/other/generic_coverpage.png
share/hplip/data/images/other/generic_title.png
share/hplip/data/images/other/h-k-2.png
@@ -304,6 +306,7 @@ share/hplip/data/images/other/opensource
share/hplip/data/images/other/panel_lcd.png
share/hplip/data/images/other/pens.png
share/hplip/data/images/other/powered_by_python.png
+share/hplip/data/images/other/resolution.png
share/hplip/data/images/other/signal0.png
share/hplip/data/images/other/signal1.png
share/hplip/data/images/other/signal2.png
@@ -322,6 +325,7 @@ share/hplip/data/images/other/v-k-2.png
share/hplip/data/images/other/v-k-3.png
share/hplip/data/images/other/v-kc-2.png
share/hplip/data/images/other/v-kc-3.png
+share/hplip/data/images/other/viewer.png
share/hplip/data/images/other/zca.png
share/hplip/ppd/HP/hp-laserjet_pro_m501dn-ps.ppd.gz
share/hplip/ppd/HP/hp-laserjet_pro_m501n-ps.ppd.gz
@@ -329,138 +333,6 @@ share/hplip/ppd/HP/hp-officejet_200_mobi
share/hplip/ppd/HP/hp-officejet_pro_8710.ppd.gz
share/hplip/ppd/HP/hp-officejet_pro_8720.ppd.gz
share/hplip/ppd/HP/hp-officejet_pro_8730-ps.ppd.gz
-share/hplip/ui4/__init__.py
-share/hplip/ui4/__init__.pyc
-share/hplip/ui4/aboutdialog.py
-share/hplip/ui4/aboutdialog.pyc
-share/hplip/ui4/aboutdialog_base.py
-share/hplip/ui4/aboutdialog_base.pyc
-share/hplip/ui4/aligndialog.py
-share/hplip/ui4/aligndialog.pyc
-share/hplip/ui4/aligndialog_base.py
-share/hplip/ui4/aligndialog_base.pyc
-share/hplip/ui4/cleandialog.py
-share/hplip/ui4/cleandialog.pyc
-share/hplip/ui4/cleandialog_base.py
-share/hplip/ui4/cleandialog_base.pyc
-share/hplip/ui4/colorcaldialog.py
-share/hplip/ui4/colorcaldialog.pyc
-share/hplip/ui4/colorcaldialog_base.py
-share/hplip/ui4/colorcaldialog_base.pyc
-share/hplip/ui4/devicesetupdialog.py
-share/hplip/ui4/devicesetupdialog.pyc
-share/hplip/ui4/devicesetupdialog_base.py
-share/hplip/ui4/devicesetupdialog_base.pyc
-share/hplip/ui4/deviceuricombobox.py
-share/hplip/ui4/deviceuricombobox.pyc
-share/hplip/ui4/devmgr5.py
-share/hplip/ui4/devmgr5.pyc
-share/hplip/ui4/devmgr5_base.py
-share/hplip/ui4/devmgr5_base.pyc
-share/hplip/ui4/fabgrouptable.py
-share/hplip/ui4/fabgrouptable.pyc
-share/hplip/ui4/fabnametable.py
-share/hplip/ui4/fabnametable.pyc
-share/hplip/ui4/fabwindow.py
-share/hplip/ui4/fabwindow.pyc
-share/hplip/ui4/fabwindow_base.py
-share/hplip/ui4/fabwindow_base.pyc
-share/hplip/ui4/faxsetupdialog.py
-share/hplip/ui4/faxsetupdialog.pyc
-share/hplip/ui4/faxsetupdialog_base.py
-share/hplip/ui4/faxsetupdialog_base.pyc
-share/hplip/ui4/filetable.py
-share/hplip/ui4/filetable.pyc
-share/hplip/ui4/firmwaredialog.py
-share/hplip/ui4/firmwaredialog.pyc
-share/hplip/ui4/firmwaredialog_base.py
-share/hplip/ui4/firmwaredialog_base.pyc
-share/hplip/ui4/infodialog.py
-share/hplip/ui4/infodialog.pyc
-share/hplip/ui4/infodialog_base.py
-share/hplip/ui4/infodialog_base.pyc
-share/hplip/ui4/linefeedcaldialog.py
-share/hplip/ui4/linefeedcaldialog.pyc
-share/hplip/ui4/linefeedcaldialog_base.py
-share/hplip/ui4/linefeedcaldialog_base.pyc
-share/hplip/ui4/loadpapergroupbox.py
-share/hplip/ui4/loadpapergroupbox.pyc
-share/hplip/ui4/makecopiesdialog.py
-share/hplip/ui4/makecopiesdialog.pyc
-share/hplip/ui4/makecopiesdialog_base.py
-share/hplip/ui4/makecopiesdialog_base.pyc
-share/hplip/ui4/mimetypesdialog.py
-share/hplip/ui4/mimetypesdialog.pyc
-share/hplip/ui4/mimetypesdialog_base.py
-share/hplip/ui4/mimetypesdialog_base.pyc
-share/hplip/ui4/nodevicesdialog.py
-share/hplip/ui4/nodevicesdialog.pyc
-share/hplip/ui4/nodevicesdialog_base.py
-share/hplip/ui4/nodevicesdialog_base.pyc
-share/hplip/ui4/plugindiagnose.py
-share/hplip/ui4/plugindiagnose.pyc
-share/hplip/ui4/plugindiagnose_base.py
-share/hplip/ui4/plugindiagnose_base.pyc
-share/hplip/ui4/plugindialog.py
-share/hplip/ui4/plugindialog.pyc
-share/hplip/ui4/plugindialog_base.py
-share/hplip/ui4/plugindialog_base.pyc
-share/hplip/ui4/pluginlicensedialog.py
-share/hplip/ui4/pluginlicensedialog.pyc
-share/hplip/ui4/pluginlicensedialog_base.py
-share/hplip/ui4/pluginlicensedialog_base.pyc
-share/hplip/ui4/pqdiagdialog.py
-share/hplip/ui4/pqdiagdialog.pyc
-share/hplip/ui4/pqdiagdialog_base.py
-share/hplip/ui4/pqdiagdialog_base.pyc
-share/hplip/ui4/printdialog.py
-share/hplip/ui4/printdialog.pyc
-share/hplip/ui4/printdialog_base.py
-share/hplip/ui4/printdialog_base.pyc
-share/hplip/ui4/printernamecombobox.py
-share/hplip/ui4/printernamecombobox.pyc
-share/hplip/ui4/printsettingsdialog.py
-share/hplip/ui4/printsettingsdialog.pyc
-share/hplip/ui4/printsettingsdialog_base.py
-share/hplip/ui4/printsettingsdialog_base.pyc
-share/hplip/ui4/printsettingstoolbox.py
-share/hplip/ui4/printsettingstoolbox.pyc
-share/hplip/ui4/printtestpagedialog.py
-share/hplip/ui4/printtestpagedialog.pyc
-share/hplip/ui4/printtestpagedialog_base.py
-share/hplip/ui4/printtestpagedialog_base.pyc
-share/hplip/ui4/queuesconf.py
-share/hplip/ui4/queuesconf.pyc
-share/hplip/ui4/readonlyradiobutton.py
-share/hplip/ui4/readonlyradiobutton.pyc
-share/hplip/ui4/sendfaxdialog.py
-share/hplip/ui4/sendfaxdialog.pyc
-share/hplip/ui4/sendfaxdialog_base.py
-share/hplip/ui4/sendfaxdialog_base.pyc
-share/hplip/ui4/settingsdialog.py
-share/hplip/ui4/settingsdialog.pyc
-share/hplip/ui4/settingsdialog_base.py
-share/hplip/ui4/settingsdialog_base.pyc
-share/hplip/ui4/setupdialog.py
-share/hplip/ui4/setupdialog.pyc
-share/hplip/ui4/setupdialog_base.py
-share/hplip/ui4/setupdialog_base.pyc
-share/hplip/ui4/systemtray.py
-share/hplip/ui4/systemtray.pyc
-share/hplip/ui4/systrayframe.py
-share/hplip/ui4/systrayframe.pyc
-share/hplip/ui4/systrayframe_base.py
-share/hplip/ui4/systrayframe_base.pyc
-share/hplip/ui4/ui_utils.py
-share/hplip/ui4/ui_utils.pyc
-share/hplip/ui4/upgradedialog.py
-share/hplip/ui4/upgradedialog.pyc
-share/hplip/ui4/upgradedialog_base.py
-share/hplip/ui4/upgradedialog_base.pyc
-share/hplip/ui4/wifisetupdialog.py
-share/hplip/ui4/wifisetupdialog.pyc
-share/hplip/ui4/wifisetupdialog_base.py
-share/hplip/ui4/wifisetupdialog_base.pyc
share/hplip/ui5/__init__.py
share/hplip/ui5/__init__.pyc
share/hplip/ui5/aboutdialog.py
@@ -569,6 +441,8 @@ share/hplip/ui5/queuesconf.py
share/hplip/ui5/queuesconf.pyc
share/hplip/ui5/readonlyradiobutton.py
share/hplip/ui5/readonlyradiobutton.pyc
+share/hplip/ui5/scandialog.py
+share/hplip/ui5/scandialog.pyc
share/hplip/ui5/sendfaxdialog.py
share/hplip/ui5/sendfaxdialog.pyc
share/hplip/ui5/sendfaxdialog_base.py
Index: pkgsrc/print/hplip/distinfo
diff -u pkgsrc/print/hplip/distinfo:1.41 pkgsrc/print/hplip/distinfo:1.42
--- pkgsrc/print/hplip/distinfo:1.41 Tue Oct 26 11:12:07 2021
+++ pkgsrc/print/hplip/distinfo Sun Mar 13 05:46:55 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2021/10/26 11:12:07 nia Exp $
+$NetBSD: distinfo,v 1.42 2022/03/13 05:46:55 gutteridge Exp $
BLAKE2s (hplip-3.19.12.tar.gz) = 24ea25e3ac4ab3c521ae65acb27a88a65a164f3d93b088e33f13f97ee8ad6eae
SHA512 (hplip-3.19.12.tar.gz) = 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
@@ -6,13 +6,13 @@ Size (hplip-3.19.12.tar.gz) = 25676247 b
SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
SHA1 (patch-ae) = c67ea6d640175a1f0518640f41b5fb58241430f1
SHA1 (patch-configure.in) = d6e20d8d4f0b1042a32149eeca45d2ddc319f65f
-SHA1 (patch-diagnose_queues.py) = 385c694642248818b28375711df244f12e63fdb4
-SHA1 (patch-installer_dcheck.py) = 9e8e6b552f935d2ed5a61060cc0a4541095e2751
+SHA1 (patch-diagnose_queues.py) = 1f15cffafd602cc23bad0094fc5c485f24171797
+SHA1 (patch-installer_dcheck.py) = 3bfe3bd15c0a3fb968e03aa8250dc7939bfe14d1
SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
SHA1 (patch-prnt_hpcups_HPCupsFilter.cpp) = 19a26044ce24433b0188c243925b4028bc388f1a
SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
-SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = c37ed4beda5a84fac65484d11af55bf80b3f9f7c
+SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = cfec38607572af9536e7c21cfe2e491d07d3838d
SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
SHA1 (patch-prnt_hpps_hppsfilter.c) = 5a3e7f3f5504fb88d58cf2b79fa138066859aa00
SHA1 (patch-protocol_discovery_mdns.c) = e2ca43f6ab13fe2124a38bcc0eff292a57b34b06
-SHA1 (patch-scan.py) = b58ffdd4811b8b20973a07f3b9f60174a96beed4
+SHA1 (patch-scan.py) = 3ca05c3569ec78b5752af364e4d0728900076c3c
Index: pkgsrc/print/hplip/options.mk
diff -u pkgsrc/print/hplip/options.mk:1.19 pkgsrc/print/hplip/options.mk:1.20
--- pkgsrc/print/hplip/options.mk:1.19 Wed Mar 10 18:53:49 2021
+++ pkgsrc/print/hplip/options.mk Sun Mar 13 05:46:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2021/03/10 18:53:49 adam Exp $
+# $NetBSD: options.mk,v 1.20 2022/03/13 05:46:55 gutteridge Exp $
#
# HPLIP dependencies are detailed in the following page:
# http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -14,14 +14,14 @@ PKG_OPTIONS_LEGACY_OPTS+= qt:qt5
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mqt5)
-PYTHON_VERSIONS_ACCEPTED= 27 # py-notify
+PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-pyphen
CONFIGURE_ARGS+= --enable-gui-build
CONFIGURE_ARGS+= --enable-policykit
EGFILES+= dbus-1/system.d/com.hp.hplip.conf
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d
.include "../../security/policykit/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-DEPENDS+= ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
+DEPENDS+= ${PYPKGPREFIX}-notify2-[0-9]*:../../sysutils/py-notify2
PLIST_SRC+= PLIST.qt5
CONFIGURE_ARGS+= --disable-qt4
CONFIGURE_ARGS+= --enable-qt5
Index: pkgsrc/print/hplip/patches/patch-diagnose_queues.py
diff -u pkgsrc/print/hplip/patches/patch-diagnose_queues.py:1.3 pkgsrc/print/hplip/patches/patch-diagnose_queues.py:1.4
--- pkgsrc/print/hplip/patches/patch-diagnose_queues.py:1.3 Sat Jan 4 04:24:12 2020
+++ pkgsrc/print/hplip/patches/patch-diagnose_queues.py Sun Mar 13 05:46:55 2022
@@ -1,15 +1,9 @@
-$NetBSD: patch-diagnose_queues.py,v 1.3 2020/01/04 04:24:12 khorben Exp $
+$NetBSD: patch-diagnose_queues.py,v 1.4 2022/03/13 05:46:55 gutteridge Exp $
Correct the spelling on the module name.
--- diagnose_queues.py.orig 2019-12-10 05:00:36.000000000 +0000
+++ diagnose_queues.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python3.7
- # -*- coding: utf-8 -*-
- #
- # (c) Copyright 2011-2015 HP Development Company, L.P.
@@ -22,7 +22,7 @@
from __future__ import print_function
__version__ = '1.1'
Index: pkgsrc/print/hplip/patches/patch-installer_dcheck.py
diff -u pkgsrc/print/hplip/patches/patch-installer_dcheck.py:1.4 pkgsrc/print/hplip/patches/patch-installer_dcheck.py:1.5
--- pkgsrc/print/hplip/patches/patch-installer_dcheck.py:1.4 Sat Jan 4 04:24:12 2020
+++ pkgsrc/print/hplip/patches/patch-installer_dcheck.py Sun Mar 13 05:46:55 2022
@@ -1,29 +1,18 @@
-$NetBSD: patch-installer_dcheck.py,v 1.4 2020/01/04 04:24:12 khorben Exp $
+$NetBSD: patch-installer_dcheck.py,v 1.5 2022/03/13 05:46:55 gutteridge Exp $
Locate libraries on systems without ldconfig(8)
-This only looks for libraries in pkgsrc's own library folder.
+This only looks for libraries in pkgsrc's own library folder, after the
+subst framework in Makefile operates.
--- installer/dcheck.py.orig 2019-12-10 05:00:31.000000000 +0000
+++ installer/dcheck.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python3.7
- # -*- coding: utf-8 -*-
- #
- # (c) Copyright 2003-2015 HP Development Company, L.P.
-@@ -99,11 +99,13 @@ def check_lib(lib, min_ver=0):
+@@ -99,6 +99,8 @@ def check_lib(lib, min_ver=0):
# pass
#else:
return True
-+ elif check_file(lib+".so","/usr/pkg/lib"):
++ elif check_file(lib+".so","/usr/lib"):
+ return True
else:
log.debug("Not found.")
return False
-
--def check_file(f, dir="/usr/include"):
-+def check_file(f, dir="/usr/pkg/include"):
- 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)
Index: pkgsrc/print/hplip/patches/patch-scan.py
diff -u pkgsrc/print/hplip/patches/patch-scan.py:1.4 pkgsrc/print/hplip/patches/patch-scan.py:1.5
--- pkgsrc/print/hplip/patches/patch-scan.py:1.4 Sat Jan 4 04:24:12 2020
+++ pkgsrc/print/hplip/patches/patch-scan.py Sun Mar 13 05:46:55 2022
@@ -1,15 +1,9 @@
-$NetBSD: patch-scan.py,v 1.4 2020/01/04 04:24:12 khorben Exp $
+$NetBSD: patch-scan.py,v 1.5 2022/03/13 05:46:55 gutteridge Exp $
Try to work better with multiple versions of Python
--- scan.py.orig 2019-12-10 05:00:36.000000000 +0000
+++ scan.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python3.7
- # -*- coding: utf-8 -*-
- #
- # (c) Copyright 2003-2015 HP Development Company, L.P.
@@ -1028,7 +1028,7 @@ try:
scan_area = (brx - tlx) * (bry - tly) # mm^2
@@ -19,12 +13,3 @@ Try to work better with multiple version
if 0 in valid_res: #min-max range in tuple
if res < valid_res[0] or res > valid_res[1]:
log.warn("Invalid resolution. Using closest valid resolution of %d dpi" % res)
-@@ -1911,7 +1911,7 @@ try:
- elif d == 'print':
- hp_print = utils.which("hp-print", True)
- if not hp_print:
-- hp_print = 'python ./print.py'
-+ hp_print = '/usr/pkg/bin/python3.7 ./print.py'
-
- if dest_printer is not None:
- cmd = '%s -p %s %s &' % (hp_print, dest_printer, output)
Index: pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip
diff -u pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip:1.2 pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip:1.3
--- pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip:1.2 Sat Jan 4 04:24:12 2020
+++ pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip Sun Mar 13 05:46:55 2022
@@ -1,87 +1,10 @@
-$NetBSD: patch-prnt_hpijs_foomatic-rip-hplip,v 1.2 2020/01/04 04:24:12 khorben Exp $
+$NetBSD: patch-prnt_hpijs_foomatic-rip-hplip,v 1.3 2022/03/13 05:46:55 gutteridge Exp $
perl-5.22 compatibility
--- prnt/hpijs/foomatic-rip-hplip.orig 2019-12-10 05:00:36.000000000 +0000
+++ prnt/hpijs/foomatic-rip-hplip
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/pkg/bin/perl
- # The above Perl path may vary on your system; fix it!!! -*- perl -*-
-
- use strict;
-@@ -44,19 +44,19 @@ my $ripversion='$Revision=3.0.2.131$';
- # possibly other stuff. The default path is often fine on Linux, but
- # may not be on other systems.
- #
--my $execpath = "/usr/bin:/usr/local/bin:/usr/bin:/bin";
-+my $execpath = "/usr/bin:/usr/pkg/bin:/usr/pkg/bin:/usr/local/bin:/usr/bin:/bin";
-
- # CUPS raster drivers are searched here
--my $cupsfilterpath = "/usr/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
-+my $cupsfilterpath = "/usr/lib/cups/filter:/usr/pkg/libexec/cups/filter:/usr/pkg/libexec/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
-
- # Location of the configuration file "filter.conf", this file can be
- # used to change the settings of foomatic-rip without editing
- # foomatic-rip. itself. This variable must contain the full pathname
- # of the directory which contains the configuration file, usually
--# "/etc/foomatic".
-+# "/usr/pkg/etc/foomatic".
- # Some versions of configure do not fully expand $sysconfdir
--my $prefix = "/usr";
--my $configpath = "/etc/foomatic";
-+my $prefix = "/usr/pkg";
-+my $configpath = "/usr/pkg/etc/foomatic";
-
- # For the stuff below, the settings in the configuration file have priority.
-
-@@ -66,7 +66,7 @@ my $accounting_prolog = "";
-
- # Enter here your personal command for converting non-postscript files
- # (especially text) to PostScript. If you leave it blank, at first the
--# line "textfilter: ..." from /etc/foomatic/filter.conf is read and
-+# line "textfilter: ..." from /usr/pkg/etc/foomatic/filter.conf is read and
- # then the commands given on the list below are tried, beginning with
- # the first one.
- # You can set this to "a2ps", "enscript" or "mpage" to select one of the
-@@ -97,7 +97,7 @@ my $modern_shell = '';
- # Set debug to 1 to enable the debug logfile for this filter; it will
- # appear as defined by $logfile. It will contain status from this
- # filter, plus the renderer's stderr output. You can also add a line
--# "debug: 1" to your /etc/foomatic/filter.conf to get all your
-+# "debug: 1" to your /usr/pkg/etc/foomatic/filter.conf to get all your
- # Foomatic filters into debug mode.
- #
- # WARNING: This logfile is a security hole; do not use in production.
-@@ -761,7 +761,7 @@ my( $cups_jobid, $cups_user, $cups_jobti
- $cups_filename );
- if ($spooler eq 'cups') {
-
-- # Use CUPS font path ("FontPath" in /etc/cups/cupsd.conf)
-+ # Use CUPS font path ("FontPath" in /usr/pkg/etc/cups/cupsd.conf)
- if ($ENV{'CUPS_FONTPATH'}) {
- $ENV{'GS_LIB'} = $ENV{'CUPS_FONTPATH'} .
- ($ENV{'GS_LIB'} ? ":$ENV{'GS_LIB'}" : "");
-@@ -1038,12 +1038,16 @@ if (($spooler eq 'direct') || ($spooler
- $ppdfile = "$configpath/direct/${printer}.ppd";
- } elsif (-r "$configpath/${printer}.ppd") { # system dir
- $ppdfile = "$configpath/${printer}.ppd";
-- } elsif (-r "/etc/cups/ppd/${printer}.ppd") { # CUPS config dir
-- $ppdfile = "/etc/cups/ppd/${printer}.ppd";
-+ } elsif (-r "/usr/pkg/etc/cups/ppd/${printer}.ppd") { # CUPS config dir
-+ $ppdfile = "/usr/pkg/etc/cups/ppd/${printer}.ppd";
- } elsif (-r "/usr/local/etc/cups/ppd/${printer}.ppd") {
- $ppdfile = "/usr/local/etc/cups/ppd/${printer}.ppd";
- } elsif (-r "/usr/share/ppr/PPDFiles/${printer}.ppd") { # PPR PPDs
- $ppdfile = "/usr/share/ppr/PPDFiles/${printer}.ppd";
-+ } elsif (-r "/usr/pkg/share/ppr/PPDFiles/${printer}.ppd") { # PPR PPDs
-+ $ppdfile = "/usr/pkg/share/ppr/PPDFiles/${printer}.ppd";
-+ } elsif (-r "/usr/pkg/share/ppr/PPDFiles/${printer}.ppd") { # PPR PPDs
-+ $ppdfile = "/usr/pkg/share/ppr/PPDFiles/${printer}.ppd";
- } elsif (-r "/usr/local/share/ppr/PPDFiles/${printer}.ppd") {
- $ppdfile = "/usr/local/share/ppr/PPDFiles/${printer}.ppd";
- } else {
-@@ -1653,7 +1657,7 @@ if ($#datablob >= 0) {
+@@ -1653,7 +1653,7 @@ if ($#datablob >= 0) {
## if nexessary.
my $dontparse = 0;
Home |
Main Index |
Thread Index |
Old Index