cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to hplip-3.12.9.

Browse Source
This commit is contained in:
ajacoutot 2012-09-11 10:52:16 +00:00
parent 156ea5bb4c
commit 931a20db10
13 changed files with 281 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
print/hplip/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.56 2012/08/05 06:46:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.57 2012/09/11 10:52:16 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,7 +8,7 @@ COMMENT-hpcups= HP native CUPS driver
COMMENT-libs= HPLIP backend libraries
COMMENT-gui= HPLIP graphical tools
V= 3.12.6
V= 3.12.9
DISTNAME= hplip-${V}
PKGNAME-main= ${DISTNAME}
@ -17,12 +17,6 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-libs= hplip-libs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-main= 3
REVISION-gui= 0
REVISION-hpcups=2
REVISION-libs= 0
REVISION-hpijs= 0
SHARED_LIBS += hpmud 2.0 # .0.6
SHARED_LIBS += hpip 2.0 # .0.1

7
print/hplip/distinfo
View File

@ -1,5 +1,2 @@
MD5 (hplip-3.12.6.tar.gz) = UwOTjoYwd16m+zg6+Fd15Q==
RMD160 (hplip-3.12.6.tar.gz) = Uh3/z4t3fR9RkI13GyY2upW8qIA=
SHA1 (hplip-3.12.6.tar.gz) = 89f2b7Xv8hWKxCu1oRX474vXo4M=
SHA256 (hplip-3.12.6.tar.gz) = VFeAAHkpaa21g+de/qy5xGq2llnsfpQk3jkGE/NZV3U=
SIZE (hplip-3.12.6.tar.gz) = 21227044
SHA256 (hplip-3.12.9.tar.gz) = 5zYbnW6WjOMwbcQ45iKkQSFW58LXGypvrOWVLPUuI8Q=
SIZE (hplip-3.12.9.tar.gz) = 21314003

