From 8421fb13948b27d63a3daf5b359df5afcd112589 Mon Sep 17 00:00:00 2001 From: sthen Date: Sat, 21 Dec 2024 11:38:14 +0000 Subject: [PATCH] handle py3.12 switchover in graphics --- graphics/Makefile | 44 ++++++++++++------------- graphics/asymptote/Makefile | 9 ++--- graphics/blender/Makefile | 10 +++--- graphics/darktable/Makefile | 3 +- graphics/displaz/Makefile | 2 +- graphics/gdk-pixbuf2/Makefile | 2 +- graphics/gimp/snapshot/Makefile | 1 + graphics/glad/Makefile | 10 +++--- graphics/glslang/Makefile | 1 + graphics/gnofract4d/Makefile | 12 +++---- graphics/gprof2dot/Makefile | 4 +-- graphics/hugin/Makefile | 3 +- graphics/img2pdf/Makefile | 14 ++++---- graphics/inkscape/Makefile | 10 +++--- graphics/lensfun/Makefile | 4 +-- graphics/libgexiv2/Makefile | 6 ++-- graphics/makehuman/Makefile | 11 ++++--- graphics/mypaint/Makefile | 22 ++++++------- graphics/opencolorio/Makefile | 7 ++-- graphics/opencv/Makefile | 6 ++-- graphics/openimageio/Makefile | 4 +-- graphics/peek/Makefile | 2 +- graphics/piglit/Makefile | 8 ++--- graphics/py-Pillow/Makefile | 16 ++++----- graphics/py-Pillow/pkg/PLIST | 17 +++++----- graphics/py-bdfparser/Makefile | 9 ++--- graphics/py-bdfparser/pkg/PLIST | 13 ++++---- graphics/py-blurhash/Makefile | 13 +++----- graphics/py-blurhash/pkg/PLIST | 11 ++++--- graphics/py-cairo/Makefile | 13 +++----- graphics/py-cairo/pkg/PLIST | 6 ++-- graphics/py-cycler/Makefile | 11 +++---- graphics/py-cycler/pkg/PLIST | 14 ++++---- graphics/py-dot/Makefile | 20 +++++------ graphics/py-dot/pkg/PLIST | 16 ++++----- graphics/py-imageio/Makefile | 15 ++++----- graphics/py-imageio/pkg/PLIST | 16 ++++----- graphics/py-imagesize/Makefile | 9 ++--- graphics/py-imagesize/pkg/PLIST | 14 ++++---- graphics/py-matplotlib-inline/Makefile | 11 +++---- graphics/py-matplotlib-inline/pkg/PLIST | 13 ++++---- graphics/py-matplotlib/Makefile | 41 +++++++++++------------ graphics/py-matplotlib/pkg/PLIST | 36 ++++++++++---------- graphics/py-opengl/Makefile | 11 +++---- graphics/py-opengl/pkg/PLIST | 11 ++++--- graphics/py-pygal/Makefile | 20 +++++------ graphics/py-pygal/pkg/PLIST | 14 ++++---- graphics/py-pyqrcode/Makefile | 9 ++--- graphics/py-pyqrcode/pkg/PLIST | 11 ++++--- graphics/py-pyqtgraph/Makefile | 12 +++---- graphics/py-pyqtgraph/pkg/PLIST | 13 ++++---- graphics/py-pyx/Makefile | 13 +++----- graphics/py-pyx/pkg/PLIST | 16 ++++----- graphics/py-qrcode/Makefile | 14 ++++---- graphics/py-qrcode/pkg/PLIST | 14 ++++---- graphics/py-sane/Makefile | 15 ++++----- graphics/py-sane/pkg/PLIST | 16 ++++----- graphics/py-seaborn/Makefile | 17 ++++------ graphics/py-seaborn/pkg/PLIST | 12 +++---- graphics/py-termcolor/Makefile | 8 ++--- graphics/py-termcolor/pkg/PLIST | 13 ++++---- graphics/py-tifffile/Makefile | 9 +++-- graphics/py-tifffile/pkg/PLIST | 15 +++++---- graphics/py-wand/Makefile | 8 ++--- graphics/py-wand/pkg/PLIST | 13 ++++---- graphics/py2-Pillow/Makefile | 6 ++-- graphics/pycha/Makefile | 15 ++++----- graphics/pycha/pkg/PLIST | 19 ++++++----- graphics/scour/Makefile | 8 ++--- graphics/termtosvg/Makefile | 12 +++---- graphics/xdot/Makefile | 8 ++--- graphics/zbar/Makefile | 2 +- 72 files changed, 409 insertions(+), 454 deletions(-) diff --git a/graphics/Makefile b/graphics/Makefile index 8ecd7e96219..c086f39d8a9 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -263,30 +263,30 @@ SUBDIR += pqiv SUBDIR += pstoedit SUBDIR += py2-opengl - SUBDIR += py-Pillow,python3 - SUBDIR += py-blurhash,python3 - SUBDIR += py-bdfparser,python3 - SUBDIR += py-cairo,python3 - SUBDIR += py-cycler,python3 - SUBDIR += py-dot,python3 - SUBDIR += py-imageio,python3 - SUBDIR += py-imagesize,python3 - SUBDIR += py-matplotlib,python3 - SUBDIR += py-matplotlib-inline,python3 - SUBDIR += py-opengl,python3 - SUBDIR += py-pygal,python3 - SUBDIR += py-pyqrcode,python3 - SUBDIR += py-pyqtgraph,python3 - SUBDIR += py-pyx,python3 - SUBDIR += py-qrcode,python3 - SUBDIR += py-sane,python3 - SUBDIR += py-seaborn,python3 - SUBDIR += py-termcolor,python3 - SUBDIR += py-tifffile,python3 - SUBDIR += py-wand,python3 + SUBDIR += py-Pillow + SUBDIR += py-blurhash + SUBDIR += py-bdfparser + SUBDIR += py-cairo + SUBDIR += py-cycler + SUBDIR += py-dot + SUBDIR += py-imageio + SUBDIR += py-imagesize + SUBDIR += py-matplotlib + SUBDIR += py-matplotlib-inline + SUBDIR += py-opengl + SUBDIR += py-pygal + SUBDIR += py-pyqrcode + SUBDIR += py-pyqtgraph + SUBDIR += py-pyx + SUBDIR += py-qrcode + SUBDIR += py-sane + SUBDIR += py-seaborn + SUBDIR += py-termcolor + SUBDIR += py-tifffile + SUBDIR += py-wand SUBDIR += py2-Pillow SUBDIR += py2-cairo - SUBDIR += pycha,python3 + SUBDIR += pycha SUBDIR += qiv SUBDIR += qr-code-generator SUBDIR += quesoglc diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile index 4779f5967f9..2ed3ec27cc3 100644 --- a/graphics/asymptote/Makefile +++ b/graphics/asymptote/Makefile @@ -3,6 +3,7 @@ COMMENT= powerful descriptive vector graphics language DISTNAME= asymptote-2.91 EXTRACT_SUFX= .src.tgz CATEGORIES= graphics +REVISION= 0 HOMEPAGE= https://asymptote.sourceforge.io/ @@ -24,12 +25,12 @@ BUILD_DEPENDS= graphics/glm \ print/texlive/texmf,-main \ print/texlive/texmf,-full \ math/eigen3 \ - x11/py-qt5${MODPY_FLAVOR} + x11/py-qt5 RUN_DEPENDS= print/texlive/texmf,-full \ - math/py-numpy${MODPY_FLAVOR} \ - textproc/py-cson${MODPY_FLAVOR} \ + math/py-numpy \ + textproc/py-cson \ x11/gnome/librsvg \ - x11/py-qt5${MODPY_FLAVOR} + x11/py-qt5 LIB_DEPENDS= devel/boehm-gc \ devel/gsl \ diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index d7c437b1aac..8a2b66cd6db 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -6,7 +6,7 @@ DPB_PROPERTIES = parallel COMMENT = 3D creation software DISTNAME = blender-3.3.21 -REVISION = 0 +REVISION = 1 CATEGORIES = graphics @@ -54,8 +54,8 @@ CONFIGURE_ARGS += -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON CONFIGURE_ARGS+= -DWITH_CPU_SIMD=OFF .endif -BUILD_DEPENDS = math/py-numpy${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} +BUILD_DEPENDS = math/py-numpy \ + www/py-requests LIB_DEPENDS = audio/libsndfile \ audio/openal \ devel/boost \ @@ -78,8 +78,8 @@ LIB_DEPENDS = audio/libsndfile \ math/fftw3 \ ${MODPY_LIB_DEPENDS} RUN_DEPENDS = devel/desktop-file-utils \ - math/py-numpy${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} \ + math/py-numpy \ + www/py-requests \ x11/gnome/librsvg NO_TEST = Yes diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index a53a98a487d..3b642d45d1e 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -43,8 +43,7 @@ BUILD_DEPENDS= graphics/p5-Image-ExifTool \ textproc/libxslt # used if present at configure time. -# python.port.mk is not included, so hardcoded ,python3 not MODPY_FLAVOR -BUILD_DEPENDS+= devel/py-jsonschema,python3 +BUILD_DEPENDS+= devel/py-jsonschema RUN_DEPENDS= devel/desktop-file-utils \ graphics/p5-Image-ExifTool \ diff --git a/graphics/displaz/Makefile b/graphics/displaz/Makefile index e66ae282c27..75623bdbf70 100644 --- a/graphics/displaz/Makefile +++ b/graphics/displaz/Makefile @@ -18,7 +18,7 @@ MODULES = devel/cmake x11/qt5 LIB_DEPENDS = graphics/openexr # links with static libLASlib.a and libGLEW.a -BUILD_DEPENDS = textproc/py-docutils,python3 \ +BUILD_DEPENDS = textproc/py-docutils \ converters/lastools \ graphics/glew diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 77eb5781160..6dfc07c8514 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -23,7 +23,7 @@ MODULES= devel/meson \ MODPY_RUNDEP= No -BUILD_DEPENDS= textproc/py-docutils${MODPY_FLAVOR} +BUILD_DEPENDS= textproc/py-docutils LIB_DEPENDS= devel/glib2 \ graphics/png \ diff --git a/graphics/gimp/snapshot/Makefile b/graphics/gimp/snapshot/Makefile index a06953b6317..0f6c391a77f 100644 --- a/graphics/gimp/snapshot/Makefile +++ b/graphics/gimp/snapshot/Makefile @@ -6,6 +6,7 @@ ONLY_FOR_ARCHS= ${RUST_ARCHS} V= 3.0 DISTNAME= gimp-${V}.0-RC1 PKGNAME = gimp-${V}.0rc1 +REVISION = 0 .for i in gimp gimpbase gimpcolor gimpconfig gimpmath gimpmodule \ gimpthumb gimpui gimpwidgets gimp-scriptfu diff --git a/graphics/glad/Makefile b/graphics/glad/Makefile index 1bbfb99fe83..33cabec2311 100644 --- a/graphics/glad/Makefile +++ b/graphics/glad/Makefile @@ -1,10 +1,10 @@ COMMENT = multi-language Vulkan/GL/GLES/EGL/GLX/WGL loader-generator -MODPY_EGG_VERSION = 2.0.6 -GH_TAGNAME = v${MODPY_EGG_VERSION} +MODPY_DISTV = 2.0.6 +GH_TAGNAME = v${MODPY_DISTV} GH_ACCOUNT = Dav1dde GH_PROJECT = glad -REVISION = 0 +REVISION = 1 CATEGORIES = graphics @@ -17,8 +17,8 @@ PERMIT_PACKAGE = Yes MODULES = lang/python MODPY_PYBUILD = setuptools -RUN_DEPENDS = www/py-jinja2${MODPY_FLAVOR} \ - textproc/py-MarkupSafe${MODPY_FLAVOR} +RUN_DEPENDS = www/py-jinja2 \ + textproc/py-MarkupSafe NO_TEST = Yes diff --git a/graphics/glslang/Makefile b/graphics/glslang/Makefile index fd4c0bbf547..ed34e46c2ac 100644 --- a/graphics/glslang/Makefile +++ b/graphics/glslang/Makefile @@ -5,6 +5,7 @@ COMMENT = reference front-end for GLSL and ESSL GH_TAGNAME = 15.0.0 GH_ACCOUNT = KhronosGroup GH_PROJECT = glslang +REVISION = 0 SHARED_LIBS += glslang 6.0 # 15.0 SHARED_LIBS += glslang-default-resource-limits 0.1 # 15.0 diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile index 21a5c405f20..608045a3ef2 100644 --- a/graphics/gnofract4d/Makefile +++ b/graphics/gnofract4d/Makefile @@ -1,10 +1,10 @@ COMMENT = fractal image generator -MODPY_EGG_VERSION = 4.3 +MODPY_DISTV = 4.3 -SITES = https://github.com/fract4d/gnofract4d/releases/download/v${MODPY_EGG_VERSION}/ -DISTNAME = gnofract4d-${MODPY_EGG_VERSION} -REVISION = 3 +SITES = https://github.com/fract4d/gnofract4d/releases/download/v${MODPY_DISTV}/ +DISTNAME = gnofract4d-${MODPY_DISTV} +REVISION = 4 CATEGORIES = graphics @@ -26,8 +26,8 @@ LIB_DEPENDS = graphics/png \ graphics/jpeg RUN_DEPENDS += devel/desktop-file-utils \ - devel/py-gobject3${MODPY_FLAVOR} \ - graphics/py-cairo${MODPY_FLAVOR} \ + devel/py-gobject3 \ + graphics/py-cairo \ misc/shared-mime-info \ x11/gtk+3 \ x11/gtk+4,-guic diff --git a/graphics/gprof2dot/Makefile b/graphics/gprof2dot/Makefile index e645f12a03c..e987b8100b4 100644 --- a/graphics/gprof2dot/Makefile +++ b/graphics/gprof2dot/Makefile @@ -4,8 +4,8 @@ GH_ACCOUNT= jrfonseca GH_PROJECT= gprof2dot GH_TAGNAME= 2021.02.21 -MODPY_EGG_VERSION= ${GH_TAGNAME:C/\.0/./g} -REVISION= 3 +MODPY_DISTV= ${GH_TAGNAME:C/\.0/./g} +REVISION= 4 CATEGORIES= graphics diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index aff62b6d4d1..c293af27f01 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -9,6 +9,7 @@ EXTRACT_SUFX = .tar.bz2 # not needed for releases, but makes RCs/betas easier to work with PKGNAME = ${DISTNAME:S/_//:L} WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//} +REVISION = 0 SHARED_LIBS += celeste 4.0 SHARED_LIBS += flann_cpp 4.0 @@ -47,7 +48,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ graphics/p5-Image-ExifTool \ misc/shared-mime-info \ x11/gtk+4,-guic -RUN_DEPENDS += x11/py-wxPython${MODPY_FLAVOR} # required for launching python scripts +RUN_DEPENDS += x11/py-wxPython # required for launching python scripts LIB_DEPENDS = devel/boost \ graphics/exiv2>=0.12 \ diff --git a/graphics/img2pdf/Makefile b/graphics/img2pdf/Makefile index 2bfc330d706..ab12e73cebb 100644 --- a/graphics/img2pdf/Makefile +++ b/graphics/img2pdf/Makefile @@ -1,8 +1,8 @@ COMMENT = losslessly convert images to PDF -MODPY_EGG_VERSION = 0.5.1 -DISTNAME = img2pdf-${MODPY_EGG_VERSION} -REVISION = 0 +MODPY_DISTV = 0.5.1 +DISTNAME = img2pdf-${MODPY_DISTV} +REVISION = 1 CATEGORIES = graphics @@ -15,16 +15,16 @@ MODULES = lang/python MODPY_PYBUILD = setuptools MODPY_PI = Yes -RUN_DEPENDS = graphics/py-Pillow${MODPY_FLAVOR} \ - print/py-pikepdf${MODPY_FLAVOR} +RUN_DEPENDS = graphics/py-Pillow \ + print/py-pikepdf # assert failures in some compare_ghostscript tests TEST_DEPENDS = graphics/colord \ graphics/p5-Image-ExifTool \ - math/py-scipy${MODPY_FLAVOR} \ + math/py-scipy \ print/ghostscript/gnu \ sysutils/coreutils \ - sysutils/py-packaging${MODPY_FLAVOR} \ + sysutils/py-packaging \ textproc/mupdf pre-test: diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 6eba9106d92..7576b783e71 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -2,7 +2,7 @@ COMMENT = SVG vector drawing application VERSION = 1.4 DISTNAME = inkscape-${VERSION} -REVISION = 2 +REVISION = 3 CATEGORIES = graphics @@ -64,11 +64,11 @@ LIB_DEPENDS = devel/boost \ RUN_DEPENDS = devel/desktop-file-utils \ devel/gettext,-runtime \ fonts/liberation-fonts \ - math/py-numpy${MODPY_FLAVOR} \ + math/py-numpy \ print/transfig \ - textproc/py-cssselect${MODPY_FLAVOR} \ - textproc/py-lxml${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} \ + textproc/py-cssselect \ + textproc/py-lxml \ + www/py-requests \ x11/gtk+4,-guic WRKDIST = ${WRKDIR}/inkscape-${VERSION}_2024-10-09_e7c3feb100 diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile index 551b218c260..1a457c6f156 100644 --- a/graphics/lensfun/Makefile +++ b/graphics/lensfun/Makefile @@ -2,7 +2,7 @@ COMMENT= library to adjust for photographic lens characteristics GH_ACCOUNT= lensfun GH_PROJECT= lensfun GH_TAGNAME= v0.3.3 -REVISION= 0 +REVISION= 1 SHARED_LIBS= lensfun 2.1 @@ -21,7 +21,7 @@ MODULES= devel/cmake \ MODPY_RUNDEP= No -BUILD_DEPENDS= devel/py-setuptools${MODPY_FLAVOR} +BUILD_DEPENDS= devel/py-setuptools LIB_DEPENDS= devel/glib2 \ graphics/png diff --git a/graphics/libgexiv2/Makefile b/graphics/libgexiv2/Makefile index 32f0ad39887..1d1faae3851 100644 --- a/graphics/libgexiv2/Makefile +++ b/graphics/libgexiv2/Makefile @@ -3,7 +3,7 @@ COMMENT= GObject wrapper around exiv2 GNOME_VERSION= 0.14.3 GNOME_PROJECT= gexiv2 PKGNAME= lib${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= graphics @@ -35,7 +35,7 @@ LIB_DEPENDS= devel/glib2 \ graphics/exiv2 # import gi -BUILD_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} -RUN_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} +BUILD_DEPENDS= devel/py-gobject3 +RUN_DEPENDS= devel/py-gobject3 .include diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile index bdd83128b07..7a3637596b1 100644 --- a/graphics/makehuman/Makefile +++ b/graphics/makehuman/Makefile @@ -3,6 +3,7 @@ COMMENT= parametrical modeling of 3D humanoid characters GH_ACCOUNT= makehumancommunity GH_PROJECT= makehuman GH_TAGNAME= v1.3.0 +REVISION= 0 CATEGORIES= graphics @@ -15,13 +16,13 @@ MODULES= lang/python NO_TEST= Yes -BUILD_DEPENDS= math/py-numpy${MODPY_FLAVOR} \ - x11/py-qt5${MODPY_FLAVOR} +BUILD_DEPENDS= math/py-numpy \ + x11/py-qt5 RUN_DEPENDS= devel/desktop-file-utils \ - graphics/py-opengl${MODPY_FLAVOR} \ - math/py-numpy${MODPY_FLAVOR} \ - x11/py-qt5${MODPY_FLAVOR} + graphics/py-opengl \ + math/py-numpy \ + x11/py-qt5 do-build: .for TARGET in models proxies targets diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index 8f9be87a2c7..b1438dbefb8 100644 --- a/graphics/mypaint/Makefile +++ b/graphics/mypaint/Makefile @@ -1,9 +1,9 @@ COMMENT = raster graphics editor for digital painters -MODPY_EGG_VERSION = 2.0.1 -DISTNAME = mypaint-${MODPY_EGG_VERSION} +MODPY_DISTV = 2.0.1 +DISTNAME = mypaint-${MODPY_DISTV} EXTRACT_SUFX = .tar.xz -REVISION = 8 +REVISION = 9 CATEGORIES = graphics @@ -19,7 +19,7 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz WANTLIB += intl json-c lcms2 m mypaint pango-1.0 pangocairo-1.0 WANTLIB += png z -SITES = https://github.com/mypaint/mypaint/releases/download/v${MODPY_EGG_VERSION}/ +SITES = https://github.com/mypaint/mypaint/releases/download/v${MODPY_DISTV}/ MODULES = lang/python @@ -28,18 +28,18 @@ SEPARATE_BUILD = Yes COMPILER = base-clang ports-gcc BUILD_DEPENDS = devel/gettext,-tools \ - devel/py-gobject3${MODPY_FLAVOR} \ + devel/py-gobject3 \ devel/swig \ graphics/mypaint-brushes2 \ - graphics/py-cairo${MODPY_FLAVOR} \ - math/py-numpy${MODPY_FLAVOR} \ + graphics/py-cairo \ + math/py-numpy \ x11/gnome/librsvg RUN_DEPENDS = devel/desktop-file-utils \ - devel/py-gobject3${MODPY_FLAVOR} \ + devel/py-gobject3 \ graphics/mypaint-brushes2 \ - graphics/py-cairo${MODPY_FLAVOR} \ - math/py-numpy${MODPY_FLAVOR} \ + graphics/py-cairo \ + math/py-numpy \ x11/gtk+4,-guic LIB_DEPENDS = devel/harfbuzz \ @@ -49,7 +49,7 @@ LIB_DEPENDS = devel/harfbuzz \ graphics/libmypaint \ x11/gtk+3 -TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} +TEST_DEPENDS = devel/py-nose PORTHOME = ${WRKSRC} diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile index bce748a05ed..92fe2dc0abd 100644 --- a/graphics/opencolorio/Makefile +++ b/graphics/opencolorio/Makefile @@ -5,6 +5,7 @@ GH_PROJECT = OpenColorIO GH_TAGNAME = v2.4.0 PKGNAME = ${DISTNAME:L} EPOCH = 2 +REVISION = 0 SHARED_LIBS += OpenColorIO 5.0 # 1.1.1 @@ -25,9 +26,9 @@ MODULES = devel/cmake \ lang/python BUILD_DEPENDS = devel/boost \ - devel/py-pybind11${MODPY_FLAVOR} \ - devel/py-setuptools${MODPY_FLAVOR} \ - devel/py-wheel${MODPY_FLAVOR} + devel/py-pybind11 \ + devel/py-setuptools \ + devel/py-wheel LIB_DEPENDS = archivers/minizip \ devel/pystring \ devel/yaml-cpp \ diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index f690138cc32..aa5f66de665 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -11,7 +11,7 @@ GH_TAGNAME = ${V} PKGNAME-main = opencv-${V} PKGNAME-java = opencv-java-${V} -REVISION-main = 2 +REVISION-main = 3 REVISION-java = 0 HOMEPAGE = https://www.opencv.org/ @@ -50,9 +50,9 @@ MODULES = devel/cmake \ lang/python BUILD_DEPENDS = math/eigen3 \ - math/py-numpy${MODPY_FLAVOR} + math/py-numpy -RUN_DEPENDS-main = math/py-numpy${MODPY_FLAVOR} +RUN_DEPENDS-main = math/py-numpy RUN_DEPENDS-java = ${MODJAVA_RUN_DEPENDS} diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 9d3ec2f92e8..9ca4da41423 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -7,7 +7,7 @@ GH_ACCOUNT = AcademySoftwareFoundation GH_PROJECT = OpenImageIO GH_TAGNAME = v2.5.13.1 PKGNAME = ${DISTNAME:L} -REVISION = 0 +REVISION = 1 SHARED_LIBS += OpenImageIO 16.0 # 2.4.10 SHARED_LIBS += OpenImageIO_Util 10.1 # 2.4.10 @@ -33,7 +33,7 @@ MODULES = devel/cmake \ COMPILER = base-clang ports-gcc BUILD_DEPENDS = devel/fmt>=10.2.1 \ - devel/py-pybind11${MODPY_FLAVOR} \ + devel/py-pybind11 \ devel/robin-map \ textproc/txt2man diff --git a/graphics/peek/Makefile b/graphics/peek/Makefile index b98ada33620..d1a5283a9da 100644 --- a/graphics/peek/Makefile +++ b/graphics/peek/Makefile @@ -3,7 +3,7 @@ COMMENT = simple screen recorder GH_PROJECT = peek GH_ACCOUNT = phw GH_TAGNAME = 1.5.1 -REVISION = 3 +REVISION = 4 CATEGORIES = graphics x11 diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile index 02fbeb46fd4..6bb67178514 100644 --- a/graphics/piglit/Makefile +++ b/graphics/piglit/Makefile @@ -6,7 +6,7 @@ DISTNAME = piglit-20210128 GH_ACCOUNT = mesa3d GH_PROJECT = piglit GH_COMMIT = 83173d9536c9f5e1571efe5933d210466ec255b8 -REVISION = 8 +REVISION = 9 CATEGORIES = graphics @@ -32,9 +32,9 @@ MODPY_ADJ_FILES = tests/glslparsertest/glsl2/gen_builtin_test.py \ replayer/replayer.py \ piglit -RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \ - math/py-numpy${MODPY_FLAVOR} \ - www/py-mako${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-six \ + math/py-numpy \ + www/py-mako BUILD_DEPENDS = ${RUN_DEPENDS} \ graphics/glslang \ graphics/vulkan-headers diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile index 2be27bc43ec..f7d964818c7 100644 --- a/graphics/py-Pillow/Makefile +++ b/graphics/py-Pillow/Makefile @@ -4,10 +4,11 @@ COMMENT= Python Imaging Library (friendly fork of PIL) # it must be 2024.10.13/newer (noted here in case of any backports to # -stable). Pillow uses a new license type which was only added then; # setuptools enforces validation against trove-classifiers iff present. -MODPY_EGG_VERSION= 11.0.0 -DISTNAME= pillow-${MODPY_EGG_VERSION} -PKGNAME= py-Pillow-${MODPY_EGG_VERSION} +MODPY_DISTV= 11.0.0 +DISTNAME= pillow-${MODPY_DISTV} +PKGNAME= py-Pillow-${MODPY_DISTV} CATEGORIES= graphics +REVISION= 0 HOMEPAGE= https://python-pillow.org/ @@ -17,9 +18,6 @@ PERMIT_PACKAGE= Yes WANTLIB += freetype imagequant jpeg lcms2 openjp2 tiff WANTLIB += webp webpdemux webpmux xcb z -FLAVORS= python3 -FLAVOR= python3 - MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools @@ -34,10 +32,8 @@ LIB_DEPENDS= graphics/lcms2 \ graphics/libwebp TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH} \ ${MODPY_TKINTER_DEPENDS} \ - devel/py-test-timeout${MODPY_FLAVOR} \ - sysutils/py-packaging${MODPY_FLAVOR} - -SUBST_VARS+= MODPY_FLAVOR + devel/py-test-timeout \ + sysutils/py-packaging # fail if libs aren't found MODPY_PYBUILD_ARGS= -C tiff=enable -C xcb=enable diff --git a/graphics/py-Pillow/pkg/PLIST b/graphics/py-Pillow/pkg/PLIST index 8cf7ca85448..2fb04993b7a 100644 --- a/graphics/py-Pillow/pkg/PLIST +++ b/graphics/py-Pillow/pkg/PLIST @@ -1,4 +1,5 @@ -@pkgpath graphics/py-Pillow,-main${MODPY_FLAVOR} +@pkgpath graphics/py-Pillow,-main,python3 +@pkgpath graphics/py-Pillow,python3 include/python${MODPY_VERSION}/ImPlatform.h include/python${MODPY_VERSION}/Imaging.h lib/python${MODPY_VERSION}/site-packages/PIL/ @@ -303,10 +304,10 @@ lib/python${MODPY_VERSION}/site-packages/PIL/_webp.pyi lib/python${MODPY_VERSION}/site-packages/PIL/features.py lib/python${MODPY_VERSION}/site-packages/PIL/py.typed lib/python${MODPY_VERSION}/site-packages/PIL/report.py -lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pillow-${MODPY_DISTV}.dist-info/zip-safe diff --git a/graphics/py-bdfparser/Makefile b/graphics/py-bdfparser/Makefile index 1f169068f68..ca0db726f95 100644 --- a/graphics/py-bdfparser/Makefile +++ b/graphics/py-bdfparser/Makefile @@ -1,10 +1,10 @@ COMMENT= BDF format bitmap font file parser library in Python -MODPY_EGG_VERSION= 2.2.0 -DISTNAME= bdfparser-${MODPY_EGG_VERSION} +MODPY_DISTV= 2.2.0 +DISTNAME= bdfparser-${MODPY_DISTV} PKGNAME= py-${DISTNAME} CATEGORIES= graphics sysutils -REVISION= 0 +REVISION= 1 HOMEPAGE= https://font.tomchen.org/bdfparser_py/ @@ -15,7 +15,4 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 - .include diff --git a/graphics/py-bdfparser/pkg/PLIST b/graphics/py-bdfparser/pkg/PLIST index 25023b40d49..bb0fe59e9a2 100644 --- a/graphics/py-bdfparser/pkg/PLIST +++ b/graphics/py-bdfparser/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath graphics/py-bdfparser,python3 lib/python${MODPY_VERSION}/site-packages/bdfparser/ -lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/bdfparser-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/bdfparser/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bdfparser/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/bdfparser/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/graphics/py-blurhash/Makefile b/graphics/py-blurhash/Makefile index a77972b950f..262fe2142e6 100644 --- a/graphics/py-blurhash/Makefile +++ b/graphics/py-blurhash/Makefile @@ -1,10 +1,10 @@ COMMENT = python implementation of the blurhash algorithm -MODPY_EGG_VERSION = 1.1.4 +MODPY_DISTV = 1.1.4 -DISTNAME = blurhash-${MODPY_EGG_VERSION} +DISTNAME = blurhash-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 3 +REVISION = 4 CATEGORIES = graphics @@ -19,10 +19,7 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -TEST_DEPENDS = graphics/py-Pillow${MODPY_FLAVOR} \ - math/py-numpy${MODPY_FLAVOR} - -FLAVORS = python3 -FLAVOR = python3 +TEST_DEPENDS = graphics/py-Pillow \ + math/py-numpy .include diff --git a/graphics/py-blurhash/pkg/PLIST b/graphics/py-blurhash/pkg/PLIST index f5d70d5bef2..013afe01b78 100644 --- a/graphics/py-blurhash/pkg/PLIST +++ b/graphics/py-blurhash/pkg/PLIST @@ -1,9 +1,10 @@ +@pkgpath graphics/py-blurhash,python3 lib/python${MODPY_VERSION}/site-packages/blurhash/ -lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/blurhash-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/blurhash/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/blurhash/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/blurhash/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 3697f07dc18..d5dca57ba7d 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -3,12 +3,12 @@ NOT_FOR_ARCHS= m88k COMMENT= cairo bindings for Python -MODPY_EGG_VERSION= 1.27.0 -REVISION= 0 +MODPY_DISTV= 1.27.0 +REVISION= 1 GH_ACCOUNT= pygobject GH_PROJECT= pycairo -GH_TAGNAME= v${MODPY_EGG_VERSION} -PKGNAME= py-cairo-${MODPY_EGG_VERSION} +GH_TAGNAME= v${MODPY_DISTV} +PKGNAME= py-cairo-${MODPY_DISTV} CATEGORIES= graphics @@ -24,12 +24,9 @@ WANTLIB += cairo MODULES= devel/meson \ lang/python -FLAVORS= python3 -FLAVOR= python3 - LIB_DEPENDS= graphics/cairo -TEST_DEPENDS= devel/py-test${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-test do-test: cd ${WRKSRC} && ${MODPY_BIN} ./${MODPY_SETUP} test diff --git a/graphics/py-cairo/pkg/PLIST b/graphics/py-cairo/pkg/PLIST index 7df52a7094c..f989f9ab10a 100644 --- a/graphics/py-cairo/pkg/PLIST +++ b/graphics/py-cairo/pkg/PLIST @@ -1,4 +1,4 @@ -@pkgpath graphics/py-cairo +@pkgpath graphics/py-cairo,python3 include/pycairo/ include/pycairo/py3cairo.h lib/pkgconfig/py3cairo.pc @@ -11,5 +11,5 @@ lib/python${MODPY_VERSION}/site-packages/cairo/${MODPY_PYCACHE}__init__.${MODPY_ lib/python${MODPY_VERSION}/site-packages/cairo/include/ lib/python${MODPY_VERSION}/site-packages/cairo/include/py3cairo.h lib/python${MODPY_VERSION}/site-packages/cairo/py.typed -lib/python${MODPY_VERSION}/site-packages/pycairo-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pycairo-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pycairo-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pycairo-${MODPY_DISTV}.dist-info/METADATA diff --git a/graphics/py-cycler/Makefile b/graphics/py-cycler/Makefile index 674601f1b53..7c91fbc3973 100644 --- a/graphics/py-cycler/Makefile +++ b/graphics/py-cycler/Makefile @@ -1,10 +1,10 @@ COMMENT = composable style cycles -MODPY_EGG_VERSION = 0.11.0 -DISTNAME = cycler-${MODPY_EGG_VERSION} -PKGNAME = py-cycler-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.11.0 +DISTNAME = cycler-${MODPY_DISTV} +PKGNAME = py-cycler-${MODPY_DISTV} CATEGORIES = graphics -REVISION = 2 +REVISION = 3 HOMEPAGE = https://github.com/matplotlib/cycler @@ -13,9 +13,6 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools diff --git a/graphics/py-cycler/pkg/PLIST b/graphics/py-cycler/pkg/PLIST index 10ae0ddd1b8..715ec6511b6 100644 --- a/graphics/py-cycler/pkg/PLIST +++ b/graphics/py-cycler/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath graphics/py-cycler,python3 @conflict py-cycler-* -@pkgpath graphics/py-cycler lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cycler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cycler.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/cycler-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/cycler.py diff --git a/graphics/py-dot/Makefile b/graphics/py-dot/Makefile index d59a7b1a01b..d043ecba634 100644 --- a/graphics/py-dot/Makefile +++ b/graphics/py-dot/Makefile @@ -1,30 +1,28 @@ COMMENT= Python interface to Graphviz's Dot#' -MODPY_EGG_VERSION= 3.0.2 -DISTNAME= pydot-${MODPY_EGG_VERSION} +MODPY_DISTV= 3.0.2 +DISTNAME= pydot-${MODPY_DISTV} PKGNAME= ${DISTNAME:S/py/py-/} CATEGORIES= graphics +REVISION= 0 HOMEPAGE= https://github.com/erocarrera/pydot # MIT PERMIT_PACKAGE= Yes -FLAVORS= python3 -FLAVOR= python3 - MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -BUILD_DEPENDS= devel/py-parsing${MODPY_FLAVOR} -RUN_DEPENDS= devel/py-parsing${MODPY_FLAVOR} \ +BUILD_DEPENDS= devel/py-parsing +RUN_DEPENDS= devel/py-parsing \ math/graphviz -TEST_DEPENDS= devel/py-parameterized${MODPY_FLAVOR} \ - devel/py-test-cov${MODPY_FLAVOR} \ - devel/py-test-xdist${MODPY_FLAVOR} \ - textproc/py-chardet${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-parameterized \ + devel/py-test-cov \ + devel/py-test-xdist \ + textproc/py-chardet .include diff --git a/graphics/py-dot/pkg/PLIST b/graphics/py-dot/pkg/PLIST index d1ea6bfe6e1..578096a5663 100644 --- a/graphics/py-dot/pkg/PLIST +++ b/graphics/py-dot/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath graphics/py-dot,python3 @conflict py-dot-* -@pkgpath graphics/py-dot lib/python${MODPY_VERSION}/site-packages/pydot/ -lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}.dist-info/MIT.txt -lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}.dist-info/Python-2.0.txt -lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_DISTV}.dist-info/MIT.txt +lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_DISTV}.dist-info/Python-2.0.txt +lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pydot-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pydot/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pydot/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pydot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile index 9c06b409e93..4a384a68a22 100644 --- a/graphics/py-imageio/Makefile +++ b/graphics/py-imageio/Makefile @@ -1,10 +1,10 @@ COMMENT = io for scientific data formats -MODPY_EGG_VERSION = 2.6.1 -DISTNAME = imageio-${MODPY_EGG_VERSION} +MODPY_DISTV = 2.6.1 +DISTNAME = imageio-${MODPY_DISTV} PKGNAME = py-${DISTNAME} CATEGORIES = graphics -REVISION = 6 +REVISION = 7 MAINTAINER = Paul Irofti @@ -13,13 +13,10 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 +RUN_DEPENDS = math/py-numpy \ + graphics/py-Pillow -RUN_DEPENDS = math/py-numpy${MODPY_FLAVOR} \ - graphics/py-Pillow${MODPY_FLAVOR} - -TEST_DEPENDS = sysutils/py-psutil${MODPY_FLAVOR} +TEST_DEPENDS = sysutils/py-psutil MODPY_PI = Yes MODPY_PYBUILD = setuptools diff --git a/graphics/py-imageio/pkg/PLIST b/graphics/py-imageio/pkg/PLIST index 768a7cbae33..43c830dbd0f 100644 --- a/graphics/py-imageio/pkg/PLIST +++ b/graphics/py-imageio/pkg/PLIST @@ -1,14 +1,14 @@ -@pkgpath graphics/py-imageio +@pkgpath graphics/py-imageio,python3 bin/imageio_download_bin bin/imageio_remove_bin lib/python${MODPY_VERSION}/site-packages/imageio/ -lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/imageio-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/imageio/__init__.py lib/python${MODPY_VERSION}/site-packages/imageio/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/imageio/${MODPY_PYCACHE}/ diff --git a/graphics/py-imagesize/Makefile b/graphics/py-imagesize/Makefile index e3cbe7895f5..ff075146713 100644 --- a/graphics/py-imagesize/Makefile +++ b/graphics/py-imagesize/Makefile @@ -1,19 +1,16 @@ COMMENT = getting image size from png/jpeg/jpeg2000/gif file -MODPY_EGG_VERSION = 1.4.1 -DISTNAME = imagesize-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.4.1 +DISTNAME = imagesize-${MODPY_DISTV} PKGNAME = py-${DISTNAME} CATEGORIES = graphics -REVISION = 2 +REVISION = 3 HOMEPAGE = https://github.com/shibukawa/imagesize_py # MIT PERMIT_PACKAGE = Yes -FLAVORS = python3 -FLAVOR = python3 - MODULES = lang/python MODPY_PI = Yes diff --git a/graphics/py-imagesize/pkg/PLIST b/graphics/py-imagesize/pkg/PLIST index 15b846f9eba..eea4f640317 100644 --- a/graphics/py-imagesize/pkg/PLIST +++ b/graphics/py-imagesize/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath graphics/py-imagesize +@pkgpath graphics/py-imagesize,python3 lib/python${MODPY_VERSION}/site-packages/imagesize/ -lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst -lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_DISTV}.dist-info/LICENSE.rst +lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/imagesize-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/imagesize/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/imagesize/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/imagesize/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/graphics/py-matplotlib-inline/Makefile b/graphics/py-matplotlib-inline/Makefile index 0d7eed6ee24..58b71b38fc2 100644 --- a/graphics/py-matplotlib-inline/Makefile +++ b/graphics/py-matplotlib-inline/Makefile @@ -1,9 +1,9 @@ COMMENT = inline matplotlib backend for jupyter -MODPY_EGG_VERSION = 0.1.6 -DISTNAME = matplotlib-inline-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.1.6 +DISTNAME = matplotlib-inline-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = graphics math @@ -16,10 +16,7 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -RUN_DEPENDS = devel/py-traitlets${MODPY_FLAVOR} - -FLAVORS = python3 -FLAVOR = python3 +RUN_DEPENDS = devel/py-traitlets NO_TEST = Yes diff --git a/graphics/py-matplotlib-inline/pkg/PLIST b/graphics/py-matplotlib-inline/pkg/PLIST index 2d0dba67efb..20475d6d95c 100644 --- a/graphics/py-matplotlib-inline/pkg/PLIST +++ b/graphics/py-matplotlib-inline/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath graphics/py-matplotlib-inline,python3 lib/python${MODPY_VERSION}/site-packages/matplotlib_inline/ -lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/matplotlib_inline-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/matplotlib_inline/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/matplotlib_inline/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/matplotlib_inline/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index f2dc800ffc1..2837cb37576 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -1,9 +1,9 @@ COMMENT= Python charting and plotting API -MODPY_EGG_VERSION = 3.8.3 -DISTNAME = matplotlib-${MODPY_EGG_VERSION} +MODPY_DISTV = 3.8.3 +DISTNAME = matplotlib-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = graphics devel math @@ -20,32 +20,29 @@ COMPILER = base-clang ports-gcc base-gcc MODULES= lang/python -FLAVORS= python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools_scm NO_TEST = Yes -BUILD_DEPENDS = devel/py-certifi${MODPY_FLAVOR}>=2020.06.20 \ - devel/py-pybind11${MODPY_FLAVOR}>=2.6 \ +BUILD_DEPENDS = devel/py-certifi>=2020.06.20 \ + devel/py-pybind11>=2.6 \ math/qhull \ - math/py-numpy${MODPY_FLAVOR}>=1.25,<2 \ - textproc/py-sphinx${MODPY_FLAVOR} + math/py-numpy>=1.25,<2 \ + textproc/py-sphinx -RUN_DEPENDS= devel/py-tz${MODPY_FLAVOR} \ - devel/py-dateutil${MODPY_FLAVOR}>=2.7 \ - devel/py-kiwisolver${MODPY_FLAVOR}>=1.3.1 \ - devel/py-parsing${MODPY_FLAVOR}>=2.3.1 \ - devel/py-gobject3${MODPY_FLAVOR} \ - math/py-contourpy${MODPY_FLAVOR}>=1.0.1 \ - math/py-numpy${MODPY_FLAVOR}>=1.25,<2 \ - graphics/py-Pillow${MODPY_FLAVOR}>=8.0.0 \ - graphics/py-cairo${MODPY_FLAVOR} \ - graphics/py-cycler${MODPY_FLAVOR}>=0.10 \ - print/py-fonttools${MODPY_FLAVOR}>=4.22.0 \ - sysutils/py-packaging${MODPY_FLAVOR}>=20.0 \ +RUN_DEPENDS= devel/py-tz \ + devel/py-dateutil>=2.7 \ + devel/py-kiwisolver>=1.3.1 \ + devel/py-parsing>=2.3.1 \ + devel/py-gobject3 \ + math/py-contourpy>=1.0.1 \ + math/py-numpy>=1.25,<2 \ + graphics/py-Pillow>=8.0.0 \ + graphics/py-cairo \ + graphics/py-cycler>=0.10 \ + print/py-fonttools>=4.22.0 \ + sysutils/py-packaging>=20.0 \ ${MODPY_TKINTER_DEPENDS} # pygobject GTK3 introspection (not provided by indirect dependencies) diff --git a/graphics/py-matplotlib/pkg/PLIST b/graphics/py-matplotlib/pkg/PLIST index a8e7769a2ad..effa1152e84 100644 --- a/graphics/py-matplotlib/pkg/PLIST +++ b/graphics/py-matplotlib/pkg/PLIST @@ -1,25 +1,25 @@ +@pkgpath graphics/py-matplotlib,python3 @conflict py-matplotlib-* -@pkgpath graphics/py-matplotlib lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pylab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pylab.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/matplotlib/ -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_AMSFONTS -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_BAKOMA -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_CARLOGO -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_COLORBREWER -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_COURIERTEN -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_JSXTOOLS_RESIZE_OBSERVER -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_QHULL -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_QT4_EDITOR -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_SOLARIZED -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_STIX -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/LICENSE_YORICK -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_AMSFONTS +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_BAKOMA +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_CARLOGO +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_COLORBREWER +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_COURIERTEN +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_JSXTOOLS_RESIZE_OBSERVER +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_QHULL +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_QT4_EDITOR +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_SOLARIZED +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_STIX +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/LICENSE_YORICK +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/matplotlib-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/matplotlib/__init__.py lib/python${MODPY_VERSION}/site-packages/matplotlib/__init__.pyi ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}/ diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index 219bf7465ca..88e40cdf892 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -1,8 +1,8 @@ COMMENT = Python bindings for OpenGL -MODPY_EGG_VERSION = 3.1.7 -DISTNAME = PyOpenGL-${MODPY_EGG_VERSION} -PKGNAME = py-opengl-${MODPY_EGG_VERSION} -REVISION = 1 +MODPY_DISTV = 3.1.7 +DISTNAME = PyOpenGL-${MODPY_DISTV} +PKGNAME = py-opengl-${MODPY_DISTV} +REVISION = 2 CATEGORIES = graphics HOMEPAGE = https://pyopengl.sourceforge.net/ @@ -12,9 +12,6 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools diff --git a/graphics/py-opengl/pkg/PLIST b/graphics/py-opengl/pkg/PLIST index 0cadd454df8..79689c70f0f 100644 --- a/graphics/py-opengl/pkg/PLIST +++ b/graphics/py-opengl/pkg/PLIST @@ -1,3 +1,4 @@ +@pkgpath graphics/py-opengl,python3 lib/python${MODPY_VERSION}/site-packages/OpenGL/ lib/python${MODPY_VERSION}/site-packages/OpenGL/AGL/ lib/python${MODPY_VERSION}/site-packages/OpenGL/AGL/__init__.py @@ -8861,8 +8862,8 @@ lib/python${MODPY_VERSION}/site-packages/OpenGL/raw/osmesa/_types.py lib/python${MODPY_VERSION}/site-packages/OpenGL/raw/osmesa/mesa.py lib/python${MODPY_VERSION}/site-packages/OpenGL/version.py lib/python${MODPY_VERSION}/site-packages/OpenGL/wrapper.py -lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/PyOpenGL-${MODPY_DISTV}.dist-info/top_level.txt diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile index 283996059ed..8e1aad56896 100644 --- a/graphics/py-pygal/Makefile +++ b/graphics/py-pygal/Makefile @@ -1,8 +1,9 @@ COMMENT = python svg graph plotting library -MODPY_EGG_VERSION = 3.0.5 -DISTNAME = pygal-${MODPY_EGG_VERSION} +MODPY_DISTV = 3.0.5 +DISTNAME = pygal-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = graphics @@ -15,17 +16,14 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 +BUILD_DEPENDS += devel/py-test-runner -BUILD_DEPENDS += devel/py-test-runner${MODPY_FLAVOR} +RUN_DEPENDS += textproc/py-lxml -RUN_DEPENDS += textproc/py-lxml${MODPY_FLAVOR} - -TEST_DEPENDS += www/py-flask${MODPY_FLAVOR} \ - textproc/py-lxml${MODPY_FLAVOR} \ - devel/py-test-runner${MODPY_FLAVOR} \ - devel/py-test-cov${MODPY_FLAVOR} +TEST_DEPENDS += www/py-flask \ + textproc/py-lxml \ + devel/py-test-runner \ + devel/py-test-cov # missing TEST_DEPENDS: # pyquery cairosvg diff --git a/graphics/py-pygal/pkg/PLIST b/graphics/py-pygal/pkg/PLIST index 6753b86228b..aefb68b027e 100644 --- a/graphics/py-pygal/pkg/PLIST +++ b/graphics/py-pygal/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath graphics/py-pygal,python3 @conflict py-pygal-* -@pkgpath graphics/py-pygal @comment bin/pygal_gen.py lib/python${MODPY_VERSION}/site-packages/pygal/ -lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_EGG_VERSION}.dist-info/COPYING -lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_DISTV}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pygal-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pygal/__about__.py lib/python${MODPY_VERSION}/site-packages/pygal/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pygal/${MODPY_PYCACHE}/ diff --git a/graphics/py-pyqrcode/Makefile b/graphics/py-pyqrcode/Makefile index 20bacd943c8..97124706f36 100644 --- a/graphics/py-pyqrcode/Makefile +++ b/graphics/py-pyqrcode/Makefile @@ -1,11 +1,11 @@ COMMENT = QR code generator written purely in Python -MODPY_EGG_VERSION = 1.2.1 -DISTNAME = PyQRCode-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.2.1 +DISTNAME = PyQRCode-${MODPY_DISTV} PKGNAME = py-${DISTNAME:L} CATEGORIES = graphics HOMEPAGE = https://github.com/mnooner256/pyqrcode -REVISION = 2 +REVISION = 3 # BSD PERMIT_PACKAGE = Yes @@ -16,9 +16,6 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - # tests not included in pypi tarball NO_TEST = Yes diff --git a/graphics/py-pyqrcode/pkg/PLIST b/graphics/py-pyqrcode/pkg/PLIST index 8dea23b7133..0dfa05bbcbe 100644 --- a/graphics/py-pyqrcode/pkg/PLIST +++ b/graphics/py-pyqrcode/pkg/PLIST @@ -1,8 +1,9 @@ -lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath graphics/py-pyqrcode,python3 +lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/PyQRCode-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pyqrcode/ lib/python${MODPY_VERSION}/site-packages/pyqrcode/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyqrcode/${MODPY_PYCACHE}/ diff --git a/graphics/py-pyqtgraph/Makefile b/graphics/py-pyqtgraph/Makefile index 642ff54d782..94ac1fb5361 100644 --- a/graphics/py-pyqtgraph/Makefile +++ b/graphics/py-pyqtgraph/Makefile @@ -1,9 +1,10 @@ COMMENT = pure-python graphics and GUI library -MODPY_EGG_VERSION = 0.13.7 +MODPY_DISTV = 0.13.7 -DISTNAME = pyqtgraph-${MODPY_EGG_VERSION} +DISTNAME = pyqtgraph-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = graphics @@ -19,12 +20,9 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -RUN_DEPENDS = math/py-numpy${MODPY_FLAVOR}>=1.22.0 \ - x11/py-qt5${MODPY_FLAVOR} +RUN_DEPENDS = math/py-numpy>=1.22.0 \ + x11/py-qt5 TEST_IS_INTERACTIVE = X11 -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/graphics/py-pyqtgraph/pkg/PLIST b/graphics/py-pyqtgraph/pkg/PLIST index 2c64ddd8c1e..c2551184f05 100644 --- a/graphics/py-pyqtgraph/pkg/PLIST +++ b/graphics/py-pyqtgraph/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath graphics/py-pyqtgraph,python3 lib/python${MODPY_VERSION}/site-packages/pyqtgraph/ -lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt -lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_DISTV}.dist-info/LICENSE.txt +lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pyqtgraph-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pyqtgraph/GraphicsScene/ lib/python${MODPY_VERSION}/site-packages/pyqtgraph/GraphicsScene/GraphicsScene.py lib/python${MODPY_VERSION}/site-packages/pyqtgraph/GraphicsScene/__init__.py diff --git a/graphics/py-pyx/Makefile b/graphics/py-pyx/Makefile index 7c1f23d9284..56448bf1a71 100644 --- a/graphics/py-pyx/Makefile +++ b/graphics/py-pyx/Makefile @@ -1,10 +1,10 @@ COMMENT = package for creating PostScript/PDF graphics -MODPY_EGG_VERSION = 0.16 -DISTNAME = PyX-${MODPY_EGG_VERSION} -PKGNAME = py-pyx-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.16 +DISTNAME = PyX-${MODPY_DISTV} +PKGNAME = py-pyx-${MODPY_DISTV} CATEGORIES = graphics devel -REVISION = 3 +REVISION = 4 HOMEPAGE = https://pyx.sourceforge.net/ @@ -17,14 +17,11 @@ WANTLIB += ${MODPY_WANTLIB} pthread MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools RUN_DEPENDS = print/texlive/base \ - graphics/py-Pillow${MODPY_FLAVOR} + graphics/py-Pillow post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-pyx diff --git a/graphics/py-pyx/pkg/PLIST b/graphics/py-pyx/pkg/PLIST index 5bf5916abff..5f31bbe5c90 100644 --- a/graphics/py-pyx/pkg/PLIST +++ b/graphics/py-pyx/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath graphics/py-pyx,python3 @conflict py-pyx-* -@pkgpath graphics/py-pyx -lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_EGG_VERSION}.dist-info/AUTHORS -lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_DISTV}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/PyX-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pyx/ lib/python${MODPY_VERSION}/site-packages/pyx/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyx/${MODPY_PYCACHE}/ diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile index cd656fc8e34..9d0a20aac85 100644 --- a/graphics/py-qrcode/Makefile +++ b/graphics/py-qrcode/Makefile @@ -1,8 +1,9 @@ COMMENT= QR Code image generator -MODPY_EGG_VERSION= 8.0 -DISTNAME= qrcode-${MODPY_EGG_VERSION} +MODPY_DISTV= 8.0 +DISTNAME= qrcode-${MODPY_DISTV} PKGNAME= py-${DISTNAME} +REVISION= 0 CATEGORIES= graphics textproc @@ -13,12 +14,9 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= poetry-core -RUN_DEPENDS= graphics/py-Pillow${MODPY_FLAVOR} -TEST_DEPENDS= devel/py-mock${MODPY_FLAVOR} \ - devel/py-test-cov${MODPY_FLAVOR} - -FLAVORS= python3 -FLAVOR= python3 +RUN_DEPENDS= graphics/py-Pillow +TEST_DEPENDS= devel/py-mock \ + devel/py-test-cov post-install: rm -rf ${WRKINST}${MODPY_SITEPKG}/qrcode/tests diff --git a/graphics/py-qrcode/pkg/PLIST b/graphics/py-qrcode/pkg/PLIST index e1e3b1f0e8a..cdaec4d68cf 100644 --- a/graphics/py-qrcode/pkg/PLIST +++ b/graphics/py-qrcode/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath graphics/py-qrcode,python3 @conflict py-qrcode-* -@pkgpath graphics/py-qrcode bin/qr lib/python${MODPY_VERSION}/site-packages/qrcode/ -lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_EGG_VERSION}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/qrcode-${MODPY_DISTV}.dist-info/entry_points.txt lib/python${MODPY_VERSION}/site-packages/qrcode/LUT.py lib/python${MODPY_VERSION}/site-packages/qrcode/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qrcode/${MODPY_PYCACHE}/ diff --git a/graphics/py-sane/Makefile b/graphics/py-sane/Makefile index 88ad90bae5d..3d3495ccaef 100644 --- a/graphics/py-sane/Makefile +++ b/graphics/py-sane/Makefile @@ -1,11 +1,11 @@ COMMENT= Python SANE module -MODPY_EGG_VERSION= 2.9.1 -DISTNAME= Sane-${MODPY_EGG_VERSION} -DISTFILES= ${DISTNAME}{v${MODPY_EGG_VERSION}}.tar.gz +MODPY_DISTV= 2.9.1 +DISTNAME= Sane-${MODPY_DISTV} +DISTFILES= ${DISTNAME}{v${MODPY_DISTV}}.tar.gz PKGNAME= py-${DISTNAME:L} CATEGORIES= graphics -REVISION= 3 +REVISION= 4 HOMEPAGE= http://python-pillow.github.io/ @@ -17,17 +17,14 @@ WANTLIB += pthread sane SITES= https://github.com/python-pillow/Sane/archive/ -FLAVORS= python3 -FLAVOR = python3 - MODULES= lang/python SUBST_VARS= MODPY_SITEPKG MODPY_PYBUILD = setuptools -RUN_DEPENDS= graphics/py-Pillow${MODPY_FLAVOR} \ - math/py-numpy${MODPY_FLAVOR} +RUN_DEPENDS= graphics/py-Pillow \ + math/py-numpy LIB_DEPENDS= graphics/sane-backends diff --git a/graphics/py-sane/pkg/PLIST b/graphics/py-sane/pkg/PLIST index 8bf22b26d45..2a543268718 100644 --- a/graphics/py-sane/pkg/PLIST +++ b/graphics/py-sane/pkg/PLIST @@ -1,14 +1,12 @@ -@conflict py-sane-* -@pkgpath graphics/py-Pillow,-sane${MODPY_FLAVOR} -@pkgpath graphics/py-sane +@pkgpath graphics/py-sane,python3 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sane.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sane.${MODPY_PYC_MAGIC_TAG}pyc @so lib/python${MODPY_VERSION}/site-packages/_sane.${MODPY_PYC_MAGIC_TAG}so -lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_EGG_VERSION}.dist-info/COPYING -lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_DISTV}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/python_sane-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/sane.py diff --git a/graphics/py-seaborn/Makefile b/graphics/py-seaborn/Makefile index 7c14762b625..e59213d4980 100644 --- a/graphics/py-seaborn/Makefile +++ b/graphics/py-seaborn/Makefile @@ -1,9 +1,9 @@ COMMENT = statistical data visualization -MODPY_EGG_VERSION = 0.12.2 -DISTNAME = seaborn-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.12.2 +DISTNAME = seaborn-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = graphics math @@ -14,17 +14,14 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = flit_core MODPY_PYTEST = Yes -RUN_DEPENDS = graphics/py-matplotlib${MODPY_FLAVOR}>=3.1 \ - math/py-numpy${MODPY_FLAVOR}>=1.17.0 \ - math/py-pandas${MODPY_FLAVOR}>=0.25.0 \ - math/py-scipy${MODPY_FLAVOR}>=1.3.0 +RUN_DEPENDS = graphics/py-matplotlib>=3.1 \ + math/py-numpy>=1.17.0 \ + math/py-pandas>=0.25.0 \ + math/py-scipy>=1.3.0 TEST_IS_INTERACTIVE = x11 diff --git a/graphics/py-seaborn/pkg/PLIST b/graphics/py-seaborn/pkg/PLIST index 52a914f4194..3a6cbbbdb6d 100644 --- a/graphics/py-seaborn/pkg/PLIST +++ b/graphics/py-seaborn/pkg/PLIST @@ -1,11 +1,11 @@ +@pkgpath graphics/py-seaborn,python3 @conflict py-seaborn-* -@pkgpath graphics/py-seaborn lib/python${MODPY_VERSION}/site-packages/seaborn/ -lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}.dist-info/LICENSE.md -lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_DISTV}.dist-info/LICENSE.md +lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_DISTV}.dist-info/WHEEL lib/python${MODPY_VERSION}/site-packages/seaborn/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/graphics/py-termcolor/Makefile b/graphics/py-termcolor/Makefile index 95da67556a9..995b7a66ce4 100644 --- a/graphics/py-termcolor/Makefile +++ b/graphics/py-termcolor/Makefile @@ -1,10 +1,10 @@ COMMENT = ANSI color formatting for output in terminal -MODPY_EGG_VERSION = 2.0.1 +MODPY_DISTV = 2.0.1 -DISTNAME = termcolor-${MODPY_EGG_VERSION} +DISTNAME = termcolor-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 2 +REVISION = 3 CATEGORIES = graphics @@ -19,7 +19,5 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = hatch-vcs -FLAVOR = python3 -FLAVORS = python3 .include diff --git a/graphics/py-termcolor/pkg/PLIST b/graphics/py-termcolor/pkg/PLIST index a4bb768e24f..fdb694f9549 100644 --- a/graphics/py-termcolor/pkg/PLIST +++ b/graphics/py-termcolor/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath graphics/py-termcolor,python3 lib/python${MODPY_VERSION}/site-packages/termcolor/ -lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_EGG_VERSION}.dist-info/licenses/ -lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_EGG_VERSION}.dist-info/licenses/COPYING.txt +lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_DISTV}.dist-info/licenses/ +lib/python${MODPY_VERSION}/site-packages/termcolor-${MODPY_DISTV}.dist-info/licenses/COPYING.txt lib/python${MODPY_VERSION}/site-packages/termcolor/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/termcolor/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/termcolor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/graphics/py-tifffile/Makefile b/graphics/py-tifffile/Makefile index 1c617c1771c..3222bc501c1 100644 --- a/graphics/py-tifffile/Makefile +++ b/graphics/py-tifffile/Makefile @@ -1,8 +1,9 @@ COMMENT= read images/metadiff and store numpy arrays in TIFF files -MODPY_EGG_VERSION= 2024.9.20 -DISTNAME= tifffile-${MODPY_EGG_VERSION} +MODPY_DISTV= 2024.9.20 +DISTNAME= tifffile-${MODPY_DISTV} PKGNAME= py-${DISTNAME} +REVISION= 0 CATEGORIES= graphics @@ -12,12 +13,10 @@ HOMEPAGE= https://github.com/cgohlke/tifffile PERMIT_PACKAGE= Yes MODULES= lang/python -FLAVOR= python3 -FLAVORS= python3 MODPY_PI= Yes MODPY_PYBUILD= setuptools -RUN_DEPENDS= math/py-numpy${MODPY_FLAVOR} +RUN_DEPENDS= math/py-numpy .include diff --git a/graphics/py-tifffile/pkg/PLIST b/graphics/py-tifffile/pkg/PLIST index 9089fe89729..8dc54c0230c 100644 --- a/graphics/py-tifffile/pkg/PLIST +++ b/graphics/py-tifffile/pkg/PLIST @@ -1,15 +1,16 @@ +@pkgpath graphics/py-tifffile,python3 bin/lsm2bin bin/tiff2fsspec bin/tiffcomment bin/tifffile lib/python${MODPY_VERSION}/site-packages/tifffile/ -lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/tifffile-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/tifffile/__init__.py lib/python${MODPY_VERSION}/site-packages/tifffile/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tifffile/${MODPY_PYCACHE}/ diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile index 930a1305ab6..2b3dc8eee69 100644 --- a/graphics/py-wand/Makefile +++ b/graphics/py-wand/Makefile @@ -1,8 +1,9 @@ COMMENT= ctypes-based simple MagickWand API binding for Python -MODPY_EGG_VERSION= 0.6.13 -DISTNAME= Wand-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.6.13 +DISTNAME= Wand-${MODPY_DISTV} PKGNAME= py-${DISTNAME:L} +REVISION= 0 CATEGORIES= graphics @@ -14,9 +15,6 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 - RUN_DEPENDS= graphics/ImageMagick .include diff --git a/graphics/py-wand/pkg/PLIST b/graphics/py-wand/pkg/PLIST index 1bc97bd1c14..e6369009d7f 100644 --- a/graphics/py-wand/pkg/PLIST +++ b/graphics/py-wand/pkg/PLIST @@ -1,9 +1,10 @@ -lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath graphics/py-wand,python3 +lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/Wand-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/wand/ lib/python${MODPY_VERSION}/site-packages/wand/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wand/${MODPY_PYCACHE}/ diff --git a/graphics/py2-Pillow/Makefile b/graphics/py2-Pillow/Makefile index 236d73040c3..83606bc0fab 100644 --- a/graphics/py2-Pillow/Makefile +++ b/graphics/py2-Pillow/Makefile @@ -4,8 +4,8 @@ PORTROACH= limit:^6\. COMMENT= Python Imaging Library (version for Python 2) -MODPY_EGG_VERSION= 6.2.2 -DISTNAME= Pillow-${MODPY_EGG_VERSION} +MODPY_DISTV= 6.2.2 +DISTNAME= Pillow-${MODPY_DISTV} PKGNAME= py-${DISTNAME} CATEGORIES= graphics REVISION= 3 @@ -34,7 +34,7 @@ LIB_DEPENDS= graphics/lcms2 \ graphics/libwebp TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH} -SUBST_VARS+= INCL_DIR MODPY_FLAVOR +SUBST_VARS+= INCL_DIR INCL_DIR= ${MODPY_INCDIR:S/${LOCALBASE}\///} pre-test: diff --git a/graphics/pycha/Makefile b/graphics/pycha/Makefile index 0dcebecfec3..9e22bfa74f9 100644 --- a/graphics/pycha/Makefile +++ b/graphics/pycha/Makefile @@ -1,9 +1,9 @@ COMMENT = Python charting module -MODPY_EGG_VERSION = 0.8.1 -DISTNAME = pycha-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.8.1 +DISTNAME = pycha-${MODPY_DISTV} CATEGORIES = graphics -REVISION = 4 +REVISION = 5 # LGPL PERMIT_PACKAGE = Yes @@ -13,12 +13,9 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools MODPY_PYTEST_ARGS = tests/*.py -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = devel/py-cairocffi${MODPY_FLAVOR} \ - devel/py-six${MODPY_FLAVOR} \ - graphics/py-cairo${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-cairocffi \ + devel/py-six \ + graphics/py-cairo pre-build: cd ${WRKBUILD} && 2to3 --no-diffs -w chavier pycha tests diff --git a/graphics/pycha/pkg/PLIST b/graphics/pycha/pkg/PLIST index 099e4ba0402..7b391b07d89 100644 --- a/graphics/pycha/pkg/PLIST +++ b/graphics/pycha/pkg/PLIST @@ -1,3 +1,4 @@ +@pkgpath graphics/pycha,python3 bin/chavier lib/python${MODPY_VERSION}/site-packages/chavier/ lib/python${MODPY_VERSION}/site-packages/chavier/__init__.py @@ -14,15 +15,15 @@ lib/python${MODPY_VERSION}/site-packages/chavier/app.py lib/python${MODPY_VERSION}/site-packages/chavier/dialogs.py lib/python${MODPY_VERSION}/site-packages/chavier/gui.py lib/python${MODPY_VERSION}/site-packages/pycha/ -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/AUTHORS -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/COPYING -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pycha-${MODPY_DISTV}.dist-info/zip-safe lib/python${MODPY_VERSION}/site-packages/pycha/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pycha/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pycha/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/graphics/scour/Makefile b/graphics/scour/Makefile index 9661994165c..12327867063 100644 --- a/graphics/scour/Makefile +++ b/graphics/scour/Makefile @@ -1,6 +1,6 @@ COMMENT = SVG scrubber -MODPY_EGG_VERSION = 0.35 -REVISION = 8 +MODPY_DISTV = 0.35 +REVISION = 9 CATEGORIES = graphics HOMEPAGE = http://www.codedread.com/scour/ @@ -8,11 +8,11 @@ PERMIT_PACKAGE = Yes GH_ACCOUNT = codedread GH_PROJECT = scour -GH_TAGNAME = v${MODPY_EGG_VERSION} +GH_TAGNAME = v${MODPY_DISTV} MODULES = lang/python MODPY_PYBUILD = setuptools -RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-six do-test: @cd ${WRKDIST} && ${MODPY_BIN} testscour.py diff --git a/graphics/termtosvg/Makefile b/graphics/termtosvg/Makefile index 329734966b2..5ea760b574a 100644 --- a/graphics/termtosvg/Makefile +++ b/graphics/termtosvg/Makefile @@ -1,8 +1,8 @@ COMMENT = record terminal sessions as SVG animations -MODPY_EGG_VERSION = 1.1.0 -DISTNAME = termtosvg-${MODPY_EGG_VERSION} -REVISION = 6 +MODPY_DISTV = 1.1.0 +DISTNAME = termtosvg-${MODPY_DISTV} +REVISION = 7 CATEGORIES = graphics @@ -17,8 +17,8 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools MODPY_PYTEST_ARGS = termtosvg/tests -RUN_DEPENDS = devel/py-pyte${MODPY_FLAVOR} \ - devel/py-wcwidth${MODPY_FLAVOR} \ - textproc/py-lxml${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-pyte \ + devel/py-wcwidth \ + textproc/py-lxml .include diff --git a/graphics/xdot/Makefile b/graphics/xdot/Makefile index 05ea1a3c9f7..be12b7ae197 100644 --- a/graphics/xdot/Makefile +++ b/graphics/xdot/Makefile @@ -1,8 +1,8 @@ COMMENT = interactive viewer for Graphviz dot graphs -MODPY_EGG_VERSION = 1.2 -DISTNAME = xdot-${MODPY_EGG_VERSION} -REVISION = 3 +MODPY_DISTV = 1.2 +DISTNAME = xdot-${MODPY_DISTV} +REVISION = 4 CATEGORIES = graphics @@ -17,7 +17,7 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools RUN_DEPENDS = math/graphviz \ - devel/py-gobject3${MODPY_FLAVOR} \ + devel/py-gobject3 \ graphics/cairo NO_TEST = Yes diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index 05fdf036738..c0e974b591e 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -1,7 +1,7 @@ COMMENT= ZBar barcode reader DISTNAME= zbar-0.23.93 -REVISION= 0 +REVISION= 1 SHARED_LIBS= zbar 0.1 \ zbargtk 0.1