svn commit: r503333 - in head/print/hplip: . files

[Kai Knoblich]

Author: kai
Date: Sun Jun  2 21:00:06 2019
New Revision: 503333
URL: https://svnweb.freebsd.org/changeset/ports/503333

Log:
  print/hplip: Fix runtime with graphics/py-pillow 6.0.0
  
  Fix a possible runtime error in installers/dcheck.py when graphics/py-pillow
  is updated to 6.0.0, which removed the previously deprecated constant
  Image.VERSION .
  
  PR:		238072, 237426 (related)
  Approved by:	woodsb02 (maintainer)

Modified:
  head/print/hplip/Makefile
  head/print/hplip/files/patch-installer_dcheck.py

Modified: head/print/hplip/Makefile
==============================================================================
--- head/print/hplip/Makefile	Sun Jun  2 19:50:16 2019	(r503332)
+++ head/print/hplip/Makefile	Sun Jun  2 21:00:06 2019	(r503333)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hplip
 PORTVERSION=	3.17.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	SF
 

Modified: head/print/hplip/files/patch-installer_dcheck.py
==============================================================================
--- head/print/hplip/files/patch-installer_dcheck.py	Sun Jun  2 19:50:16 2019	(r503332)
+++ head/print/hplip/files/patch-installer_dcheck.py	Sun Jun  2 21:00:06 2019	(r503333)
@@ -1,4 +1,4 @@
---- installer/dcheck.py.orig	2016-08-26 10:05:26 UTC
+--- installer/dcheck.py.orig	2019-05-23 09:47:03 UTC
 +++ installer/dcheck.py
 @@ -48,7 +48,11 @@ mod_output = ''
  def update_ld_output():
@@ -13,7 +13,19 @@
  
      if status != 0:
          log.debug("ldconfig failed.")
-@@ -378,6 +382,8 @@ def get_libpthread_version():
+@@ -370,7 +374,10 @@ def get_pil_version():
+     except ImportError:
+         return '-'
+     else:
+-         return Image.VERSION
++        if hasattr(Image, "__version__"): # required for Pillow >= 6.0.0
++            return Image.__version__
++        else:
++            return Image.VERSION
+ 
+ def get_libpthread_version():
+     try:
+@@ -378,6 +385,8 @@ def get_libpthread_version():
      except ImportError:
          return '-'
      else: