6 files changed, 46 insertions, 44 deletions

diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile
index fe4e52b8c143..7dafcb382db4 100644
--- a/print/hplip-plugin/Makefile
+++ b/print/hplip-plugin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hplip-plugin
-PORTVERSION=	3.20.3
+PORTVERSION=	3.20.6
 CATEGORIES=	print
 MASTER_SITES=	https://developers.hp.com/sites/default/files/
 DISTNAME=	hplip-${DISTVERSION}-plugin
diff --git a/print/hplip-plugin/distinfo b/print/hplip-plugin/distinfo
index 30f48490422d..09319621790a 100644
--- a/print/hplip-plugin/distinfo
+++ b/print/hplip-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586194066
-SHA256 (hplip-3.20.3-plugin.run) = 0f51c5bc5c87d3a10aaa70d12ce6c6605d20f1b1fe01f8ce74da4b2cc1d8be8f
-SIZE (hplip-3.20.3-plugin.run) = 11514166
+TIMESTAMP = 1592831579
+SHA256 (hplip-3.20.6-plugin.run) = 9700cb20c259417e7678a1347634d8c3fb2f03d13369ad96e6536a49f0f1e3cf
+SIZE (hplip-3.20.6-plugin.run) = 11514108
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 9c26923eb7a8..e00fe396da24 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hplip
-PORTVERSION=	3.20.3
-PORTREVISION=	1
+PORTVERSION=	3.20.6
 CATEGORIES=	print
 MASTER_SITES=	SF
 
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 713fa4870081..319876960bc7 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586193273
-SHA256 (hplip-3.20.3.tar.gz) = 41097ec52af5cce51ec7b0200d9f9ec82649b58ae7105259e82130e9cf63066a
-SIZE (hplip-3.20.3.tar.gz) = 25672070
+TIMESTAMP = 1592831566
+SHA256 (hplip-3.20.6.tar.gz) = c64b2d334348010a9911f4feb075b2aa669047e7adb86c72d4a6ee7d392a7c20
+SIZE (hplip-3.20.6.tar.gz) = 25908476
diff --git a/print/hplip/files/patch-installer_dcheck.py b/print/hplip/files/patch-installer_dcheck.py
index f8fefb66fdd5..9b5354766374 100644
--- a/print/hplip/files/patch-installer_dcheck.py
+++ b/print/hplip/files/patch-installer_dcheck.py
@@ -13,18 +13,6 @@
  
      if status != 0:
          log.debug("ldconfig failed.")
-@@ -370,7 +374,10 @@ def get_pil_version():
-     except ImportError:
-         return '-'
-     else:
--         return Image.PILLOW_VERSION
-+        if hasattr(Image, "__version__"): # required for Pillow >= 6.0.0
-+            return Image.__version__
-+        else:
-+            return Image.PILLOW_VERSION
- 
- def get_libpthread_version():
-     try:
 @@ -378,6 +385,8 @@ def get_libpthread_version():
      except ImportError:
          return '-'
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index 3e1de71dda32..4091589e02eb 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -113,7 +113,7 @@ share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %%DATADIR%%/base/dime.py
 %%DATADIR%%/base/exif.py
 %%DATADIR%%/base/g.py
-%%DATADIR%%/base/imageprocessing.py                                                                   
+%%DATADIR%%/base/imageprocessing.py
 %%DATADIR%%/base/imagesize.py
 %%DATADIR%%/base/ldif.py
 %%DATADIR%%/base/logger.py
@@ -436,7 +436,7 @@ share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %%X11%%%%DATADIR%%/data/images/other/confidential_title.png
 %%X11%%%%DATADIR%%/data/images/other/fax.png
 %%X11%%%%DATADIR%%/data/images/other/fax2.png
-%%X11%%%%DATADIR%%/data/images/other/flat1.png                                                               
+%%X11%%%%DATADIR%%/data/images/other/flat1.png
 %%X11%%%%DATADIR%%/data/images/other/generic_coverpage.png
 %%X11%%%%DATADIR%%/data/images/other/generic_title.png
 %%X11%%%%DATADIR%%/data/images/other/h-k-2.png
@@ -468,7 +468,7 @@ share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %%X11%%%%DATADIR%%/data/images/other/v-k-3.png
 %%X11%%%%DATADIR%%/data/images/other/v-kc-2.png
 %%X11%%%%DATADIR%%/data/images/other/v-kc-3.png
