CVS commit: pkgsrc/print/hplip

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print/hplip
From: "Pierre Pronchery" <khorben%netbsd.org@localhost>
Date: Sat, 4 Jan 2020 04:24:12 +0000

Module Name:    pkgsrc
Committed By:   khorben
Date:           Sat Jan  4 04:24:12 UTC 2020

Modified Files:
        pkgsrc/print/hplip: Makefile PLIST.base distinfo
        pkgsrc/print/hplip/patches: patch-ae patch-configure.in
            patch-diagnose_queues.py patch-installer_dcheck.py
            patch-prnt_hpijs_foomatic-rip-hplip patch-scan.py
Added Files:
        pkgsrc/print/hplip/patches: patch-prnt_hpcups_HPCupsFilter.cpp

Log Message:
hplip: Update to 3.19.12

Tested on NetBSD/amd64 (9.0_BETA) with a HP LaserJet 200 color MFP M276.

A manual copy/paste of the intermediate release notes follows (see
https://developers.hp.com/hp-linux-imaging-and-printing/release_notes
for the original content).

HPLIP 3.19.12:

 * Added support for the following new Printers:
   - HP Color LaserJet Pro M256dn
   - HP Color LaserJet Pro M255dn
   - HP Color LaserJet Pro M256nw
   - HP Color LaserJet Pro M255nw
   - HP Color LaserJet Pro M256dw
   - HP Color LaserJet Pro M255dw
   - HP Color LaserJet Pro M155a
   - HP Color LaserJet Pro M156a
   - HP Color LaserJet Pro M155nw
   - HP Color LaserJet Pro M156nw
   - HP Color LaserJet Pro MFP M282nw
   - HP Color LaserJet Pro MFP M284nw
   - HP Color LaserJet Pro MFP M283fdn
   - HP Color LaserJet Pro MFP M285fdn
   - HP Color LaserJet Pro MFP M283fdw
   - HP Color LaserJet Pro MFP M285fdw
   - HP Color LaserJet Pro MFP M283cdw
   - HP Color LaserJet Pro MFP M285cdw
   - HP Color LaserJet Pro MFP M182n
   - HP Color LaserJet Pro MFP M184n
   - HP Color LaserJet Pro MFP M182nw
   - HP Color LaserJet Pro MFP M184nw
   - HP Color LaserJet Pro MFP M183fw
   - HP Color LaserJet Pro MFP M185fw
 * Added support for following new Distro's:
   - Debian 10.1
   - Debian 10.2
   - Manjaro 18.1.2
 * Features:
   - Rendering print jobs with cupsfilter command

HPLIP 3.19.11:

 * Added support for the following new Printers:
   - HP Color LaserJet MFP M776dn
   - HP Color LaserJet Flow MFP M776z
   - HP Color LaserJet Flow MFP M776zs
   - HP Color LaserJet M856dn
   - HP Color LaserJet M856x
   - HP Color LaserJet E85055dn
 * Added support for following new Distro's:
   - Manjaro 18.1.0(64-bit)
   - Ubuntu 19.10(64-bit)
   - Fedora 31(64-bit)

HPLIP 3.19.8:

 * Added support for the following new Printers:
   - HP DesignJet T1530 Postscript
   - HP DesignJet T2530 Postscript
   - HP DesignJet T930 Postscript
   - HP DesignJet T1600 Postscript Printer
   - HP DesignJet T1600dr Postscript Printer
   - HP DesignJet T2600 Postscript MFP
   - HP LaserJet Pro MFP M329dn
   - HP LaserJet Pro MFP M329dw
   - HP LaserJet Pro M305d
   - HP LaserJet Pro M304a
   - HP LaserJet Pro M305dn
   - HP LaserJet Pro M305dw
 * Added support for following new Distro's:
   - OpenSuse 15.1
   - Debian 9.9
   - Debian 10
   - Manjaro 18.0.4
   - Linux Mint 19.2
   - RHEL 8.0

HPLIP 3.19.6:

 * Added support for the following new Printers:
   - HP Smart Tank 500 series
   - HP Smart Tank 530 series
   - HP Smart Tank Plus 570 series
   - HP Smart Tank Plus 650
   - HP Smart Tank 610
   - HP Smart Tank Plus 550
   - HP Smart Tank 510
   - HP Neverstop Laser MFP 1200a
   - HP Neverstop Laser MFP 1200w
   - HP Laser NS MFP 1005
   - HP Laser NS MFP 1005w
   - HP Neverstop Laser 1000a
   - HP Neverstop Laser 1000w
   - HP Laser NS 1020
   - HP Laser NS 1020w
   - HP DesignJet T2600dr Postscript MFP
   - HP DesignJet XL 3600 PS MFP
   - HP Color LaserJet Pro M453cdn
   - HP Color LaserJet Pro M454dn
   - HP Color LaserJet Pro M454cdn
   - HP Color LaserJet Pro M453cdw
   - HP Color LaserJet Pro M454nw
   - HP Color LaserJet Pro M454dw
   - HP Color LaserJet Pro M454cdw
   - HP Color LaserJet Pro MFP M479dw
   - HP Color LaserJet Pro MFP M478fcdn
   - HP Color LaserJet Pro MFP M479fdn
   - HP Color LaserJet Pro MFP M479fcdn
   - HP Color LaserJet Pro MFP M478fcdw
   - HP Color LaserJet Pro MFP M479fdw
   - HP Color LaserJet Pro MFP M479fnw
   - HP Color LaserJet Pro MFP M479fcdw
   - HP LaserJet Pro MFP M428dw
   - HP LaserJet Pro MFP M429dw
   - HP LaserJet Pro MFP M428fdn
   - HP LaserJet Pro MFP M428c1
   - HP LaserJet Pro MFP M428c3
   - HP LaserJet Pro MFP M428m
   - HP LaserJet Pro MFP M429fdn
   - HP LaserJet Pro MFP M428fdw
   - HP LaserJet Pro MFP M428c2
   - HP LaserJet Pro MFP M428c4
   - HP LaserJet Pro MFP M429fdw
   - HP LaserJet Pro M404d
   - HP LaserJet Pro M405d
   - HP LaserJet Pro M404n
   - HP LaserJet Pro M405n
   - HP LaserJet Pro M404dn
   - HP LaserJet Pro M404c1
   - HP LaserJet Pro M404c3
   - HP LaserJet Pro M404m
   - HP LaserJet Pro M405dn
   - HP LaserJet Pro M404dw
   - HP LaserJet Pro M404c2
   - HP LaserJet Pro M404c4
   - HP LaserJet Pro M405dw

