CVS commit: pkgsrc/devel

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Thu Sep 26 10:36:33 UTC 2019

Modified Files:
        pkgsrc/devel/py-gobject3: Makefile Makefile.common
        pkgsrc/devel/py-gobject3-common: Makefile

Log Message:
As py-gobject3-common has shrunk to just copying 2 files, remove all the
python parafinalia from it.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/py-gobject3/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-gobject3/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-gobject3-common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-gobject3/Makefile
diff -u pkgsrc/devel/py-gobject3/Makefile:1.36 pkgsrc/devel/py-gobject3/Makefile:1.37
--- pkgsrc/devel/py-gobject3/Makefile:1.36      Sun Sep 22 17:52:41 2019
+++ pkgsrc/devel/py-gobject3/Makefile   Thu Sep 26 10:36:33 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2019/09/22 17:52:41 prlw1 Exp $
+# $NetBSD: Makefile,v 1.37 2019/09/26 10:36:33 prlw1 Exp $
 
 .include "Makefile.common"
 
+
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//:S/-/3-/}
+PKGREVISION=   1
 EGG_NAME=      ${DISTNAME:S/pygobject/PyGObject/}
 
 COMMENT=       Python bindings for glib2 gobject
@@ -11,12 +13,17 @@ MESON_ARGS+=        -Dpython=${PYTHONBIN:Q}
 MESON_ARGS+=   -Dtests=false
 TEST_TARGET=   check
 
-# XXX shouldn't be necessary with -Dinstall-common=false
+# Leave for py-gobject3-common:
 post-install:
        ${RM} \
        ${DESTDIR}${PREFIX}/include/pygobject-3.0/pygobject.h \
        ${DESTDIR}${PREFIX}/lib/pkgconfig/pygobject-3.0.pc
 
+BUILDLINK_API_DEPENDS.glib2=   glib2>=2.48.0
+.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gobject-introspection=   gobject-introspection>=1.46.0
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/py-gobject3-common/buildlink3.mk"
 .include "../../devel/py-meson/build.mk"
 # https://bugzilla.gnome.org/show_bug.cgi?id=685094

Index: pkgsrc/devel/py-gobject3/Makefile.common
diff -u pkgsrc/devel/py-gobject3/Makefile.common:1.14 pkgsrc/devel/py-gobject3/Makefile.common:1.15
--- pkgsrc/devel/py-gobject3/Makefile.common:1.14       Sun Sep 22 17:52:41 2019
+++ pkgsrc/devel/py-gobject3/Makefile.common    Thu Sep 26 10:36:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2019/09/22 17:52:41 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.15 2019/09/26 10:36:33 prlw1 Exp $
 # used by devel/py-gobject3/Makefile
 # used by devel/py-gobject3-common/Makefile
 
@@ -20,11 +20,3 @@ DISTINFO_FILE=               ../../devel/py-gobject3/
 
 CONFLICTS+=            ${PYPKGPREFIX}-gtk2<2.8.4
 CONFLICTS+=            ${PYPKGPREFIX}-gobject<2.28.6nb4
-
-BUILDLINK_API_DEPENDS.glib2=   glib2>=2.48.0
-.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gobject-introspection=   gobject-introspection>=1.46.0
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/libffi/buildlink3.mk"
-
-.include "../../lang/python/pyversion.mk"

Index: pkgsrc/devel/py-gobject3-common/Makefile
diff -u pkgsrc/devel/py-gobject3-common/Makefile:1.5 pkgsrc/devel/py-gobject3-common/Makefile:1.6
--- pkgsrc/devel/py-gobject3-common/Makefile:1.5        Sun Sep 22 17:52:41 2019
+++ pkgsrc/devel/py-gobject3-common/Makefile    Thu Sep 26 10:36:33 2019
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/09/22 17:52:41 prlw1 Exp $
-
-PYTHON_FOR_BUILD_ONLY= yes
+# $NetBSD: Makefile,v 1.6 2019/09/26 10:36:33 prlw1 Exp $
 
 .include "../../devel/py-gobject3/Makefile.common"
 
 PKGNAME=       py-${DISTNAME:S/^py//:S/-/3-common-/}
+PKGREVISION=   1
 
 COMMENT=       Python version independent files for glib2 gobject bindings