From 0e61a893fcc4b17a9e8f076a932b2372b639ec7c Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 18 Apr 2013 09:00:28 +0000 Subject: [PATCH] Several fixes: * unfuck pkgpath for the python3 -main package * set RUN_DEPENDS-common to empty --- devel/py-gobject3/Makefile | 8 +++++--- devel/py-gobject3/pkg/PFRAG.python3-main | 3 +++ devel/py-gobject3/pkg/PLIST-main | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 devel/py-gobject3/pkg/PFRAG.python3-main diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile index 2d651bf6d22..1381813e956 100644 --- a/devel/py-gobject3/Makefile +++ b/devel/py-gobject3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2013/04/16 10:21:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2013/04/18 09:00:28 ajacoutot Exp $ COMMENT-main= Python bindings for GLib and GObject COMMENT-common= common files for py-gobject3 @@ -11,7 +11,8 @@ PKGNAME-main= py-gobject3-${GNOME_VERSION} FULLPKGNAME-common= py-gobject3-common-${GNOME_VERSION} FULLPKGPATH-common= devel/py-gobject3,-common -REVISION-main= 0 +REVISION-main= 2 +REVISION-common= 0 CATEGORIES= devel @@ -42,6 +43,7 @@ MODULES= devel/gettext \ x11/gnome LIB_DEPENDS-common= #empty +RUN_DEPENDS-common= #empty LIB_DEPENDS-main= ${LIB_DEPENDS} \ devel/gobject-introspection @@ -51,7 +53,7 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \ .if ${FLAVOR:Mpython3} FULLPKGNAME-main= ${PKGNAME-main:S/^py-/py3-/} -FULLPKGPATH-main= devel/py-gobject3,python +FULLPKGPATH-main= devel/py-gobject3,-main${MODPY_FLAVOR} BUILD_DEPENDS += graphics/py3-cairo RUN_DEPENDS-main += graphics/py3-cairo .else diff --git a/devel/py-gobject3/pkg/PFRAG.python3-main b/devel/py-gobject3/pkg/PFRAG.python3-main new file mode 100644 index 00000000000..763b33a48d9 --- /dev/null +++ b/devel/py-gobject3/pkg/PFRAG.python3-main @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.python3-main,v 1.1 2013/04/18 09:00:28 ajacoutot Exp $ +@pkgpath devel/py-gobject3,python +@pkgpath devel/py-gobject3,python3 diff --git a/devel/py-gobject3/pkg/PLIST-main b/devel/py-gobject3/pkg/PLIST-main index fa5b4b6f6bd..9e6b2ad6854 100644 --- a/devel/py-gobject3/pkg/PLIST-main +++ b/devel/py-gobject3/pkg/PLIST-main @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2013/04/16 10:19:08 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.2 2013/04/18 09:00:28 ajacoutot Exp $ @conflict py-gtk2-2.8.6* @conflict py-gobject-<2.28.6p2v0 +%%python3%% !%%python3%% lib/libpyglib-gi-2.0-python${MODPY_VERSION}.a lib/libpyglib-gi-2.0-python${MODPY_VERSION}.la