HPLIP 3.19.5:

 * Added support for the following new Printers:
   - HP LaserJet Enterprise M507n
   - HP LaserJet Enterprise M507dn
   - HP LaserJet Enterprise M507x
   - HP LaserJet Enterprise M507dng
   - HP LaserJet Managed E50145dn
   - HP LaserJet Managed E50145x
   - HP LaserJet Enterprise MFP M528dn
   - HP LaserJet Enterprise MFP M528f
   - HP LaserJet Enterprise Flow MFP M528c
   - HP LaserJet Enterprise Flow MFP M528z
   - HP LaserJet Managed MFP E52645dn
   - HP LaserJet Managed Flow MFP E52645c
   - HP Color LaserJet Managed E75245dn
   - HP Color LaserJet Enterprise M751n
   - HP Color LaserJet Enterprise M751dn
   - HP PageWide XL 3900PS MFP
   - HP OfficeJet Pro 8030 All-in-One Printer series
   - HP OfficeJet Pro 8020 All-in-One Printer series
   - HP OfficeJet 8020 All-in-One Printer Series
   - HP OfficeJet 8010 All-in-One Printer series
 * Added support for following new Distro's:
   - Debian 9.8(64-bit)
   - Ubuntu 19.04(64-bit)
   - Fedora 30(64-bit)

HPLIP 3.19.3:

 * Added support for the following new Printers:
   - HP OfficeJet Pro All-in-One 9010
   - HP OfficeJet Pro All-in-One 9020
   - HP OfficeJet All-in-One 9010
   - HP PageWide XL 4100 Printer
   - HP PageWide XL 4100 MFP
   - HP PageWide XL 4600 Printer
   - HP PageWide XL 4600PS MFP
   - HP Color LaserJet Managed MFP E77422a
   - HP Color LaserJet Managed MFP E77422dv
   - HP Color LaserJet Managed MFP E77422dn
   - HP Color LaserJet Managed MFP E77428dn
   - HP LaserJet MFP E72425a
   - HP LaserJet MFP E72425dv
   - HP LaserJet MFP E72425dn
   - HP LaserJet MFP E72430dn
   - HP LaserJet Managed MFP E62655dn
   - HP LaserJet Managed MFP E62665hs
   - HP LaserJet Managed Flow MFP E62665h
   - HP LaserJet Managed Flow MFP E62675z
   - HP LaserJet Managed Flow MFP E62665z
   - HP LaserJet Managed E60155dn
   - HP LaserJet Managed E60165dn
   - HP LaserJet Managed E60175dn
   - HP Color LaserJet Managed E65150dn
   - HP Color LaserJet Managed E65160dn
   - HP Color LaserJet Managed MFP E67650dh
   - HP Color LaserJet Managed Flow MFP E67660z
 * Added support for following new Distro's:
   - Debian 9.7(64-bit)
   - RHEL-7.6(64-bit)
   - LinuxMint 19.1(64-bit)

HPLIP 3.19.1:

 * Added support for the following new Printers:
   - HP LaserJet Managed MFP E82540du
   - HP LaserJet Managed MFP E82550du
   - HP LaserJet Managed MFP E82560du
   - HP Color LaserJet Managed MFP E87640 du
   - HP Color LaserJet Managed MFP E87650du
   - HP Color LaserJet Managed MFP E87660du
 * Added support for the following new ScanJet Device:
   - HP Scanjet Pro 2500 f1
 * Added support for following new Distro's:
   - Fedora 29(64-bit)
   - Open Suse 15(64-bit)
   - Manjaro 18.0(64-bit)
   - RHEL 7.2(64-bit)

HPLIP 3.18.12:

 * Added support for the following new Printers:
   - HP Tango
   - HP Tango X
 * Added support for the following new ScanJet Device:
   - HP Scanjet Pro 2000 S1
 * Added support for following new Distro's:
   - Debian 9.6(64-bit)
   - Ubuntu 18.10(64-bit)

HPLIP 3.18.10:

 * Added support for the following new Printers:
   - HP DesignJet T1708 PostScript
   - HP DesignJet T1708dr PostScript

HPLIP 3.18.9:

 * Added support for the following new Printers:
   - HP PageWide 755dn
   - HP PageWide MFP 774dns
   - HP PageWide MFP 774dn
   - HP PageWide MFP 779dns
   - HP PageWide MFP 779dn
   - HP LaserJet Pro MFP M148dw
   - HP LaserJet Pro MFP M149dw
   - HP LaserJet Pro MFP M148fdw
   - HP LaserJet Pro MFP M149fdw
   - HP LaserJet Pro M118dw
   - HP LaserJet Pro M119dw
   - HP Scanjet Enterprise 7500 Flatbed Scanner
 * Added support for the following new Distros:
   - Linux Mint 19
   - Debian 9.5

HPLIP 3.18.7:

 * Added support for the following new Printers:
   - HP Smart Tank 350
   - HP Smart Tank Wireless 450
   - HP Ink Tank 310
   - HP Ink Tank Wireless 410
   - HP Ink Tank 115
   - HP DesignJet Z6 24in
   - HP DesignJet Z6 44in
   - HP DesignJet Z6dr 44in
   - HP DesignJet Z9 24in
   - HP DesignJet Z9 44in
   - HP DesignJet Z9dr 44in
 * Added support for the following new Distros:
   - Fedora 28 (64 bit)
 * Issues fixed:
   - CR 59273 - Supplies and status information are not displayed in the
     hp-toolbox for Ruby
   - CR 58929 - HPLIP Google Reported Issues related to models.dat file
     on PPD mapping
   - CD 58930 - HPLIP Google Reported Syntactical Issues related to
     models.dat file

