Thu Jul 20 13:42:54 2023 UTC ()
gexiv2: Fix PLIST divergence

meson-1.2.0 compiles all .py files.
And use PLIST substitution mechanism with python /extension.mk.


(ryoon)
diff -r1.31 -r1.32 pkgsrc/graphics/gexiv2/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/gexiv2/PLIST
cvs diff -r1.31 -r1.32 pkgsrc/graphics/gexiv2/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gexiv2/Makefile 2023/07/18 22:31:52 1.31
+++ pkgsrc/graphics/gexiv2/Makefile 2023/07/20 13:42:54 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.31 2023/07/18 22:31:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2023/07/20 13:42:54 ryoon Exp $
2 2
3DISTNAME= gexiv2-0.14.1 3DISTNAME= gexiv2-0.14.1
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= graphics devel 5CATEGORIES= graphics devel
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gexiv2/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gexiv2/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Projects/gexiv2 10HOMEPAGE= https://wiki.gnome.org/Projects/gexiv2
11COMMENT= GObject-based wrapper around the Exiv2 library 11COMMENT= GObject-based wrapper around the Exiv2 library
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 14DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
@@ -17,23 +17,25 @@ DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]* @@ -17,23 +17,25 @@ DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*
17USE_LANGUAGES= c99 c++11 17USE_LANGUAGES= c99 c++11
18USE_CXX_FEATURES+= filesystem 18USE_CXX_FEATURES+= filesystem
19USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
20 20
21MESON_ARGS+= -Dcpp_std=c++11 21MESON_ARGS+= -Dcpp_std=c++11
22 22
23PKGCONFIG_OVERRIDE= gexiv2.pc.in 23PKGCONFIG_OVERRIDE= gexiv2.pc.in
24 24
25BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./gexiv2/gexiv2.map 25BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./gexiv2/gexiv2.map
26 26
27PYTHON_VERSIONS_INCOMPATIBLE= 27 27PYTHON_VERSIONS_INCOMPATIBLE= 27
28PLIST_SUBST+= PYSITELIB=${PYSITELIB} 28PLIST_SUBST+= PYSITELIB=${PYSITELIB}
29 29
 30MESON_REQD= 1.2.0
30.include "../../devel/meson/build.mk" 31.include "../../devel/meson/build.mk"
31.include "../../devel/glib2/buildlink3.mk" 32.include "../../devel/glib2/buildlink3.mk"
32BUILDLINK_DEPMETHOD.gobject-introspection= build 33BUILDLINK_DEPMETHOD.gobject-introspection= build
33.include "../../devel/gobject-introspection/buildlink3.mk" 34.include "../../devel/gobject-introspection/buildlink3.mk"
34# for BMFF support 35# for BMFF support
35BUILDLINK_API_DEPENDS.exiv2+= exiv2>=0.27.5nb1 36BUILDLINK_API_DEPENDS.exiv2+= exiv2>=0.27.5nb1
36.include "../../graphics/exiv2/buildlink3.mk" 37.include "../../graphics/exiv2/buildlink3.mk"
37.include "../../lang/vala/buildlink3.mk" 38.include "../../lang/vala/buildlink3.mk"
38.include "../../lang/python/tool.mk" 39.include "../../lang/python/tool.mk"
 40.include "../../lang/python/extension.mk"
39.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/graphics/gexiv2/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/gexiv2/PLIST 2023/05/17 10:54:21 1.5
+++ pkgsrc/graphics/gexiv2/PLIST 2023/07/20 13:42:54 1.6
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1@comment $NetBSD: PLIST,v 1.5 2023/05/17 10:54:21 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2023/07/20 13:42:54 ryoon Exp $
2include/gexiv2/gexiv2-enums.h 2include/gexiv2/gexiv2-enums.h
3include/gexiv2/gexiv2-log.h 3include/gexiv2/gexiv2-log.h
4include/gexiv2/gexiv2-managed-stream.h 4include/gexiv2/gexiv2-managed-stream.h
5include/gexiv2/gexiv2-metadata.h 5include/gexiv2/gexiv2-metadata.h
6include/gexiv2/gexiv2-preview-image.h 6include/gexiv2/gexiv2-preview-image.h
7include/gexiv2/gexiv2-preview-properties.h 7include/gexiv2/gexiv2-preview-properties.h
8include/gexiv2/gexiv2-startup.h 8include/gexiv2/gexiv2-startup.h
9include/gexiv2/gexiv2-version.h 9include/gexiv2/gexiv2-version.h
10include/gexiv2/gexiv2.h 10include/gexiv2/gexiv2.h
11lib/girepository-1.0/GExiv2-0.10.typelib 11lib/girepository-1.0/GExiv2-0.10.typelib
12lib/libgexiv2.so 12lib/libgexiv2.so
13lib/libgexiv2.so.2 13lib/libgexiv2.so.2
14lib/libgexiv2.so.2.14.1 14lib/libgexiv2.so.2.14.1
15lib/pkgconfig/gexiv2.pc 15lib/pkgconfig/gexiv2.pc
16${PYSITELIB}/gi/overrides/GExiv2.py 16${PYSITELIB}/gi/overrides/GExiv2.py
 17${PYSITELIB}/gi/overrides/GExiv2.pyc
17share/gir-1.0/GExiv2-0.10.gir 18share/gir-1.0/GExiv2-0.10.gir
18share/vala/vapi/gexiv2.deps 19share/vala/vapi/gexiv2.deps
19share/vala/vapi/gexiv2.vapi 20share/vala/vapi/gexiv2.vapi