patch for openjp2 path no longer needed as of openjp2-2.3.0p0

graphics/py-Pillow/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2019/01/10 19:43:11 landry Exp $
+# $OpenBSD: Makefile,v 1.26 2019/01/16 22:30:29 sthen Exp $
 
 COMMENT=		Python Imaging Library (maintained fork of PIL)
 
@@ -29,7 +29,7 @@ TEST_DEPENDS=		${FULLPKGNAME}:${BUILD_PKGPATH} \
 RUN_DEPENDS=		${MODPY_RUN_DEPENDS}
 
 LIB_DEPENDS=		graphics/lcms2 \
-			graphics/openjp2 \
+			graphics/openjp2>=2.3.0p0 \
 			graphics/libwebp
 
 MODPY_SETUPTOOLS=	Yes

graphics/py-Pillow/patches/patch-setup_py

@@ -1,29 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.8 2019/01/10 19:43:11 landry Exp $
-
-find our graphics/openjp2 install
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -503,18 +503,18 @@ class pil_build_ext(build_ext):
- 
-             # Find the best version
-             for directory in self.compiler.include_dirs:
--                _dbg('Checking for openjpeg-#.# in %s', directory)
-+                _dbg('Checking for openjp2 in %s', directory)
-                 try:
-                     listdir = os.listdir(directory)
-                 except Exception:
-                     # WindowsError, FileNotFoundError
-                     continue
-                 for name in listdir:
--                    if name.startswith('openjpeg-') and \
-+                    if name.startswith('openjp2') and \
-                         os.path.isfile(os.path.join(directory, name,
-                                                     'openjpeg.h')):
-                         _dbg('Found openjpeg.h in %s/%s', (directory, name))
--                        version = tuple(int(x) for x in name[9:].split('.'))
-+                        version = "2"
-                         if best_version is None or version > best_version:
-                             best_version = version
-                             best_path = os.path.join(directory, name)