HPLIP 3.18.6:

 * Added support for the following new Printers:
   - HP DesignJet Z6810ps 60in
   - HP DesignJet Z6610ps 60in
   - HP DesignJet Z6810ps 42in


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/print/hplip/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/print/hplip/PLIST.base
cvs rdiff -u -r1.35 -r1.36 pkgsrc/print/hplip/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/hplip/patches/patch-ae
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/hplip/patches/patch-configure.in \
    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-diagnose_queues.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/hplip/patches/patch-prnt_hpcups_HPCupsFilter.cpp
cvs rdiff -u -r1.1 -r1.2 \
    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.84 pkgsrc/print/hplip/Makefile:1.85
--- pkgsrc/print/hplip/Makefile:1.84    Mon Nov  4 19:57:59 2019
+++ pkgsrc/print/hplip/Makefile Sat Jan  4 04:24:12 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2019/11/04 19:57:59 rillig Exp $
+# $NetBSD: Makefile,v 1.85 2020/01/04 04:24:12 khorben Exp $
 
-DISTNAME=      hplip-3.18.5
-PKGREVISION=   11
+DISTNAME=      hplip-3.19.12
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=hplip/}
 

Index: pkgsrc/print/hplip/PLIST.base
diff -u pkgsrc/print/hplip/PLIST.base:1.32 pkgsrc/print/hplip/PLIST.base:1.33
--- pkgsrc/print/hplip/PLIST.base:1.32  Sun Jun 10 17:53:20 2018
+++ pkgsrc/print/hplip/PLIST.base       Sat Jan  4 04:24:12 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.32 2018/06/10 17:53:20 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.33 2020/01/04 04:24:12 khorben Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -30,6 +30,7 @@ bin/hp-setup
 bin/hp-systray
 bin/hp-testpage
 bin/hp-timedate
+bin/hp-uiscan
 bin/hp-uninstall
 bin/hp-unload
 bin/hp-upgrade
@@ -108,6 +109,8 @@ share/hplip/base/exif.py
 share/hplip/base/exif.pyc
 share/hplip/base/g.py
 share/hplip/base/g.pyc
+share/hplip/base/imageprocessing.py
+share/hplip/base/imageprocessing.pyc
 share/hplip/base/imagesize.py
 share/hplip/base/imagesize.pyc
 share/hplip/base/ldif.py
@@ -293,11 +296,10 @@ share/hplip/ppd/HP/hp-business_inkjet_30
 share/hplip/ppd/HP/hp-business_inkjet_3000-ps.ppd.gz
 share/hplip/ppd/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
 share/hplip/ppd/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
-share/hplip/ppd/HP/hp-color_inkjet_cp1700.ppd.gz
+share/hplip/ppd/HP/hp-color_designjet_xl_3600-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_inkjet_printer_cp1700.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_1600.ppd.gz
-share/hplip/ppd/HP/hp-color_laserjet_2500-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_2500-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_2500_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_2500_series.ppd.gz
@@ -332,7 +334,6 @@ share/hplip/ppd/HP/hp-color_laserjet_455
 share/hplip/ppd/HP/hp-color_laserjet_4600-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_4600-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_4600_series-ps.ppd.gz
-share/hplip/ppd/HP/hp-color_laserjet_4600_series.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_4610-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_4610-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_4650-pcl3.ppd.gz
@@ -354,8 +355,8 @@ share/hplip/ppd/HP/hp-color_laserjet_855
 share/hplip/ppd/HP/hp-color_laserjet_8550-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_9500-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_9500-ps.ppd.gz
-share/hplip/ppd/HP/hp-color_laserjet_9500_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_E65150_E65160-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_cm1015-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_cm1017-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz
@@ -420,10 +421,18 @@ share/hplip/ppd/HP/hp-color_laserjet_cp6
 share/hplip/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_e65050_e65060-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_e67550_e67560-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_e67650_e67660-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_e75245-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_e85055-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_flowmfp_m776-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m153-m154-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m155-m156-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m182-m185-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m253-m254-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m255-m256-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m282-m285-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m452-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m452d-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m552-ps.ppd.gz
@@ -431,14 +440,22 @@ share/hplip/ppd/HP/hp-color_laserjet_m55
 share/hplip/ppd/HP/hp-color_laserjet_m651-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m652_m653-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m751-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m856-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_mfp_e77422-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_mfp_e77428-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_mfp_m776-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_pro_m453-4-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_pro_m479-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m176n.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
@@ -453,6 +470,12 @@ share/hplip/ppd/HP/hp-designjet_4500mfp.
 share/hplip/ppd/HP/hp-designjet_4500ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_4520mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_4520ps-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_Z6_24in-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_Z6_44in-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_Z6dr_44in-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_Z9_24in-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_Z9_44in-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_Z9dr_44in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_d5800-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t1100ps_24in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t1100ps_44in-ps.ppd.gz
@@ -461,10 +484,18 @@ share/hplip/ppd/HP/hp-designjet_t1120ps_
 share/hplip/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t1300_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t1500-postscript.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t1530-postscript.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t1600_printer-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t1600dr-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t1700_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t1700dr_postscript-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t1708_postscript-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t1708dr_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t2300_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t2500-postscript.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t2530-postscript.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t2600-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t2600dr-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t3500-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t7100ps-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t7100ps_monochrome-ps.ppd.gz
@@ -475,6 +506,7 @@ share/hplip/ppd/HP/hp-designjet_t790ps_2
 share/hplip/ppd/HP/hp-designjet_t790ps_44in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t795ps_44in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t920-postscript.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t930-postscript.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z2600_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z5200_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z5400-postscript.ppd.gz
@@ -484,7 +516,10 @@ share/hplip/ppd/HP/hp-designjet_z6100ps_
 share/hplip/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6200_60in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6600-postscript.ppd.gz
+share/hplip/ppd/HP/hp-designjet_z6610ps_60in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6800_photo-postscript.ppd.gz
+share/hplip/ppd/HP/hp-designjet_z6810ps_42in-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_z6810ps_60in-ps.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1000_j110_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1010_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1050_j410_series.ppd.gz
@@ -518,6 +553,7 @@ share/hplip/ppd/HP/hp-deskjet_3325.ppd.g
 share/hplip/ppd/HP/hp-deskjet_3420.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3425.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3450.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_350.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3500.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3510_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3520_series.ppd.gz