49
print/hplip/patches/patch-Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.17 2012/06/26 06:17:11 ajacoutot Exp $
$OpenBSD: patch-Makefile_in,v 1.18 2012/09/11 10:52:16 ajacoutot Exp $
libcompat is needed because hplip uses ftime(3).
--- Makefile.in.orig Mon Jun 18 12:44:46 2012
+++ Makefile.in Tue Jun 26 07:39:57 2012
@@ -4230,16 +4230,16 @@ cups_drv = prnt/drv/hpcups.drv
--- Makefile.in.orig Tue Sep 4 14:35:24 2012
+++ Makefile.in Tue Sep 11 08:21:03 2012
@@ -4251,16 +4251,16 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h
@ -24,7 +24,7 @@ libcompat is needed because hplip uses ftime(3).
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \
@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
@@ -4270,7 +4270,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4291,7 +4291,7 @@ cups_drv = prnt/drv/hpcups.drv
# hp-mkuri.
@HPLIP_BUILD_TRUE@hp_mkuridir = $(bindir)
@HPLIP_BUILD_TRUE@hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c
@ -32,8 +32,8 @@ libcompat is needed because hplip uses ftime(3).
+@HPLIP_BUILD_TRUE@hp_mkuri_LDADD = libhpmud.la
@HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
# hpmud.rules
@@ -4299,7 +4299,7 @@ cups_drv = prnt/drv/hpcups.drv
# cron files
@@ -4324,7 +4324,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@pstotiff_SCRIPTS = fax/filters/pstotiff
# hplip.state
@ -42,7 +42,7 @@ libcompat is needed because hplip uses ftime(3).
@HPLIP_BUILD_TRUE@dist_hplip_state_DATA =
#dist_hplip_state_DATA = hplip.state
@@ -4423,7 +4423,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4450,7 +4450,7 @@ cups_drv = prnt/drv/hpcups.drv
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LDFLAGS = -module -avoid-version
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_SOURCES = io/mudext/hpmudext.c
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LIBADD = libhpmud.la
@ -51,7 +51,7 @@ libcompat is needed because hplip uses ftime(3).
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
# ui (qt3)
@@ -4479,7 +4479,7 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4506,7 +4506,7 @@ cups_drv = prnt/drv/hpcups.drv
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
@ -59,8 +59,8 @@ libcompat is needed because hplip uses ftime(3).
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_LDADD = libapdk.la -ljpeg
# hplip.desktop
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -4551,8 +4551,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
@@ -4578,8 +4578,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPIJS_INSTALL_TRUE@hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
@HPIJS_INSTALL_TRUE@hpijs_CFLAGS = $(libapdk_la_CFLAGS)
@ -71,7 +71,7 @@ libcompat is needed because hplip uses ftime(3).
# hpcups
#if NEW_HPCUPS
@@ -4591,7 +4591,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4618,7 +4618,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/Hbpl1.cpp prnt/hpcups/Hbpl1.h prnt/hpcups/Hbpl1_Wrapper.h
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@ -80,7 +80,7 @@ libcompat is needed because hplip uses ftime(3).
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -4599,9 +4599,9 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
@@ -4626,9 +4626,9 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
#if HPCUPS_ONLY_BUILD
@ -92,20 +92,21 @@ libcompat is needed because hplip uses ftime(3).
#endif #HPCUPS_ONLY_BUILD
#endif # NEW_HPCUPS
# hpcupsfax
@@ -8582,10 +8582,10 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
install-cupsextLTLIBRARIES install-dist_baseDATA \
@@ -8626,10 +8626,10 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
install-dist_cacSCRIPTS install-dist_cmdSCRIPTS \
install-dist_copierDATA install-dist_faxDATA \
- install-dist_fax_filtersDATA install-dist_halpreDATA \
+ install-dist_fax_filtersDATA \
install-dist_hpcupsfaxppdDATA install-dist_hpfaxSCRIPTS \
install-dist_hpijsfaxppdDATA install-dist_hplipSCRIPTS \
- install-dist_hplip_LogDATA install-dist_hplip_stateDATA \
install-dist_copierDATA install-dist_cronDATA \
install-dist_faxDATA install-dist_fax_filtersDATA \
- install-dist_halpreDATA install-dist_hpcupsfaxppdDATA \
+ install-dist_hpcupsfaxppdDATA \
install-dist_hpfaxSCRIPTS install-dist_hpijsfaxppdDATA \
- install-dist_hplipSCRIPTS install-dist_hplip_LogDATA \
- install-dist_hplip_stateDATA install-dist_hplip_tmpDATA \
+ install-dist_hplipSCRIPTS \
+ install-dist_hplip_stateDATA \
install-dist_images_128x128DATA install-dist_images_16x16DATA \
install-dist_images_24x24DATA install-dist_images_256x256DATA \
install-dist_images_32x32DATA install-dist_images_64x64DATA \
@@ -8598,7 +8598,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
@@ -8642,7 +8642,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
install-dist_policykit_dbus_shareDATA \
install-dist_policykit_policyDATA install-dist_postscriptDATA \
install-dist_ppdDATA install-dist_prntDATA \
@ -114,8 +115,8 @@ libcompat is needed because hplip uses ftime(3).
install-dist_scanDATA install-dist_ui4DATA install-dist_uiDATA \
install-dist_unrelDATA install-dist_www0DATA \
install-dist_www3DATA install-dist_www4DATA install-docDATA \
@@ -8803,17 +8803,6 @@ install-dist_hplip_LogDATA:
@HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir)
@@ -8868,17 +8868,6 @@ install-dist_cronDATA:$(dist_cron_DATA)
done
install-data-hook:
-# If scanner build, add hpaio entry to sane dll.conf.

8
print/hplip/patches/patch-base_codes_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-base_codes_py,v 1.7 2012/06/26 06:17:11 ajacoutot Exp $
--- base/codes.py.orig Mon Jun 18 12:44:13 2012
+++ base/codes.py Tue Jun 26 07:06:28 2012
@@ -308,7 +308,7 @@ EVENT_RAISE_DEVICE_MANAGER = 9001
$OpenBSD: patch-base_codes_py,v 1.8 2012/09/11 10:52:16 ajacoutot Exp $
--- base/codes.py.orig Tue Sep 4 14:34:06 2012
+++ base/codes.py Tue Sep 11 08:05:33 2012
@@ -310,7 +310,7 @@ EVENT_RAISE_DEVICE_MANAGER = 9001
#EVENT_JOB_STORAGE_UI_REQUEST = 9002 # sent by hplipjs CUPS filter for job storage UI
EVENT_HISTORY_UPDATE = 9003 # sent by hp-systray to hp-toolbox when a device's history changes
EVENT_USER_CONFIGURATION_CHANGED = 9004 # sent when ~/.hplip/hplip.conf has been changed by another app.

