Thu Sep 26 10:36:33 2019 UTC ()
As py-gobject3-common has shrunk to just copying 2 files, remove all the
python parafinalia from it.


(prlw1)
diff -r1.36 -r1.37 pkgsrc/devel/py-gobject3/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/py-gobject3/Makefile.common
diff -r1.5 -r1.6 pkgsrc/devel/py-gobject3-common/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/devel/py-gobject3/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-gobject3/Makefile 2019/09/22 17:52:41 1.36
+++ pkgsrc/devel/py-gobject3/Makefile 2019/09/26 10:36:33 1.37
@@ -1,27 +1,34 @@ @@ -1,27 +1,34 @@
1# $NetBSD: Makefile,v 1.36 2019/09/22 17:52:41 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.37 2019/09/26 10:36:33 prlw1 Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
 5
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//:S/-/3-/} 6PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//:S/-/3-/}
 7PKGREVISION= 1
6EGG_NAME= ${DISTNAME:S/pygobject/PyGObject/} 8EGG_NAME= ${DISTNAME:S/pygobject/PyGObject/}
7 9
8COMMENT= Python bindings for glib2 gobject 10COMMENT= Python bindings for glib2 gobject
9 11
10MESON_ARGS+= -Dpython=${PYTHONBIN:Q} 12MESON_ARGS+= -Dpython=${PYTHONBIN:Q}
11MESON_ARGS+= -Dtests=false 13MESON_ARGS+= -Dtests=false
12TEST_TARGET= check 14TEST_TARGET= check
13 15
14# XXX shouldn't be necessary with -Dinstall-common=false 16# Leave for py-gobject3-common:
15post-install: 17post-install:
16 ${RM} \ 18 ${RM} \
17 ${DESTDIR}${PREFIX}/include/pygobject-3.0/pygobject.h \ 19 ${DESTDIR}${PREFIX}/include/pygobject-3.0/pygobject.h \
18 ${DESTDIR}${PREFIX}/lib/pkgconfig/pygobject-3.0.pc 20 ${DESTDIR}${PREFIX}/lib/pkgconfig/pygobject-3.0.pc
19 21
 22BUILDLINK_API_DEPENDS.glib2= glib2>=2.48.0
 23.include "../../devel/glib2/buildlink3.mk"
 24BUILDLINK_API_DEPENDS.gobject-introspection= gobject-introspection>=1.46.0
 25.include "../../devel/gobject-introspection/buildlink3.mk"
 26.include "../../devel/libffi/buildlink3.mk"
20.include "../../devel/py-gobject3-common/buildlink3.mk" 27.include "../../devel/py-gobject3-common/buildlink3.mk"
21.include "../../devel/py-meson/build.mk" 28.include "../../devel/py-meson/build.mk"
22# https://bugzilla.gnome.org/show_bug.cgi?id=685094 29# https://bugzilla.gnome.org/show_bug.cgi?id=685094
23# https://bugzilla.gnome.org/show_bug.cgi?id=707196 30# https://bugzilla.gnome.org/show_bug.cgi?id=707196
24.include "../../graphics/py-cairo/buildlink3.mk" 31.include "../../graphics/py-cairo/buildlink3.mk"
25.include "../../graphics/cairo-gobject/buildlink3.mk" 32.include "../../graphics/cairo-gobject/buildlink3.mk"
26.include "../../lang/python/egg.mk" 33.include "../../lang/python/egg.mk"
27.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/devel/py-gobject3/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/py-gobject3/Makefile.common 2019/09/22 17:52:41 1.14
+++ pkgsrc/devel/py-gobject3/Makefile.common 2019/09/26 10:36:33 1.15
@@ -1,30 +1,22 @@ @@ -1,30 +1,22 @@
1# $NetBSD: Makefile.common,v 1.14 2019/09/22 17:52:41 prlw1 Exp $ 1# $NetBSD: Makefile.common,v 1.15 2019/09/26 10:36:33 prlw1 Exp $
2# used by devel/py-gobject3/Makefile 2# used by devel/py-gobject3/Makefile
3# used by devel/py-gobject3-common/Makefile 3# used by devel/py-gobject3-common/Makefile
4 4
5DISTNAME= pygobject-3.34.0 5DISTNAME= pygobject-3.34.0
6CATEGORIES= devel gnome 6CATEGORIES= devel gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER?= prlw1@cam.ac.uk 10MAINTAINER?= prlw1@cam.ac.uk
11HOMEPAGE= https://pygobject.readthedocs.io/ 11HOMEPAGE= https://pygobject.readthedocs.io/
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15USE_LANGUAGES= c c99 15USE_LANGUAGES= c c99
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17 17
18DISTINFO_FILE= ../../devel/py-gobject3/distinfo 18DISTINFO_FILE= ../../devel/py-gobject3/distinfo
19#PATCHDIR= ../../devel/py-gobject3/patches 19#PATCHDIR= ../../devel/py-gobject3/patches
20 20
21CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4 21CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4
22CONFLICTS+= ${PYPKGPREFIX}-gobject<2.28.6nb4 22CONFLICTS+= ${PYPKGPREFIX}-gobject<2.28.6nb4
23 
24BUILDLINK_API_DEPENDS.glib2= glib2>=2.48.0 
25.include "../../devel/glib2/buildlink3.mk" 
26BUILDLINK_API_DEPENDS.gobject-introspection= gobject-introspection>=1.46.0 
27.include "../../devel/gobject-introspection/buildlink3.mk" 
28.include "../../devel/libffi/buildlink3.mk" 
29 
30.include "../../lang/python/pyversion.mk" 
cvs diff -r1.5 -r1.6 pkgsrc/devel/py-gobject3-common/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-gobject3-common/Makefile 2019/09/22 17:52:41 1.5
+++ pkgsrc/devel/py-gobject3-common/Makefile 2019/09/26 10:36:33 1.6
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.5 2019/09/22 17:52:41 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.6 2019/09/26 10:36:33 prlw1 Exp $
2 
3PYTHON_FOR_BUILD_ONLY= yes 
4 2
5.include "../../devel/py-gobject3/Makefile.common" 3.include "../../devel/py-gobject3/Makefile.common"
6 4
7PKGNAME= py-${DISTNAME:S/^py//:S/-/3-common-/} 5PKGNAME= py-${DISTNAME:S/^py//:S/-/3-common-/}
 6PKGREVISION= 1
8 7
9COMMENT= Python version independent files for glib2 gobject bindings 8COMMENT= Python version independent files for glib2 gobject bindings
10 9
11SUBST_CLASSES+= configurepc 10SUBST_CLASSES+= configurepc
12SUBST_STAGE.configurepc= do-configure 11SUBST_STAGE.configurepc= do-configure
13SUBST_MESSAGE.configurepc= Create .pc file 12SUBST_MESSAGE.configurepc= Create .pc file
14SUBST_FILES.configurepc= pygobject-3.0.pc.in 13SUBST_FILES.configurepc= pygobject-3.0.pc.in
15SUBST_SED.configurepc= -e 's,@prefix@,${PREFIX},' 14SUBST_SED.configurepc= -e 's,@prefix@,${PREFIX},'
16SUBST_SED.configurepc+= -e 's,@exec_prefix@,$${prefix},' 15SUBST_SED.configurepc+= -e 's,@exec_prefix@,$${prefix},'
17SUBST_SED.configurepc+= -e 's,@includedir@,$${prefix}/include,' 16SUBST_SED.configurepc+= -e 's,@includedir@,$${prefix}/include,'
18SUBST_SED.configurepc+= -e 's,@datarootdir@,$${prefix}/share,' 17SUBST_SED.configurepc+= -e 's,@datarootdir@,$${prefix}/share,'
19SUBST_SED.configurepc+= -e 's,@datadir@,$${datarootdir},' 18SUBST_SED.configurepc+= -e 's,@datadir@,$${datarootdir},'
20SUBST_SED.configurepc+= -e 's,@VERSION@,${PKGVERSION},' 19SUBST_SED.configurepc+= -e 's,@VERSION@,${PKGVERSION},'