@@ -542,6 +578,7 @@ share/hplip/ppd/HP/hp-deskjet_3920.ppd.g
 share/hplip/ppd/HP/hp-deskjet_3940.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_400.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_400l.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_450.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_4510_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_4530_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_460.ppd.gz
@@ -600,7 +637,6 @@ share/hplip/ppd/HP/hp-deskjet_672c.ppd.g
 share/hplip/ppd/HP/hp-deskjet_680.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_6800.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_682.ppd.gz
-share/hplip/ppd/HP/hp-deskjet_690.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_690c.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_692.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_693.ppd.gz
@@ -670,8 +706,6 @@ share/hplip/ppd/HP/hp-deskjet_f2400_seri
 share/hplip/ppd/HP/hp-deskjet_f300_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_f4100_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_f4200_series.ppd.gz
-share/hplip/ppd/HP/hp-deskjet_f4210_series.ppd.gz
-share/hplip/ppd/HP/hp-deskjet_f4213_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_f4400_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_f4500_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_f735.ppd.gz
@@ -679,8 +713,6 @@ share/hplip/ppd/HP/hp-deskjet_ink_adv_20
 share/hplip/ppd/HP/hp-deskjet_ink_adv_2060_k110.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_ink_advant_k109a-z.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_ink_advant_k209a-z.ppd.gz
-share/hplip/ppd/HP/hp-dj350.ppd.gz
-share/hplip/ppd/HP/hp-dj450.ppd.gz
 share/hplip/ppd/HP/hp-envy_100_d410_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_110_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_120_series.ppd.gz
@@ -697,6 +729,11 @@ share/hplip/ppd/HP/hp-envy_8000_series.p
 share/hplip/ppd/HP/hp-envy_photo_6200_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_photo_7100_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_photo_7800_series.ppd.gz
+share/hplip/ppd/HP/hp-ink_tank_110_series.ppd.gz
+share/hplip/ppd/HP/hp-ink_tank_310_series.ppd.gz
+share/hplip/ppd/HP/hp-ink_tank_wireless_410_series.ppd.gz
+share/hplip/ppd/HP/hp-laser_ns_1020.ppd.gz
+share/hplip/ppd/HP/hp-laser_ns_mfp_1005.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1000.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1005_series.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
@@ -712,7 +749,6 @@ share/hplip/ppd/HP/hp-laserjet_1100.ppd.
 share/hplip/ppd/HP/hp-laserjet_1100a.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1100xi.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1150.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_1160.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1160_series.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1200-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1200-ps.ppd.gz
@@ -742,14 +778,11 @@ share/hplip/ppd/HP/hp-laserjet_200_color
 share/hplip/ppd/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2100-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_2100.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2100_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2100_series-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_2200-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2200-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2200_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2200_series.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_2300-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2300-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2300_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2300_series.ppd.gz
@@ -773,9 +806,7 @@ share/hplip/ppd/HP/hp-laserjet_3055.ppd.
 share/hplip/ppd/HP/hp-laserjet_3100.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_3150.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_3200.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_3200m-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_3200m-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_3200se.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_3300_3310_3320-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_3330.ppd.gz
@@ -821,7 +852,6 @@ share/hplip/ppd/HP/hp-laserjet_4si-ps.pp
 share/hplip/ppd/HP/hp-laserjet_4v-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4v-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5000-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_5000.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5000_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5000_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_500_color_m551-ps.ppd.gz
@@ -854,7 +884,6 @@ share/hplip/ppd/HP/hp-laserjet_6p.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_700_m712-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_8000-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_8000.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_8000_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_8000_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_8100_mfp-ps.ppd.gz
@@ -893,11 +922,16 @@ share/hplip/ppd/HP/hp-laserjet_color_flo
 share/hplip/ppd/HP/hp-laserjet_cp1025.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp1025nw.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp1520_series-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_cp_1025.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_cp_1025nw.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_e50145-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_e60055-e60075-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_e60155-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_e60165-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_e60175-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_e62555-e62575-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_e62655-e62675-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_flow_mfp_e52645-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_flow_mfp_m528-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1005.ppd.gz
@@ -931,6 +965,7 @@ share/hplip/ppd/HP/hp-laserjet_m5035_mfp
 share/hplip/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m5039_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m506-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_m507-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m607_m608_m609-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m806-ps.ppd.gz
@@ -940,6 +975,8 @@ share/hplip/ppd/HP/hp-laserjet_m9050_mfp
 share/hplip/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_mfp_e72425-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_mfp_e72430-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz
@@ -994,10 +1031,17 @@ share/hplip/ppd/HP/hp-laserjet_p4515n.pp
 share/hplip/ppd/HP/hp-laserjet_p4515tn.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515x.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515xm.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m118-m119-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m148-m149-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m148f-m149f-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m203_m206-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m304-m305-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m402_m403-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m402_m403d-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m404-m405-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m428-m429-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m428f-m429f-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m501dn-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m501n-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz
@@ -1025,6 +1069,7 @@ share/hplip/ppd/HP/hp-laserjet_pro_mfp_m
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m26nw.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m27c.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m27cnw.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m329-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1136_mfp.ppd.gz
@@ -1042,7 +1087,6 @@ share/hplip/ppd/HP/hp-laserjet_professio
 share/hplip/ppd/HP/hp-laserjet_professional_m1219nfg_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1219nfs_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1102.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_professional_p1102w.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1106.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1106w.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1107.ppd.gz
@@ -1066,6 +1110,8 @@ share/hplip/ppd/HP/hp-mopier_240-pcl3.pp
 share/hplip/ppd/HP/hp-mopier_240-ps.ppd.gz
 share/hplip/ppd/HP/hp-mopier_320-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-mopier_320-ps.ppd.gz
+share/hplip/ppd/HP/hp-neverstop_laser_100x.ppd.gz
+share/hplip/ppd/HP/hp-neverstop_laser_mfp_120x.ppd.gz
 share/hplip/ppd/HP/hp-officejet.ppd.gz
 share/hplip/ppd/HP/hp-officejet_100_mobile_l411.ppd.gz
 share/hplip/ppd/HP/hp-officejet_150_mobile_l511.ppd.gz
