Update to HPLIP 3.18.3

Release Notes:
HPLIP 3.18.3 - This release has the following changes:

Added support for the following new Printers:
- HP DesignJet Z2600 PostScript
- HP DesignJet Z5600 PostScript
- HP PageWide XL 8000ps Printer
- HP PageWide XL 8000 Blueprinter
- HP PageWide XL 5000 Printer
- HP PageWide XL 5000 MFP
- HP PageWide XL 5000 Blueprinter
- HP PageWide XL 4500 Printer
- HP PageWide XL 4500 MFP
- HP PageWide XL 4000 Printer
- HP PageWide XL 4000 MFP
- HP PageWide XL 5100ps
- HP PageWide XL 5100ps MFP
- HP PageWide XL 5100ps MFP Blueprinter
- HP PageWide XL 6000ps
- HP PageWide XL 6000ps MFP

Added support for the following new Distros:
- Manjaro Linux 17.1.4 (64 bit)
- Fedora 27 (64 bit)
- Linux Mint 18.3 (32 bit and 64 bit)

Launchpad fixes:

- 1736221 : hplip-3.17.11 source tarball contains compiled binaries
- 1741214 : scan.py - scans cannot be saved as JPEG since python-pillow-4.2.0

3 files changed, 24 insertions, 9 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index b7268776bfe..965fce8768e 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2018/03/12 11:17:26 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/03/20 20:45:24 schnoebe Exp $
 
-DISTNAME=	hplip-3.17.11
-PKGREVISION=	2
+DISTNAME=	hplip-3.18.3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hplip/}
 
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index a3aedccbab2..9b1bebe1441 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.30 2017/12/14 20:24:42 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.31 2018/03/20 20:45:24 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -469,8 +469,10 @@ share/hplip/ppd/HP/hp-designjet_t790ps_24in-ps.ppd.gz
 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_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
+share/hplip/ppd/HP/hp-designjet_z5600_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
@@ -1233,6 +1235,20 @@ share/hplip/ppd/HP/hp-pagewide_pro_552_printer-ps.ppd.gz
 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_4000ps-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_4000ps_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_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
+share/hplip/ppd/HP/hp-pagewide_xl_5100ps-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_6000ps-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_8000ps-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_100.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_1115.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_1215.ppd.gz
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 12b8febc923..4141df4c653 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.33 2017/12/14 20:24:42 schnoebe Exp $
+$NetBSD: distinfo,v 1.34 2018/03/20 20:45:24 schnoebe Exp $
 
-SHA1 (hplip-3.17.11.tar.gz) = 72705f45157227907a79e326da6524317c1aaff6
-RMD160 (hplip-3.17.11.tar.gz) = 06b7ad4ebde4fa12a6fe21a049f06b26c9a816ee
-SHA512 (hplip-3.17.11.tar.gz) = 29899d58959d49a0b5e730520ef598f245570b084db33d322859b4773a934167387893888a5829c5cfd5a2e4b66848b173fc7c60973fccdb6d3f854105ad7665
-Size (hplip-3.17.11.tar.gz) = 22079691 bytes
+SHA1 (hplip-3.18.3.tar.gz) = 97a065a1eaf930ffce612e26d4ea925d94313e14
+RMD160 (hplip-3.18.3.tar.gz) = 0708c618156ca827154ab2b616d1de3b68383907
+SHA512 (hplip-3.18.3.tar.gz) = cb51e357cc9def3c087231b01752941b469e5fc4508ec83c6f5875352694249ef72339f2f20c4a6831c49ace7c1f6b902cc11a961c0e1f43ce098b2bf800728f
+Size (hplip-3.18.3.tar.gz) = 22178733 bytes
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
 SHA1 (patch-ae) = cb479c04ede40d4f15c0c69e10c82781d5e44f19
 SHA1 (patch-configure.in) = a155b9590a7ab93ca6922a3f55b09d8d531cb9e6