-%%X11%%%%DATADIR%%/data/images/other/viewer.png                                                              
+%%X11%%%%DATADIR%%/data/images/other/viewer.png
 %%X11%%%%DATADIR%%/data/images/other/zca.png
 %%DATADIR%%/data/ldl/cb2pcal.ldl.gz
 %%DATADIR%%/data/ldl/cb2pcal_done.ldl.gz
@@ -616,7 +616,7 @@ share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %%X11%%%%QT5%%%%DATADIR%%/ui5/printtestpagedialog_base.py
 %%X11%%%%QT5%%%%DATADIR%%/ui5/queuesconf.py
 %%X11%%%%QT5%%%%DATADIR%%/ui5/readonlyradiobutton.py
-%%X11%%%%QT5%%%%DATADIR%%/ui5/scandialog.py                                                                         
+%%X11%%%%QT5%%%%DATADIR%%/ui5/scandialog.py
 %%X11%%%%QT5%%%%DATADIR%%/ui5/sendfaxdialog.py
 %%X11%%%%QT5%%%%DATADIR%%/ui5/sendfaxdialog_base.py
 %%X11%%%%QT5%%%%DATADIR%%/ui5/settingsdialog.py
@@ -673,7 +673,7 @@ share/ppd/HP/hp-business_inkjet_3000-pcl3.ppd.gz
 share/ppd/HP/hp-business_inkjet_3000-ps.ppd.gz
 share/ppd/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
 share/ppd/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
-share/ppd/HP/hp-color_designjet_xl_3600-ps.ppd.gz                                                                                                                                                                            
+share/ppd/HP/hp-color_designjet_xl_3600-ps.ppd.gz
 share/ppd/HP/hp-color_inkjet_printer_cp1700.ppd.gz
 share/ppd/HP/hp-color_laserjet-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_1600.ppd.gz
@@ -799,8 +799,8 @@ share/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_e65050_e65060-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_e67550_e67560-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_e67650_e67660-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_e75245-ps.ppd.gz 
-share/ppd/HP/hp-color_laserjet_e85055-ps.ppd.gz 
+share/ppd/HP/hp-color_laserjet_e75245-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_e85055-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_flowmfp_m776-ps.ppd.gz
@@ -817,11 +817,14 @@ share/ppd/HP/hp-color_laserjet_m553-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m651-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m652_m653-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_m751-ps.ppd.gz     
+share/ppd/HP/hp-color_laserjet_m751-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m856-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e77422-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e77428-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_e78223-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_e78228-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_e78323-25-30-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
@@ -847,8 +850,8 @@ share/ppd/HP/hp-designjet_4500mfp.ppd.gz
 share/ppd/HP/hp-designjet_4500ps.ppd.gz
 share/ppd/HP/hp-designjet_4520mfp-ps.ppd.gz
 share/ppd/HP/hp-designjet_4520ps-ps.ppd.gz
-share/ppd/HP/hp-designjet_Z6_24in-ps.ppd.gz     
-share/ppd/HP/hp-designjet_Z6_44in-ps.ppd.gz     
+share/ppd/HP/hp-designjet_Z6_24in-ps.ppd.gz
+share/ppd/HP/hp-designjet_Z6_44in-ps.ppd.gz
 share/ppd/HP/hp-designjet_Z6dr_44in-ps.ppd.gz
 share/ppd/HP/hp-designjet_Z9_24in-ps.ppd.gz
 share/ppd/HP/hp-designjet_Z9_44in-ps.ppd.gz
@@ -904,6 +907,7 @@ share/ppd/HP/hp-deskjet_1100.ppd.gz
 share/ppd/HP/hp-deskjet_1110_series.ppd.gz
 share/ppd/HP/hp-deskjet_1120.ppd.gz
 share/ppd/HP/hp-deskjet_1125.ppd.gz
+share/ppd/HP/hp-deskjet_1200_series.ppd.gz
 share/ppd/HP/hp-deskjet_1200c.ppd.gz
 share/ppd/HP/hp-deskjet_1220c.ppd.gz
 share/ppd/HP/hp-deskjet_1280.ppd.gz
@@ -916,11 +920,13 @@ share/ppd/HP/hp-deskjet_2020_series.ppd.gz
 share/ppd/HP/hp-deskjet_2050_j510_series.ppd.gz
 share/ppd/HP/hp-deskjet_2130_series.ppd.gz
 share/ppd/HP/hp-deskjet_2200_series.ppd.gz