@@ -1090,9 +1136,6 @@ share/hplip/ppd/HP/hp-officejet_4620_ser
 share/hplip/ppd/HP/hp-officejet_4630_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4650_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5100_series.ppd.gz
-share/hplip/ppd/HP/hp-officejet_5105.ppd.gz
-share/hplip/ppd/HP/hp-officejet_5110.ppd.gz
-share/hplip/ppd/HP/hp-officejet_5110v.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5200_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5500_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5600_series.ppd.gz
@@ -1113,7 +1156,6 @@ share/hplip/ppd/HP/hp-officejet_6700.ppd
 share/hplip/ppd/HP/hp-officejet_6800.ppd.gz
 share/hplip/ppd/HP/hp-officejet_6950.ppd.gz
 share/hplip/ppd/HP/hp-officejet_6960.ppd.gz
-share/hplip/ppd/HP/hp-officejet_7000_e809a.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7000_e809a_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7100_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7110_series.ppd.gz
@@ -1123,8 +1165,11 @@ share/hplip/ppd/HP/hp-officejet_7400_ser
 share/hplip/ppd/HP/hp-officejet_7500_e910.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7510_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7610_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_8010_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_8020_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_8040_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_8700.ppd.gz
+share/hplip/ppd/HP/hp-officejet_9010_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_9100_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-officejet_color_mfp_x585.ppd.gz
 share/hplip/ppd/HP/hp-officejet_color_x555-ps.ppd.gz
@@ -1167,6 +1212,8 @@ share/hplip/ppd/HP/hp-officejet_pro_7730
 share/hplip/ppd/HP/hp-officejet_pro_7740_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_8020_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_8030_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8100.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8210-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8500_a909a.ppd.gz
@@ -1184,6 +1231,8 @@ share/hplip/ppd/HP/hp-officejet_pro_8720
 share/hplip/ppd/HP/hp-officejet_pro_8730-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8732-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8740-ps.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_9010_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_9020_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_k5300.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_k5400.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_k550.ppd.gz
@@ -1226,6 +1275,7 @@ share/hplip/ppd/HP/hp-pagewide_352_print
 share/hplip/ppd/HP/hp-pagewide_377_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_P77440_P77940-60-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_color_556-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_color_755-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_color_765-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_color_P75250-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_color_e55650-ps.ppd.gz
@@ -1233,6 +1283,7 @@ share/hplip/ppd/HP/hp-pagewide_color_e75
 share/hplip/ppd/HP/hp-pagewide_color_e77650-e77660-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_color_flow_mfp_586-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_color_mfp_586-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_color_mfp_774-779-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_color_mfp_780-785-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_color_mfp_e58650-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_mfp_p57750-ps.ppd.gz
@@ -1245,10 +1296,15 @@ share/hplip/ppd/HP/hp-pagewide_pro_552_p
 share/hplip/ppd/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_pro_750-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_pro_mfp_772-777-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_xl_4000ps-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_4100ps-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_xl_4500ps-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_4600ps-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_xl_5000ps-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz
 share/hplip/ppd/HP/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz
@@ -1285,10 +1341,8 @@ share/hplip/ppd/HP/hp-photosmart_5510d_s
 share/hplip/ppd/HP/hp-photosmart_5520_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_6510_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_6520_series.ppd.gz
-share/hplip/ppd/HP/hp-photosmart_7150.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7200_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7345.ppd.gz
-share/hplip/ppd/HP/hp-photosmart_7350.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7400_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7510_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7520_series.ppd.gz
@@ -1316,7 +1370,6 @@ share/hplip/ppd/HP/hp-photosmart_a640_se
 share/hplip/ppd/HP/hp-photosmart_a710_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_a820_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_b010_series.ppd.gz
-share/hplip/ppd/HP/hp-photosmart_b109a-m.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_b109a_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_b110_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_b8500_series.ppd.gz
@@ -1376,7 +1429,6 @@ share/hplip/ppd/HP/hp-psc_1310_series.pp
 share/hplip/ppd/HP/hp-psc_1358_series.ppd.gz
 share/hplip/ppd/HP/hp-psc_1400_series.ppd.gz
 share/hplip/ppd/HP/hp-psc_1500_series.ppd.gz
-share/hplip/ppd/HP/hp-psc_1510_series.ppd.gz
 share/hplip/ppd/HP/hp-psc_1600_series.ppd.gz
 share/hplip/ppd/HP/hp-psc_2100_series.ppd.gz
 share/hplip/ppd/HP/hp-psc_2150_series.ppd.gz
@@ -1399,6 +1451,16 @@ share/hplip/ppd/HP/hp-psc_920.ppd.gz
 share/hplip/ppd/HP/hp-psc_950.ppd.gz
 share/hplip/ppd/HP/hp-psc_950vr.ppd.gz
 share/hplip/ppd/HP/hp-psc_950xi.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_350_series.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_500_series.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_510_series.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_530_series.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_610_series.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_plus_550_series.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_plus_570_series.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_plus_650_series.ppd.gz
+share/hplip/ppd/HP/hp-smart_tank_wireless_450_series.ppd.gz
+share/hplip/ppd/HP/hp-tango.ppd.gz
 share/hplip/pqdiag.py
 share/hplip/pqdiag.pyc
 share/hplip/print.py
@@ -1433,6 +1495,8 @@ share/hplip/timedate.py
 share/hplip/timedate.pyc
 share/hplip/toolbox.py
 share/hplip/toolbox.pyc
+share/hplip/uiscan.py
+share/hplip/uiscan.pyc
 share/hplip/uninstall.py
 share/hplip/uninstall.pyc
 share/hplip/unload.py

Index: pkgsrc/print/hplip/distinfo
diff -u pkgsrc/print/hplip/distinfo:1.35 pkgsrc/print/hplip/distinfo:1.36
--- pkgsrc/print/hplip/distinfo:1.35    Sun Jun 10 17:53:20 2018
+++ pkgsrc/print/hplip/distinfo Sat Jan  4 04:24:12 2020
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.35 2018/06/10 17:53:20 schnoebe Exp $
+$NetBSD: distinfo,v 1.36 2020/01/04 04:24:12 khorben Exp $
 
-SHA1 (hplip-3.18.5.tar.gz) = 19b527b0016ce65e69db872c2b519c93997cc0de
-RMD160 (hplip-3.18.5.tar.gz) = e89d0460da518e5ab46fe594805ade6a438165ae
-SHA512 (hplip-3.18.5.tar.gz) = 2c99bb446af604a2f011f9dd5ddf4bf5019b7cd36a0ecb1cbe6dce0c0358b8472a695ad85d09e52c3e63de8a69e2a3e7081c61ec36f44aae2770b5fef0f67516
-Size (hplip-3.18.5.tar.gz) = 22437406 bytes
+SHA1 (hplip-3.19.12.tar.gz) = 3d3cffb0808900ab4134df2acc246f22fb39aad7
+RMD160 (hplip-3.19.12.tar.gz) = c9e24b31dd51b2f1759e4f70c1c8617b49ace7c7
+SHA512 (hplip-3.19.12.tar.gz) = 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
+Size (hplip-3.19.12.tar.gz) = 25676247 bytes
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
-SHA1 (patch-ae) = cb479c04ede40d4f15c0c69e10c82781d5e44f19
-SHA1 (patch-configure.in) = a155b9590a7ab93ca6922a3f55b09d8d531cb9e6
-SHA1 (patch-diagnose_queues.py) = 0ef5c12a3f3de217064d5b0c40611ba3f1e72c9e
-SHA1 (patch-installer_dcheck.py) = e381086ccdfbdcd84d3ffe29995d5d3643709be6
+SHA1 (patch-ae) = a15426c555b47806b47eb40e22c4ca6862d6ba18
+SHA1 (patch-configure.in) = d6e20d8d4f0b1042a32149eeca45d2ddc319f65f
+SHA1 (patch-diagnose__queues.py) = aa3e544dc131accf4f799d26924b50f511c8c69f
+SHA1 (patch-diagnose_queues.py) = 385c694642248818b28375711df244f12e63fdb4
+SHA1 (patch-installer_dcheck.py) = 9e8e6b552f935d2ed5a61060cc0a4541095e2751
 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) = a94c7bbdc90dd68d001ce0325b7aabcd470233eb
+SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = c37ed4beda5a84fac65484d11af55bf80b3f9f7c
 SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
 SHA1 (patch-protocol_discovery_mdns.c) = e2ca43f6ab13fe2124a38bcc0eff292a57b34b06
-SHA1 (patch-scan.py) = 4d942ee0580d5f1818e43164c07edd018529395d
+SHA1 (patch-scan.py) = b58ffdd4811b8b20973a07f3b9f60174a96beed4

Index: pkgsrc/print/hplip/patches/patch-ae
diff -u pkgsrc/print/hplip/patches/patch-ae:1.10 pkgsrc/print/hplip/patches/patch-ae:1.11
--- pkgsrc/print/hplip/patches/patch-ae:1.10    Thu Dec 14 20:24:42 2017
+++ pkgsrc/print/hplip/patches/patch-ae Sat Jan  4 04:24:12 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.10 2017/12/14 20:24:42 schnoebe Exp $
+$NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
 
 # Conform to autoconf's standard variable usage, making it easier
 # to install on pkgsrc platforms
@@ -8,7 +8,7 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
 # still needs to handle the buildlink path for libusb-1.0 :(
 # schnoebe -- Fri May 24 14:55:57 CDT 2013
 
---- Makefile.am.orig   2017-11-23 12:10:34.000000000 +0000
+--- Makefile.am.orig   2019-12-10 05:00:36.000000000 +0000
 +++ Makefile.am
 @@ -8,7 +8,7 @@ CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
  CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
  docdir = $(hpdocdir)
  htmldir = $(hphtmldir)
  doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG
-@@ -106,6 +106,7 @@ libhpmud_la_LDFLAGS += -lusb
+@@ -110,6 +110,7 @@ libhpmud_la_LDFLAGS += -lusb
  else
  libhpmud_la_SOURCES += io/hpmud/musb.c 
  libhpmud_la_CFLAGS  += -I/usr/include/libusb-1.0
@@ -27,7 +27,7 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
  libhpmud_la_LDFLAGS += -lusb-1.0
  endif
  
-@@ -127,12 +128,12 @@ libhpip_la_SOURCES = ip/xconvolve.c ip/x
+@@ -131,12 +132,12 @@ libhpip_la_SOURCES = ip/xconvolve.c ip/x
        ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
  
  #hpmud rules data dir
@@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
  if UDEV_SYSFS_RULES
  dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
  else
-@@ -140,11 +141,11 @@ dist_rules_DATA = data/rules/56-hpmud.ru
+@@ -144,11 +145,11 @@ dist_rules_DATA = data/rules/56-hpmud.ru
  endif
  endif #HPLIP_CLASS_DRIVER
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
  hplip_conf_DATA = hplip.conf
  
  if !HPLIP_CLASS_DRIVER
-@@ -154,7 +155,7 @@ pstotiff_SCRIPTS = fax/filters/pstotiff
+@@ -158,7 +159,7 @@ pstotiff_SCRIPTS = fax/filters/pstotiff
  endif #HPLIP_CLASS_DRIVER
  
  # hplip.state
@@ -65,7 +65,7 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
  dist_hplip_state_DATA =
  
  if FULL_BUILD
-@@ -229,11 +230,11 @@ endif # FAX_BUILD
+@@ -233,11 +234,11 @@ endif # FAX_BUILD
  if !HPLIP_CLASS_DRIVER
  # AppArmor Changes
  if APPARMOR_BUILD
@@ -79,7 +79,7 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
  apparmor_abstraction_DATA = apparmor/abstractions/hplip
  dist_apparmor_abstraction_DATA = apparmor/abstractions/hplip
  
-@@ -360,6 +361,7 @@ endif
+@@ -363,6 +364,7 @@ endif
  
  if !LIBUSB01_BUILD
  hpmudext_la_CFLAGS +=-I/usr/include/libusb-1.0 
@@ -87,7 +87,7 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
  endif
  endif #!HPLIP_CLASS_DRIVER
  # ui (qt3)
-@@ -445,9 +447,9 @@ endif
+@@ -448,9 +450,9 @@ endif
  endif #HPLIP_CLASS_DRIVER
  # PolicyKit
  if POLICYKIT_INSTALL
@@ -99,7 +99,16 @@ $NetBSD: patch-ae,v 1.10 2017/12/14 20:2
  dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
  policykit_policydir = $(policykit_dir)
  dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
-@@ -680,13 +682,13 @@ if HPLIP_BUILD
+@@ -594,7 +596,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
+       prnt/hpcups/ImageProcessor.h
+ 
+ hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
+-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
++hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
+ #else
+ #hpcupsdir = $(cupsfilterdir)
+ #hpcups_PROGRAMS = hpcups
+@@ -697,13 +699,13 @@ if HPLIP_BUILD
  if !HPLIP_CLASS_DRIVER
  #        If scanner build, add hpaio entry to sane dll.conf.
        if [ "$(scan_build)" = "yes" ]; then \

Index: pkgsrc/print/hplip/patches/patch-configure.in
diff -u pkgsrc/print/hplip/patches/patch-configure.in:1.3 pkgsrc/print/hplip/patches/patch-configure.in:1.4
--- pkgsrc/print/hplip/patches/patch-configure.in:1.3   Tue Apr 26 22:51:30 2016
+++ pkgsrc/print/hplip/patches/patch-configure.in       Sat Jan  4 04:24:12 2020
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure.in,v 1.3 2016/04/26 22:51:30 schnoebe Exp $
+$NetBSD: patch-configure.in,v 1.4 2020/01/04 04:24:12 khorben Exp $
 
 convert configure to use more configure paths instead of hard coded
 paths.
 
---- configure.in.orig  2016-03-16 10:38:34.000000000 +0000
+--- configure.in.orig  2019-12-10 05:01:10.000000000 +0000
 +++ configure.in
 @@ -34,14 +34,15 @@ AC_DISABLE_STATIC
  # Checks for programs.
@@ -22,7 +22,7 @@ paths.
  
  # Checks for required header files.
  AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([cannot find pthread-devel support], 7)])
-@@ -267,7 +268,7 @@ AC_ARG_ENABLE(apparmor_build,
+@@ -301,7 +302,7 @@ AC_ARG_ENABLE(apparmor_build,
    [  --enable-apparmor_build    enable apparmor build (default=no)],
    apparmor_build=$enableval, apparmor_build=no)
  if test "$apparmor_build" = "yes"; then
@@ -31,7 +31,7 @@ paths.
        AC_MSG_RESULT(yes)
     else
        AC_MSG_ERROR([cannot find apparmor support])
-@@ -333,37 +334,37 @@ else
+@@ -367,40 +368,40 @@ else
  fi
  AM_CONDITIONAL(LIBUSB01_BUILD, test x$libusb01_build = xyes)
  
@@ -50,6 +50,11 @@ paths.
 +AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hplip.desktop install directory [default=datadir/applications]]),
 +   icondir=$withval, icondir="$datadir/applications")
  
+-AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hp-uiscan.desktop install directory [default=/usr/share/applications]]),
+-   icondir=$withval, icondir="/usr/share/applications")
++AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hp-uiscan.desktop install directory [default=datadir/applications]]),
++   icondir=$withval, icondir="$datadir/applications")
+ 
 -AC_ARG_WITH(systraydir, AC_HELP_STRING([--with-systraydir=DIR], [set hplip-systray.desktop install directory [default=/etc/xdg/autostart]]),
 -   systraydir=$withval, systraydir="/etc/xdg/autostart")
 +AC_ARG_WITH(systraydir, AC_HELP_STRING([--with-systraydir=DIR], [set hplip-systray.desktop install directory [default=sysconfdir/xdg/autostart]]),
@@ -84,7 +89,7 @@ paths.
     hphtmldir=$withval, hphtmldir="$datadir/doc/hplip-$VERSION")
  
  AC_MSG_CHECKING([for foomatic ppd install])
-@@ -488,12 +489,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
+@@ -545,12 +546,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
  
  # Determine where the PolicyKit policy file goes
  if test "$policykit" = "yes"; then
@@ -102,7 +107,7 @@ paths.
     fi
  else
     policykit_dir=
-@@ -602,6 +603,7 @@ AC_DEFINE_DIR([abs_sbindir], [sbindir])
+@@ -659,6 +660,7 @@ AC_DEFINE_DIR([abs_sbindir], [sbindir])
  AC_DEFINE_DIR([abs_hpppddir], [hpppddir])
  AC_DEFINE_DIR([abs_docdir], [hpdocdir])
  AC_DEFINE_DIR([abs_htmldir], [hphtmldir])
Index: pkgsrc/print/hplip/patches/patch-installer_dcheck.py
diff -u pkgsrc/print/hplip/patches/patch-installer_dcheck.py:1.3 pkgsrc/print/hplip/patches/patch-installer_dcheck.py:1.4
--- pkgsrc/print/hplip/patches/patch-installer_dcheck.py:1.3    Mon Dec  7 11:02:26 2015
+++ pkgsrc/print/hplip/patches/patch-installer_dcheck.py        Sat Jan  4 04:24:12 2020
@@ -1,17 +1,29 @@
-$NetBSD: patch-installer_dcheck.py,v 1.3 2015/12/07 11:02:26 adam Exp $
+$NetBSD: patch-installer_dcheck.py,v 1.4 2020/01/04 04:24:12 khorben Exp $
 
 Locate libraries on systems without ldconfig(8)
 
 This only looks for libraries in pkgsrc's own library folder.
 
---- installer/dcheck.py.orig   2015-06-07 19:25:11.000000000 +0000
+--- installer/dcheck.py.orig   2019-12-10 05:00:31.000000000 +0000
 +++ installer/dcheck.py
-@@ -99,6 +99,8 @@ def check_lib(lib, min_ver=0):
+@@ -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):
          #    pass
          #else:
          return True