25
print/hplip/patches/patch-base_utils_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-base_utils_py,v 1.5 2012/06/26 06:17:11 ajacoutot Exp $
--- base/utils.py.orig Mon Jun 18 12:44:13 2012
+++ base/utils.py Tue Jun 26 07:06:28 2012
@@ -523,7 +523,7 @@ class UserSettings(object): # Note: Deprecated after 2
$OpenBSD: patch-base_utils_py,v 1.6 2012/09/11 10:52:16 ajacoutot Exp $
--- base/utils.py.orig Tue Sep 4 14:34:06 2012
+++ base/utils.py Tue Sep 11 08:06:36 2012
@@ -524,7 +524,7 @@ class UserSettings(object): # Note: Deprecated after 2
if len(path):
self.cmd_pcard = 'hp-unload -d %DEVICE_URI%'
else:
@ -10,7 +10,7 @@ $OpenBSD: patch-base_utils_py,v 1.5 2012/06/26 06:17:11 ajacoutot Exp $
# Copy
path = which('hp-makecopies')
@@ -531,7 +531,7 @@ class UserSettings(object): # Note: Deprecated after 2
@@ -532,7 +532,7 @@ class UserSettings(object): # Note: Deprecated after 2
if len(path):
self.cmd_copy = 'hp-makecopies -d %DEVICE_URI%'
else:
@ -19,7 +19,7 @@ $OpenBSD: patch-base_utils_py,v 1.5 2012/06/26 06:17:11 ajacoutot Exp $
# Fax
path = which('hp-sendfax')
@@ -539,7 +539,7 @@ class UserSettings(object): # Note: Deprecated after 2
@@ -540,7 +540,7 @@ class UserSettings(object): # Note: Deprecated after 2
if len(path):
self.cmd_fax = 'hp-sendfax -d %FAX_URI%'
else:
@ -28,7 +28,7 @@ $OpenBSD: patch-base_utils_py,v 1.5 2012/06/26 06:17:11 ajacoutot Exp $
# Fax Address Book
path = which('hp-fab')
@@ -547,7 +547,7 @@ class UserSettings(object): # Note: Deprecated after 2
@@ -548,7 +548,7 @@ class UserSettings(object): # Note: Deprecated after 2
if len(path):
self.cmd_fab = 'hp-fab'
else:
@ -37,14 +37,15 @@ $OpenBSD: patch-base_utils_py,v 1.5 2012/06/26 06:17:11 ajacoutot Exp $
def load(self):
self.loadDefaults()
@@ -880,8 +880,8 @@ def all(S,f=lambda x:x):
@@ -880,9 +880,8 @@ def all(S,f=lambda x:x):
if not f(x): return False
return True
-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order
-BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
-BROWSER_OPTS = {'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
-
+BROWSERS = ['xdg-open']
+BROWSER_OPTS = {'xdg-open' : ''}
def find_browser():
if platform_avail and platform.system() == 'Darwin':

28
print/hplip/patches/patch-installer_core_install_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot Exp $
--- installer/core_install.py.orig Mon Jun 18 12:41:59 2012
+++ installer/core_install.py Tue Jun 26 07:40:21 2012
@@ -217,7 +217,7 @@ class CoreInstall(object):
$OpenBSD: patch-installer_core_install_py,v 1.11 2012/09/11 10:52:16 ajacoutot Exp $
--- installer/core_install.py.orig Tue Sep 4 14:31:53 2012
+++ installer/core_install.py Tue Sep 11 08:05:33 2012
@@ -218,7 +218,7 @@ class CoreInstall(object):
self.endian = utils.LITTLE_ENDIAN
self.distro, self.distro_name, self.distro_version = DISTRO_UNKNOWN, '', DISTRO_VER_UNKNOWN
self.distro_version_supported = False
@ -10,7 +10,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
self.hplip_present = False
self.have_dependencies = {}
self.native_cups = True
@@ -871,7 +871,7 @@ class CoreInstall(object):
@@ -876,7 +876,7 @@ class CoreInstall(object):
def check_make(self):
@ -19,7 +19,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
def check_libusb(self):
@@ -880,14 +880,14 @@ class CoreInstall(object):
@@ -885,14 +885,14 @@ class CoreInstall(object):
if not check_lib('libusb'):
return False
if self.distro_name != "rhel":
@ -36,7 +36,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
else:
return True
@@ -897,11 +897,10 @@ class CoreInstall(object):
@@ -902,11 +902,10 @@ class CoreInstall(object):
def check_libcrypto(self):
@ -50,7 +50,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
def check_libnetsnmp(self):
@@ -953,7 +952,7 @@ class CoreInstall(object):
@@ -958,7 +957,7 @@ class CoreInstall(object):
def check_sane_devel(self):
@ -59,7 +59,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
def check_xsane(self):
@@ -1054,9 +1053,8 @@ class CoreInstall(object):
@@ -1059,9 +1058,8 @@ class CoreInstall(object):
def check_dbus(self):
@ -71,7 +71,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
def check_cups_devel(self):
@@ -1074,17 +1072,17 @@ class CoreInstall(object):
@@ -1079,17 +1077,17 @@ class CoreInstall(object):
def check_cups_image(self):
@ -94,7 +94,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
def check_libtool(self):
@@ -1104,14 +1102,14 @@ class CoreInstall(object):
@@ -1109,14 +1107,14 @@ class CoreInstall(object):
def check_cupsddk(self):
log.debug("Checking for cups-ddk...")
# TODO: Compute these paths some way or another...
@ -113,7 +113,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
def check_cupsext(self):
log.debug("Checking 'cupsext' CUPS extension...")
@@ -1530,7 +1528,7 @@ class CoreInstall(object):
@@ -1540,7 +1538,7 @@ class CoreInstall(object):
cmd = self.su_sudo() % '/etc/init.d/cupsys restart'
else:
@ -122,7 +122,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
self.run(cmd)
@@ -1873,7 +1871,7 @@ class CoreInstall(object):
@@ -1883,7 +1881,7 @@ class CoreInstall(object):
def pre_build(self,distro_ver=None):
cmds = []
if self.get_distro_ver_data('fix_ppd_symlink', False,distro_ver):
@ -131,7 +131,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.10 2012/06/26 06:17:11 ajacoutot E
return cmds
@@ -2048,8 +2046,8 @@ class CoreInstall(object):
@@ -2058,8 +2056,8 @@ class CoreInstall(object):
url = "http://hplip.sf.net/plugin.conf"
home = sys_conf.get('dirs', 'home')

8
print/hplip/patches/patch-prnt_cups_py
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-prnt_cups_py,v 1.4 2012/06/26 06:17:11 ajacoutot Exp $
--- prnt/cups.py.orig Mon Jun 18 12:41:22 2012
+++ prnt/cups.py Tue Jun 26 07:06:29 2012
$OpenBSD: patch-prnt_cups_py,v 1.5 2012/09/11 10:52:16 ajacoutot Exp $
--- prnt/cups.py.orig Tue Sep 4 14:31:12 2012
+++ prnt/cups.py Tue Sep 11 08:05:33 2012
@@ -187,8 +187,8 @@ ppd_pat = re.compile(r'''.*hp-(.*?)(-.*)*\.ppd.*''', r
def getPPDPath(addtional_paths=None):
@ -69,7 +69,7 @@ $OpenBSD: patch-prnt_cups_py,v 1.4 2012/06/26 06:17:11 ajacoutot Exp $
for p in models.TECH_CLASS_PDLS.values():
@@ -543,7 +543,7 @@ def getPPDFile2(stripped_model, ppds): # New PPD find
@@ -616,7 +616,7 @@ def getFaxPPDFile(mq, model):
def getErrorLogLevel():

386
print/hplip/patches/patch-prnt_cupsext_cupsext_c
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-prnt_cupsext_cupsext_c,v 1.1 2012/08/05 06:46:10 ajacoutot Exp $
$OpenBSD: patch-prnt_cupsext_cupsext_c,v 1.2 2012/09/11 10:52:16 ajacoutot Exp $
https://bugs.launchpad.net/hplip/+bug/1026666
--- prnt/cupsext/cupsext.c.orig Sun Aug 5 08:28:22 2012
+++ prnt/cupsext/cupsext.c Sun Aug 5 08:35:12 2012
@@ -87,6 +87,46 @@ typedef int Py_ssize_t;
#define PY_SSIZE_T_MIN INT_MIN
#endif
--- prnt/cupsext/cupsext.c.orig Tue Sep 4 14:31:10 2012
+++ prnt/cupsext/cupsext.c Tue Sep 11 08:13:47 2012
@@ -87,7 +87,47 @@ typedef int Py_ssize_t;
#define PY_SSIZE_T_MIN INT_MIN
#endif
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetCount(attr) attr->num_values
+#define ippGetGroupTag(attr) attr->group_tag
@ -48,263 +48,257 @@ https://bugs.launchpad.net/hplip/+bug/1026666
+ return (1);
+}
+#endif
int g_num_options = 0;
cups_option_t * g_options;
+
int g_num_options = 0;
cups_option_t * g_options;
@@ -333,8 +373,8 @@ PyObject * getPrinters( PyObject * self, PyObject * ar
request = ippNew();
language = cupsLangDefault();
- request->request.op.operation_id = CUPS_GET_PRINTERS;
- request->request.any.request_id = 1;
request = ippNew();
language = cupsLangDefault();
- request->request.op.operation_id = CUPS_GET_PRINTERS;
- request->request.any.request_id = 1;
+ ippSetOperation( request, CUPS_GET_PRINTERS );
+ ippSetRequestId ( request, 1);
ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
"attributes-charset", NULL, cupsLangEncoding( language ) );
ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
"attributes-charset", NULL, cupsLangEncoding( language ) );
@@ -378,10 +418,10 @@ PyObject * getPrinters( PyObject * self, PyObject * ar
ipp_pstate_t state;
int i = 0;
- for ( attr = response->attrs; attr != NULL; attr = attr->next )
ipp_pstate_t state;
int i = 0;
- for ( attr = response->attrs; attr != NULL; attr = attr->next )
+ for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) )
{
- while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
- attr = attr->next;
{
- while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
- attr = attr->next;
+ while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER )
+ attr = ippNextAttribute( response );
if ( attr == NULL )
break;
if ( attr == NULL )
break;
@@ -390,41 +430,41 @@ PyObject * getPrinters( PyObject * self, PyObject * ar
state = IPP_PRINTER_IDLE;
accepting = 0;
- while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
state = IPP_PRINTER_IDLE;
accepting = 0;
- while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
+ while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER )
{
- if ( strcmp( attr->name, "printer-name" ) == 0 &&
- attr->value_tag == IPP_TAG_NAME )
- name = attr->values[ 0 ].string.text;
{
- if ( strcmp( attr->name, "printer-name" ) == 0 &&
- attr->value_tag == IPP_TAG_NAME )
- name = attr->values[ 0 ].string.text;
+ if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 &&
+ ippGetValueTag( attr ) == IPP_TAG_NAME )
+ name = ippGetString( attr, 0, NULL );
+
- else if ( strcmp( attr->name, "device-uri" ) == 0 &&
- attr->value_tag == IPP_TAG_URI )
- device_uri = attr->values[ 0 ].string.text;
+ else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 &&
+ ippGetValueTag( attr ) == IPP_TAG_URI )
+ device_uri = ippGetString( attr, 0, NULL );
+
- else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
- attr->value_tag == IPP_TAG_URI )
- printer_uri = attr->values[ 0 ].string.text;
+ else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 &&
+ ippGetValueTag( attr ) == IPP_TAG_URI )
+ printer_uri = ippGetString( attr, 0, NULL );
+
- else if ( strcmp( attr->name, "printer-info" ) == 0 &&
- attr->value_tag == IPP_TAG_TEXT )
- info = attr->values[ 0 ].string.text;
+ else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 &&
+ ippGetValueTag( attr ) == IPP_TAG_TEXT )
+ info = ippGetString( attr, 0, NULL );
+
- else if ( strcmp( attr->name, "printer-location" ) == 0 &&
- attr->value_tag == IPP_TAG_TEXT )
- location = attr->values[ 0 ].string.text;
+ else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 &&
+ ippGetValueTag( attr ) == IPP_TAG_TEXT )
+ location = ippGetString( attr, 0, NULL );
+
- else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
- attr->value_tag == IPP_TAG_TEXT )
- make_model = attr->values[ 0 ].string.text;
+ else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 &&
+ ippGetValueTag( attr ) == IPP_TAG_TEXT )
+ make_model = ippGetString( attr, 0, NULL );
+
- else if ( strcmp( attr->name, "printer-state" ) == 0 &&
- attr->value_tag == IPP_TAG_ENUM )
- state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
+ else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 &&
+ ippGetValueTag( attr ) == IPP_TAG_ENUM )
+ state = ( ipp_pstate_t ) ippGetInteger( attr, 0 );
+
- else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
- attr->value_tag == IPP_TAG_BOOLEAN)
- accepting = attr->values[ 0 ].boolean;
+ else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") &&
+ ippGetValueTag( attr ) == IPP_TAG_BOOLEAN)
+ accepting = ippGetBoolean( attr, 0 );
- else if ( strcmp( attr->name, "device-uri" ) == 0 &&
- attr->value_tag == IPP_TAG_URI )
- device_uri = attr->values[ 0 ].string.text;
-
- else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
- attr->value_tag == IPP_TAG_URI )
- printer_uri = attr->values[ 0 ].string.text;
-
- else if ( strcmp( attr->name, "printer-info" ) == 0 &&
- attr->value_tag == IPP_TAG_TEXT )
- info = attr->values[ 0 ].string.text;
-
- else if ( strcmp( attr->name, "printer-location" ) == 0 &&
- attr->value_tag == IPP_TAG_TEXT )
- location = attr->values[ 0 ].string.text;
-
- else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
- attr->value_tag == IPP_TAG_TEXT )
- make_model = attr->values[ 0 ].string.text;
-
- else if ( strcmp( attr->name, "printer-state" ) == 0 &&
- attr->value_tag == IPP_TAG_ENUM )
- state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
-
- else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
- attr->value_tag == IPP_TAG_BOOLEAN)
- accepting = attr->values[ 0 ].boolean;
-
- attr = attr->next;
- attr = attr->next;
+ attr = ippNextAttribute( response );
}
if ( device_uri == NULL )
}
if ( device_uri == NULL )
@@ -522,8 +562,8 @@ PyObject * addPrinter( PyObject * self, PyObject * arg
request = ippNew();
language = cupsLangDefault();
- request->request.op.operation_id = CUPS_ADD_PRINTER;
- request->request.any.request_id = 1;
request = ippNew();
language = cupsLangDefault();
- request->request.op.operation_id = CUPS_ADD_PRINTER;
- request->request.any.request_id = 1;
+ ippSetOperation( request, CUPS_ADD_PRINTER );
+ ippSetRequestId ( request, 1 );
ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
"attributes-charset", NULL, cupsLangEncoding( language ) );
ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
"attributes-charset", NULL, cupsLangEncoding( language ) );
@@ -568,7 +608,7 @@ PyObject * addPrinter( PyObject * self, PyObject * arg
}
else
{
- status = response->request.status.status_code;
}
else
{
- status = response->request.status.status_code;
+ status = ippGetStatusCode( response );
//ippDelete( response );
r = 1;
}
//ippDelete( response );
r = 1;
}
@@ -631,8 +671,8 @@ PyObject * delPrinter( PyObject * self, PyObject * arg
*/
request = ippNew();
- request->request.op.operation_id = CUPS_DELETE_PRINTER;
- request->request.op.request_id = 1;
*/
request = ippNew();
- request->request.op.operation_id = CUPS_DELETE_PRINTER;
- request->request.op.request_id = 1;
+ ippSetOperation( request, CUPS_DELETE_PRINTER );
+ ippSetRequestId ( request, 1 );
language = cupsLangDefault();
language = cupsLangDefault();
@@ -650,7 +690,7 @@ PyObject * delPrinter( PyObject * self, PyObject * arg
*/
response = cupsDoRequest( http, request, "/admin/" );
- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
*/
response = cupsDoRequest( http, request, "/admin/" );
- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
+ if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
{
r = 1;
}
{
r = 1;
}
@@ -721,8 +761,8 @@ PyObject * setDefaultPrinter( PyObject * self, PyObjec
request = ippNew();
- request->request.op.operation_id = CUPS_SET_DEFAULT;
- request->request.op.request_id = 1;
request = ippNew();
- request->request.op.operation_id = CUPS_SET_DEFAULT;
- request->request.op.request_id = 1;
+ ippSetOperation( request, CUPS_SET_DEFAULT );
+ ippSetRequestId ( request, 1 );
language = cupsLangDefault();
language = cupsLangDefault();
@@ -743,7 +783,7 @@ PyObject * setDefaultPrinter( PyObject * self, PyObjec
response = cupsDoRequest( http, request, "/admin/" );
- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
response = cupsDoRequest( http, request, "/admin/" );
- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
+ if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
{
r = 1;
}
{
r = 1;
}
@@ -797,8 +837,8 @@ PyObject * controlPrinter( PyObject * self, PyObject *
request = ippNew();
- request->request.op.operation_id = op;
- request->request.op.request_id = 1;
request = ippNew();
- request->request.op.operation_id = op;
- request->request.op.request_id = 1;
+ ippSetOperation( request, op );
+ ippSetRequestId ( request, 1 );
language = cupsLangDefault();
language = cupsLangDefault();
@@ -822,7 +862,7 @@ PyObject * controlPrinter( PyObject * self, PyObject *
response = cupsDoRequest(http, request, "/admin/");
- if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
response = cupsDoRequest(http, request, "/admin/");
- if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
+ if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT))
{
r = 1;
}
@@ -837,7 +877,7 @@ abort:
if ( response != NULL )
ippDelete( response );
- return Py_BuildValue( "i", r );;
{
r = 1;
}
@@ -837,7 +877,7 @@ abort:
if ( response != NULL )
ippDelete( response );
- return Py_BuildValue( "i", r );;
+ return Py_BuildValue( "i", r );
}
}
@@ -1116,8 +1156,8 @@ PyObject * getPPDList( PyObject * self, PyObject * arg
request = ippNew();
- request->request.op.operation_id = CUPS_GET_PPDS;
- request->request.op.request_id = 1;
request = ippNew();
- request->request.op.operation_id = CUPS_GET_PPDS;
- request->request.op.request_id = 1;
+ ippSetOperation( request, CUPS_GET_PPDS );
+ ippSetRequestId ( request, 1 );
language = cupsLangDefault();
language = cupsLangDefault();
@@ -1143,43 +1183,43 @@ PyObject * getPPDList( PyObject * self, PyObject * arg
if ((response = cupsDoRequest(http, request, "/")) != NULL)
{
- for (attr = response->attrs; attr; attr = attr->next)
if ((response = cupsDoRequest(http, request, "/")) != NULL)
{
- for (attr = response->attrs; attr; attr = attr->next)
+ for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response ))
{
PyObject *dict;
char *ppdname = NULL;
- while (attr && attr->group_tag != IPP_TAG_PRINTER)
- attr = attr->next;
{
PyObject *dict;
char *ppdname = NULL;
- while (attr && attr->group_tag != IPP_TAG_PRINTER)
- attr = attr->next;
+ while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
+ attr = ippNextAttribute( response );
if (!attr)
break;
dict = PyDict_New ();
- for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
if (!attr)
break;
dict = PyDict_New ();
- for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
+ for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response ))
{
PyObject *val = NULL;
- if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
{
PyObject *val = NULL;
- if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
+ if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME)
{
- ppdname = attr->values[0].string.text;
{
- ppdname = attr->values[0].string.text;
+ ppdname = ippGetString( attr, 0, NULL );
//sprintf( buf, "print '%s'", ppdname);
//PyRun_SimpleString( buf );
}
- else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
- //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
- // (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
- // (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
- // (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
//sprintf( buf, "print '%s'", ppdname);
//PyRun_SimpleString( buf );
}
- else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
- //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
- // (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
- // (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
- // (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
+ else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD)
+ //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) ||
+ // (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
+ // (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
+ // (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT))
{
- val = PyObj_from_UTF8(attr->values[0].string.text);
{
- val = PyObj_from_UTF8(attr->values[0].string.text);
+ val = PyObj_from_UTF8(ippGetString( attr, 0, NULL ));
}
if (val)
{
- PyDict_SetItemString (dict, attr->name, val);
}
if (val)
{
- PyDict_SetItemString (dict, attr->name, val);
+ PyDict_SetItemString (dict, ippGetName( attr ), val);
Py_DECREF (val);
}
}
Py_DECREF (val);
}
}

8
print/hplip/patches/patch-prnt_hpcups_HPCupsFilter_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-prnt_hpcups_HPCupsFilter_cpp,v 1.6 2012/06/26 06:17:11 ajacoutot Exp $
--- prnt/hpcups/HPCupsFilter.cpp.orig Mon Jun 18 12:40:17 2012
+++ prnt/hpcups/HPCupsFilter.cpp Tue Jun 26 07:19:17 2012
@@ -853,7 +853,7 @@ void HPCupsFilter::getLogLevel ()
$OpenBSD: patch-prnt_hpcups_HPCupsFilter_cpp,v 1.7 2012/09/11 10:52:16 ajacoutot Exp $
--- prnt/hpcups/HPCupsFilter.cpp.orig Tue Sep 4 14:31:10 2012
+++ prnt/hpcups/HPCupsFilter.cpp Tue Sep 11 08:05:33 2012
@@ -858,7 +858,7 @@ void HPCupsFilter::getLogLevel ()
FILE *fp;
char str[258];
char *p;

8
print/hplip/patches/patch-scan_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scan_py,v 1.5 2011/10/09 07:42:29 ajacoutot Exp $
--- scan.py.orig Sun Oct 2 05:06:19 2011
+++ scan.py Sun Oct 9 09:17:00 2011
@@ -1040,7 +1040,7 @@ try:
$OpenBSD: patch-scan_py,v 1.6 2012/09/11 10:52:16 ajacoutot Exp $
--- scan.py.orig Tue Sep 4 14:34:06 2012
+++ scan.py Tue Sep 11 08:05:33 2012
@@ -1061,7 +1061,7 @@ try:
if hp_print:
cmd = 'hp-print %s &' % output
else:

8
print/hplip/patches/patch-setup_py
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.3 2012/06/26 06:17:11 ajacoutot Exp $
--- setup.py.orig Mon Jun 18 12:44:13 2012
+++ setup.py Tue Jun 26 07:06:29 2012
$OpenBSD: patch-setup_py,v 1.4 2012/09/11 10:52:16 ajacoutot Exp $
--- setup.py.orig Tue Sep 4 14:34:06 2012
+++ setup.py Tue Sep 11 08:05:33 2012
@@ -125,7 +125,7 @@ def restart_cups():
return '/etc/init.d/cupsys restart'
@ -10,7 +10,7 @@ $OpenBSD: patch-setup_py,v 1.3 2012/06/26 06:17:11 ajacoutot Exp $
mod = module.Module(__mod__, __title__, __version__, __doc__, USAGE,
@@ -897,7 +897,7 @@ else: # INTERACTIVE_MODE
@@ -879,7 +879,7 @@ else: # INTERACTIVE_MODE
if len(path) > 0:
cmd = 'hp-testpage %s' % param
else:

9
print/hplip/pkg/PLIST-hpijs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-hpijs,v 1.18 2012/06/26 06:17:11 ajacoutot Exp $
@comment $OpenBSD: PLIST-hpijs,v 1.19 2012/09/11 10:52:16 ajacoutot Exp $
@conflict hplip-libs-<=3.9.8
@pkgpath print/hpijs
@bin bin/hpijs
@ -212,6 +212,7 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_3420-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3425-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3450-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3500-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3510_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3520_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3550-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_3600-hpijs.ppd.gz
@ -265,6 +266,7 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_632c-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_640c-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_648c-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_6500-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_6520_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_656c-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_660-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-deskjet_6600-hpijs.ppd.gz
@ -402,7 +404,9 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_1320nw-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_1320nw-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_1320tn-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_1320tn-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_200_color_m251-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_2100-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_2100-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz
@ -562,7 +566,6 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1530_mfp_series-ps.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz
share/foomatic/db/source/PPD/HP/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz
@ -814,6 +817,8 @@ share/foomatic/db/source/PPD/HP/hp-photosmart_7345-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-photosmart_7350-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-photosmart_7400_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-photosmart_7510_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-photosmart_6520_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-photosmart_7520_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-photosmart_7550-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-photosmart_7600_series-hpijs.ppd.gz
share/foomatic/db/source/PPD/HP/hp-photosmart_7700_series-hpijs.ppd.gz

10
print/hplip/pkg/PLIST-main
View File

@ -1,11 +1,13 @@
@comment $OpenBSD: PLIST-main,v 1.14 2012/06/26 06:17:12 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.15 2012/09/11 10:52:16 ajacoutot Exp $
@conflict hplip-docs-*
@conflict hplip-gui-<3.11.3p0
@extraunexec rm -rf /var/log/hp/*
@extraunexec rm -rf /var/log/hp/tmp/*
@extraunexec rm -f /var/log/hp/*
bin/hp-check
bin/hp-clean
bin/hp-config_usb_printer
bin/hp-diagnose_queues
bin/hp-logcapture
bin/hp-makeuri
@bin bin/hp-mkuri
bin/hp-pkservice
@ -251,6 +253,8 @@ share/hplip/levels.py
share/hplip/levels.pyc
share/hplip/linefeedcal.py
share/hplip/linefeedcal.pyc
share/hplip/logcapture.py
share/hplip/logcapture.pyc
share/hplip/makecopies.py
share/hplip/makecopies.pyc
share/hplip/makeuri.py
@ -316,3 +320,5 @@ share/polkit-1/actions/com.hp.hplip.policy
@mode 0774
@group _cups
@sample /var/log/hp/
@mode 1774
@sample /var/log/hp/tmp/