+share/ppd/HP/hp-deskjet_2300_series.ppd.gz
 share/ppd/HP/hp-deskjet_2510_series.ppd.gz
 share/ppd/HP/hp-deskjet_2520_series.ppd.gz
 share/ppd/HP/hp-deskjet_2540_series.ppd.gz
 share/ppd/HP/hp-deskjet_2600_series.ppd.gz
 share/ppd/HP/hp-deskjet_2640_series.ppd.gz
+share/ppd/HP/hp-deskjet_2700_series.ppd.gz
 share/ppd/HP/hp-deskjet_3000_j310_series.ppd.gz
 share/ppd/HP/hp-deskjet_3050_j610_series.ppd.gz
 share/ppd/HP/hp-deskjet_3050a_j611_series.ppd.gz
@@ -955,6 +961,7 @@ share/ppd/HP/hp-deskjet_3920.ppd.gz
 share/ppd/HP/hp-deskjet_3940.ppd.gz
 share/ppd/HP/hp-deskjet_400.ppd.gz
 share/ppd/HP/hp-deskjet_400l.ppd.gz
+share/ppd/HP/hp-deskjet_4100_series.ppd.gz
 share/ppd/HP/hp-deskjet_450.ppd.gz
 share/ppd/HP/hp-deskjet_4510_series.ppd.gz
 share/ppd/HP/hp-deskjet_4530_series.ppd.gz
@@ -1090,6 +1097,9 @@ share/ppd/HP/hp-deskjet_ink_adv_2010_k010.ppd.gz
 share/ppd/HP/hp-deskjet_ink_adv_2060_k110.ppd.gz
 share/ppd/HP/hp-deskjet_ink_advant_k109a-z.ppd.gz
 share/ppd/HP/hp-deskjet_ink_advant_k209a-z.ppd.gz
+share/ppd/HP/hp-deskjet_plus_4100_series.ppd.gz
+share/ppd/HP/hp-deskjet_plus_6000_series.ppd.gz
+share/ppd/HP/hp-deskjet_plus_6400_series.ppd.gz
 share/ppd/HP/hp-envy_100_d410_series.ppd.gz
 share/ppd/HP/hp-envy_110_series.ppd.gz
 share/ppd/HP/hp-envy_120_series.ppd.gz
@@ -1101,14 +1111,17 @@ share/ppd/HP/hp-envy_5530_series.ppd.gz
 share/ppd/HP/hp-envy_5540_series.ppd.gz
 share/ppd/HP/hp-envy_5640_series.ppd.gz
 share/ppd/HP/hp-envy_5660_series.ppd.gz
+share/ppd/HP/hp-envy_6000_series.ppd.gz
 share/ppd/HP/hp-envy_7640_series.ppd.gz
 share/ppd/HP/hp-envy_8000_series.ppd.gz
 share/ppd/HP/hp-envy_photo_6200_series.ppd.gz
 share/ppd/HP/hp-envy_photo_7100_series.ppd.gz
 share/ppd/HP/hp-envy_photo_7800_series.ppd.gz
-share/ppd/HP/hp-ink_tank_110_series.ppd.gz 
-share/ppd/HP/hp-ink_tank_310_series.ppd.gz 
+share/ppd/HP/hp-envy_pro_6400_series.ppd.gz
+share/ppd/HP/hp-ink_tank_110_series.ppd.gz
+share/ppd/HP/hp-ink_tank_310_series.ppd.gz
 share/ppd/HP/hp-ink_tank_wireless_410_series.ppd.gz
+share/ppd/HP/hp-laserJet_m610_m611_m612-ps.ppd.gz
 share/ppd/HP/hp-laser_ns_1020.ppd.gz
 share/ppd/HP/hp-laser_ns_mfp_1005.ppd.gz
 share/ppd/HP/hp-laserjet_1000.ppd.gz
@@ -1359,12 +1372,14 @@ share/ppd/HP/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m129-m134.ppd.gz
+share/ppd/HP/hp-laserjet_mfp_m232-m237.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m28-m31.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m527-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m630-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz
+share/ppd/HP/hp-laserjet_mfp_m634_m635_m636-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p1005.ppd.gz
 share/ppd/HP/hp-laserjet_p1006.ppd.gz