-+    elif check_file(lib+".so","/usr/lib"):
++    elif check_file(lib+".so","/usr/pkg/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.3 pkgsrc/print/hplip/patches/patch-scan.py:1.4
--- pkgsrc/print/hplip/patches/patch-scan.py:1.3        Sun Jun 14 21:50:53 2015
+++ pkgsrc/print/hplip/patches/patch-scan.py    Sat Jan  4 04:24:12 2020
@@ -1,10 +1,16 @@
-$NetBSD: patch-scan.py,v 1.3 2015/06/14 21:50:53 schnoebe Exp $
+$NetBSD: patch-scan.py,v 1.4 2020/01/04 04:24:12 khorben Exp $
 
 Try to work better with multiple versions of Python
 
---- scan.py.orig       2013-03-08 07:15:32.000000000 +0000
+--- scan.py.orig       2019-12-10 05:00:36.000000000 +0000
 +++ scan.py
-@@ -688,7 +688,7 @@ try:
+@@ -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
  
          valid_res = device.getOptionObj('resolution').constraint
@@ -13,3 +19,12 @@ 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-diagnose_queues.py
diff -u pkgsrc/print/hplip/patches/patch-diagnose_queues.py:1.2 pkgsrc/print/hplip/patches/patch-diagnose_queues.py:1.3
--- pkgsrc/print/hplip/patches/patch-diagnose_queues.py:1.2     Sun Feb 28 20:37:28 2016
+++ pkgsrc/print/hplip/patches/patch-diagnose_queues.py Sat Jan  4 04:24:12 2020
@@ -1,9 +1,15 @@
-$NetBSD: patch-diagnose_queues.py,v 1.2 2016/02/28 20:37:28 schnoebe Exp $
+$NetBSD: patch-diagnose_queues.py,v 1.3 2020/01/04 04:24:12 khorben Exp $
 
 Correct the spelling on the module name.
 
---- diagnose_queues.py.orig    2015-08-19 13:25:37.000000000 +0000
+--- 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-prnt_hpijs_foomatic-rip-hplip
diff -u pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip:1.1 pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip:1.2
--- pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip:1.1  Wed Jun 17 10:21:02 2015
+++ pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip      Sat Jan  4 04:24:12 2020
@@ -1,10 +1,87 @@
-$NetBSD: patch-prnt_hpijs_foomatic-rip-hplip,v 1.1 2015/06/17 10:21:02 wiz Exp $
+$NetBSD: patch-prnt_hpijs_foomatic-rip-hplip,v 1.2 2020/01/04 04:24:12 khorben Exp $
 
 perl-5.22 compatibility
 
---- prnt/hpijs/foomatic-rip-hplip.orig 2015-06-07 19:25:26.000000000 +0000
+--- prnt/hpijs/foomatic-rip-hplip.orig 2019-12-10 05:00:36.000000000 +0000
 +++ prnt/hpijs/foomatic-rip-hplip
-@@ -1653,7 +1653,7 @@ if ($#datablob >= 0) {
+@@ -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) {
  ## if nexessary.
  
  my $dontparse = 0;

Added files:

Index: pkgsrc/print/hplip/patches/patch-prnt_hpcups_HPCupsFilter.cpp
diff -u /dev/null pkgsrc/print/hplip/patches/patch-prnt_hpcups_HPCupsFilter.cpp:1.1
--- /dev/null   Sat Jan  4 04:24:12 2020
+++ pkgsrc/print/hplip/patches/patch-prnt_hpcups_HPCupsFilter.cpp       Sat Jan  4 04:24:12 2020
@@ -0,0 +1,70 @@
+$NetBSD: patch-prnt_hpcups_HPCupsFilter.cpp,v 1.1 2020/01/04 04:24:12 khorben Exp $
+
+Avoid using libImageProcessing.so (binary blob)
+
+Patch from "loqs", obtained at:
+https://bugs.archlinux.org/task/59548#comment172098
+
+--- prnt/hpcups/HPCupsFilter.cpp.orig  2019-12-10 05:00:33.000000000 +0000
++++ prnt/hpcups/HPCupsFilter.cpp
+@@ -31,8 +31,6 @@
+ \*****************************************************************************/
+ 
+ #include "HPCupsFilter.h"
+-#include "ImageProcessor.h"
+-
+ #include <signal.h>
+ #include <sys/wait.h>
+ #include <sys/utsname.h>
+@@ -637,16 +635,9 @@ int HPCupsFilter::processRasterData(cups
+ 
+ 
+     sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
+-    image_processor_t* imageProcessor = imageProcessorCreate();
+ 
+     while (cupsRasterReadHeader2(cups_raster, &cups_header))
+     {
+-
+-        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
+-        if (result != IPE_SUCCESS){
+-            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
+-        }
+-
+         current_page_number++;
+ 
+         if (current_page_number == 1) {
+@@ -745,12 +736,6 @@ int HPCupsFilter::processRasterData(cups
+             color_raster = rgbRaster;
+             black_raster = kRaster;
+ 
+-            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
+-            if (result != IPE_SUCCESS){
+-                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
+-            }
+-
+-
+             if ((y == 0) && !is_ljmono) {
+                 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
+                 //may not skip blank lines before actual data
+@@ -780,12 +765,6 @@ int HPCupsFilter::processRasterData(cups
+             }
+         }  // for() loop end
+ 
+-        result = imageProcessorEndPage(imageProcessor);
+-        if (result != IPE_SUCCESS){
+-                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
+-        }
+-
+-
+         m_Job.NewPage();
+         if (err != NO_ERROR) {
+             break;
+@@ -800,8 +779,6 @@ int HPCupsFilter::processRasterData(cups
+         rgbRaster = NULL;
+     }
+ 
+-    imageProcessorDestroy(imageProcessor);
+-
+     unlink(hpPreProcessedRasterFile);
+     return ret_status;
+ }

Prev by Date: CVS commit: pkgsrc/databases/sqlite3
Next by Date: CVS commit: pkgsrc/print/hplip
Previous by Thread: CVS commit: pkgsrc/databases/sqlite3
Next by Thread: CVS commit: pkgsrc/print/hplip
Indexes:

Home | Main Index | Thread Index | Old Index