CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar 10 18:53:50 UTC 2021

Modified Files:
        pkgsrc/print/hplip: options.mk
        pkgsrc/www/py-easy-thumbnails: Makefile

Log Message:
Use Pillow as versioned dependency


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/hplip/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-easy-thumbnails/Makefile

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/options.mk
diff -u pkgsrc/print/hplip/options.mk:1.18 pkgsrc/print/hplip/options.mk:1.19
--- pkgsrc/print/hplip/options.mk:1.18  Sun Oct 27 15:20:22 2019
+++ pkgsrc/print/hplip/options.mk       Wed Mar 10 18:53:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2019/10/27 15:20:22 kamil Exp $
+# $NetBSD: options.mk,v 1.19 2021/03/10 18:53:49 adam Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -52,8 +52,9 @@ PLIST_SRC+=           PLIST.scan
 CONFIGURE_ARGS+=       --enable-scan-build
 MESSAGE_SRC+=          MESSAGE.scan
 MESSAGE_SUBST+=                EGDIR=${EGDIR}
+PYTHON_VERSIONED_DEPENDENCIES= Pillow
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../graphics/sane-backends/buildlink3.mk"
-DEPENDS+=      {${PYPKGPREFIX}-Pillow-[0-9]*,${PYPKGPREFIX}-imaging-[0-9]*}:../../graphics/py-Pillow
 .else
 CONFIGURE_ARGS+=       --disable-scan-build
 .endif

Index: pkgsrc/www/py-easy-thumbnails/Makefile
diff -u pkgsrc/www/py-easy-thumbnails/Makefile:1.2 pkgsrc/www/py-easy-thumbnails/Makefile:1.3
--- pkgsrc/www/py-easy-thumbnails/Makefile:1.2  Mon Nov 30 20:11:50 2020
+++ pkgsrc/www/py-easy-thumbnails/Makefile      Wed Mar 10 18:53:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/11/30 20:11:50 adam Exp $
+# $NetBSD: Makefile,v 1.3 2021/03/10 18:53:49 adam Exp $
 
 DISTNAME=      easy-thumbnails-2.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,10 +12,12 @@ LICENSE=    modified-bsd
 
 PREV_PKGPATH=  www/py-djangoeasy-thumbnails
 
-DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=      ${PYPKGPREFIX}-django>=1.11:../../www/py-django
 
+PYTHON_VERSIONED_DEPENDENCIES= Pillow
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"