@@ -1413,12 +1428,12 @@ share/ppd/HP/hp-laserjet_pro_m148-m149-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m148f-m149f-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m203_m206-ps.ppd.gz
-share/ppd/HP/hp-laserjet_pro_m304-m305-ps.ppd.gz                                                                                                                                                                             
+share/ppd/HP/hp-laserjet_pro_m304-m305-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m402_m403-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m402_m403d-ps.ppd.gz
-share/ppd/HP/hp-laserjet_pro_m404-m405-ps.ppd.gz     
-share/ppd/HP/hp-laserjet_pro_m428-m429-ps.ppd.gz            
-share/ppd/HP/hp-laserjet_pro_m428f-m429f-ps.ppd.gz  
+share/ppd/HP/hp-laserjet_pro_m404-m405-ps.ppd.gz
+share/ppd/HP/hp-laserjet_pro_m428-m429-ps.ppd.gz
+share/ppd/HP/hp-laserjet_pro_m428f-m429f-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m501dn-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m501n-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz
@@ -1446,7 +1461,7 @@ share/ppd/HP/hp-laserjet_pro_mfp_m26a.ppd.gz
 share/ppd/HP/hp-laserjet_pro_mfp_m26nw.ppd.gz
 share/ppd/HP/hp-laserjet_pro_mfp_m27c.ppd.gz
 share/ppd/HP/hp-laserjet_pro_mfp_m27cnw.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m329-ps.ppd.gz  
+share/ppd/HP/hp-laserjet_pro_mfp_m329-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1136_mfp.ppd.gz
@@ -1487,7 +1502,7 @@ share/ppd/HP/hp-mopier_240-pcl3.ppd.gz
 share/ppd/HP/hp-mopier_240-ps.ppd.gz
 share/ppd/HP/hp-mopier_320-pcl3.ppd.gz
 share/ppd/HP/hp-mopier_320-ps.ppd.gz
-share/ppd/HP/hp-neverstop_laser_100x.ppd.gz             
+share/ppd/HP/hp-neverstop_laser_100x.ppd.gz
 share/ppd/HP/hp-neverstop_laser_mfp_120x.ppd.gz
 share/ppd/HP/hp-officejet.ppd.gz
 share/ppd/HP/hp-officejet_100_mobile_l411.ppd.gz
@@ -1542,8 +1557,8 @@ share/ppd/HP/hp-officejet_7400_series.ppd.gz
 share/ppd/HP/hp-officejet_7500_e910.ppd.gz
 share/ppd/HP/hp-officejet_7510_series.ppd.gz
 share/ppd/HP/hp-officejet_7610_series.ppd.gz
-share/ppd/HP/hp-officejet_8010_series.ppd.gz     
-share/ppd/HP/hp-officejet_8020_series.ppd.gz   
+share/ppd/HP/hp-officejet_8010_series.ppd.gz
+share/ppd/HP/hp-officejet_8020_series.ppd.gz
 share/ppd/HP/hp-officejet_8040_series.ppd.gz
 share/ppd/HP/hp-officejet_8700.ppd.gz
 share/ppd/HP/hp-officejet_9010_series.ppd.gz
@@ -1589,7 +1604,7 @@ share/ppd/HP/hp-officejet_pro_7730_series.ppd.gz
 share/ppd/HP/hp-officejet_pro_7740_series.ppd.gz
 share/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz
 share/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
-share/ppd/HP/hp-officejet_pro_8020_series.ppd.gz        
+share/ppd/HP/hp-officejet_pro_8020_series.ppd.gz
 share/ppd/HP/hp-officejet_pro_8030_series.ppd.gz
 share/ppd/HP/hp-officejet_pro_8100.ppd.gz
 share/ppd/HP/hp-officejet_pro_8210-ps.ppd.gz
@@ -1673,10 +1688,10 @@ share/ppd/HP/hp-pagewide_pro_552_printer-ps.ppd.gz
 share/ppd/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz
 share/ppd/HP/hp-pagewide_pro_750-ps.ppd.gz
 share/ppd/HP/hp-pagewide_pro_mfp_772-777-ps.ppd.gz
-share/ppd/HP/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz     
+share/ppd/HP/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz
 share/ppd/HP/hp-pagewide_xl_4000ps-ps.ppd.gz
 share/ppd/HP/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz
-share/ppd/HP/hp-pagewide_xl_4100ps-ps.ppd.gz    
+share/ppd/HP/hp-pagewide_xl_4100ps-ps.ppd.gz
 share/ppd/HP/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz
 share/ppd/HP/hp-pagewide_xl_4500ps-ps.ppd.gz
 share/ppd/HP/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz