Tue Dec 4 14:54:34 2012 UTC ()
Fix solaris build from Richard Palo in PR47275.

Although neither our egg.mk nor distutils.mk files use PLATFORM in
EGG_NAME, egg{,-info} filenames are of the form

  name ["-" version ["-py" pyver ["-" required_platform]]] "." ext

As pygobject is C based, they chose to include required_platform in the
egg name. As per the patch, PLATFORM is the output of python's
get_platform() function, which is not just uname() output, but a
modified version of it on solaris. (Stricly, get_build_platform() might
be even more correct, but would require a depency on setuputils.)


(prlw1)
diff -r1.9 -r1.10 pkgsrc/devel/py-gobject3/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/py-gobject3/PLIST
cvs diff -r1.9 -r1.10 pkgsrc/devel/py-gobject3/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-gobject3/Makefile 2012/10/26 10:18:42 1.9
+++ pkgsrc/devel/py-gobject3/Makefile 2012/12/04 14:54:34 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2012/10/26 10:18:42 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.10 2012/12/04 14:54:34 prlw1 Exp $
2# 2#
3 3
4DISTNAME= pygobject-3.4.1.1 4DISTNAME= pygobject-3.4.1.1
5PKGNAME= ${PYPKGPREFIX}-gobject3-3.4.1.1 5PKGNAME= ${PYPKGPREFIX}-gobject3-3.4.1.1
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/3.4/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/3.4/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= prlw1@cam.ac.uk 10MAINTAINER= prlw1@cam.ac.uk
11HOMEPAGE= http://www.pygtk.org/ 11HOMEPAGE= http://www.pygtk.org/
12COMMENT= Python bindings for glib2 gobject 12COMMENT= Python bindings for glib2 gobject
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
@@ -22,24 +22,25 @@ PKGCONFIG_OVERRIDE+= pygobject-3.4.pc.in @@ -22,24 +22,25 @@ PKGCONFIG_OVERRIDE+= pygobject-3.4.pc.in
22PY_PATCHPLIST= yes 22PY_PATCHPLIST= yes
23PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} 23PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
24CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4 24CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4
25CONFLICTS+= ${PYPKGPREFIX}-gobject<2.28.6nb4 25CONFLICTS+= ${PYPKGPREFIX}-gobject<2.28.6nb4
26 26
27REPLACE_PYTHON+= docs/xsl/fixxref.py.in 27REPLACE_PYTHON+= docs/xsl/fixxref.py.in
28 28
29# needed for tests only 29# needed for tests only
30# https://bugzilla.gnome.org/show_bug.cgi?id=685094 30# https://bugzilla.gnome.org/show_bug.cgi?id=685094
31.include "../../graphics/cairo/buildlink3.mk" 31.include "../../graphics/cairo/buildlink3.mk"
32.include "../../graphics/cairo-gobject/buildlink3.mk" 32.include "../../graphics/cairo-gobject/buildlink3.mk"
33TEST_TARGET= check 33TEST_TARGET= check
34 34
35# for the egg 
36UNAME_M!= uname -m 
37PLIST_SUBST+= UNAME_M=${UNAME_M:Q} 
38 
39.include "../../lang/python/extension.mk" 35.include "../../lang/python/extension.mk"
40.include "../../lang/python/application.mk" 36.include "../../lang/python/application.mk"
 37
 38# for the egg
 39PLATFORM!= ${PYTHONBIN:Q} -c "import sys; from distutils import util; sys.stdout.write(util.get_platform())"
 40PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
 41
41.include "../../graphics/py-cairo/buildlink3.mk" 42.include "../../graphics/py-cairo/buildlink3.mk"
42.include "../../devel/glib2/buildlink3.mk" 43.include "../../devel/glib2/buildlink3.mk"
43BUILDLINK_API_DEPENDS.gobject-introspection= gobject-introspection>=1.34.1.1 44BUILDLINK_API_DEPENDS.gobject-introspection= gobject-introspection>=1.34.1.1
44.include "../../devel/gobject-introspection/buildlink3.mk" 45.include "../../devel/gobject-introspection/buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/py-gobject3/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/py-gobject3/PLIST 2012/10/26 10:18:42 1.3
+++ pkgsrc/devel/py-gobject3/PLIST 2012/12/04 14:54:34 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2012/10/26 10:18:42 prlw1 Exp $ 1@comment $NetBSD: PLIST,v 1.4 2012/12/04 14:54:34 prlw1 Exp $
2include/pygobject-3.0/pygobject.h 2include/pygobject-3.0/pygobject.h
3lib/libpyglib-gi-2.0-python${PYVERSSUFFIX}.la 3lib/libpyglib-gi-2.0-python${PYVERSSUFFIX}.la
4lib/pkgconfig/pygobject-3.0.pc 4lib/pkgconfig/pygobject-3.0.pc
5${PYSITELIB}/gi/__init__.py 5${PYSITELIB}/gi/__init__.py
6${PYSITELIB}/gi/__init__.pyc 6${PYSITELIB}/gi/__init__.pyc
7${PYSITELIB}/gi/__init__.pyo 7${PYSITELIB}/gi/__init__.pyo
8${PYSITELIB}/gi/_gi.la 8${PYSITELIB}/gi/_gi.la
9${PYSITELIB}/gi/_gi_cairo.la 9${PYSITELIB}/gi/_gi_cairo.la
10${PYSITELIB}/gi/_glib/__init__.py 10${PYSITELIB}/gi/_glib/__init__.py
11${PYSITELIB}/gi/_glib/__init__.pyc 11${PYSITELIB}/gi/_glib/__init__.pyc
12${PYSITELIB}/gi/_glib/__init__.pyo 12${PYSITELIB}/gi/_glib/__init__.pyo
13${PYSITELIB}/gi/_glib/_glib.la 13${PYSITELIB}/gi/_glib/_glib.la
14${PYSITELIB}/gi/_glib/option.py 14${PYSITELIB}/gi/_glib/option.py
@@ -56,14 +56,14 @@ ${PYSITELIB}/gi/overrides/__init__.pyc @@ -56,14 +56,14 @@ ${PYSITELIB}/gi/overrides/__init__.pyc
56${PYSITELIB}/gi/overrides/__init__.pyo 56${PYSITELIB}/gi/overrides/__init__.pyo
57${PYSITELIB}/gi/overrides/keysyms.py 57${PYSITELIB}/gi/overrides/keysyms.py
58${PYSITELIB}/gi/overrides/keysyms.pyc 58${PYSITELIB}/gi/overrides/keysyms.pyc
59${PYSITELIB}/gi/overrides/keysyms.pyo 59${PYSITELIB}/gi/overrides/keysyms.pyo
60${PYSITELIB}/gi/pygtkcompat.py 60${PYSITELIB}/gi/pygtkcompat.py
61${PYSITELIB}/gi/pygtkcompat.pyc 61${PYSITELIB}/gi/pygtkcompat.pyc
62${PYSITELIB}/gi/pygtkcompat.pyo 62${PYSITELIB}/gi/pygtkcompat.pyo
63${PYSITELIB}/gi/repository/__init__.py 63${PYSITELIB}/gi/repository/__init__.py
64${PYSITELIB}/gi/repository/__init__.pyc 64${PYSITELIB}/gi/repository/__init__.pyc
65${PYSITELIB}/gi/repository/__init__.pyo 65${PYSITELIB}/gi/repository/__init__.pyo
66${PYSITELIB}/gi/types.py 66${PYSITELIB}/gi/types.py
67${PYSITELIB}/gi/types.pyc 67${PYSITELIB}/gi/types.pyc
68${PYSITELIB}/gi/types.pyo 68${PYSITELIB}/gi/types.pyo
69${PYSITELIB}/pygobject-3.4.1.1-py${PYVERSSUFFIX}-${LOWER_OPSYS}-${OS_VERSION}-${UNAME_M}.egg-info 69${PYSITELIB}/pygobject-${PKGVERSION}-py${PYVERSSUFFIX}-${PLATFORM}.egg-info