Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 23 insertions, 75 deletions

diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index 93ad0fad5..564f40904 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -2,51 +2,16 @@
 # $FreeBSD$
 #   $MCom$
 
-PORTNAME=	gobject
-PORTVERSION=	3.8.1
-CATEGORIES=	devel python
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+PORTREVISION=	1
+
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	3
-DISTNAME=	pygobject-${PORTVERSION}
-DIST_SUBDIR=	gnome3
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Python bindings for GObject
-
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-
-USE_XZ=		yes
-USES=		gmake pathfix pkgconfig
-USE_GNOME=	glib20 introspection
-USE_PYTHON=	2.6+
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-# this port doesn't work with py-gobject < 2.28.6_2, clungle below
-CONFLICTS=	py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \
-		py*-gobject-2.*.6_1
-
-PLIST_SUB=	PYTHON_VER="${PYTHON_VER}" ARCH=${ARCH} UNAME_R=${UNAME_R} \
-		VERSION=${PORTVERSION}
-
-.include <bsd.port.pre.mk>
 
-UNAME_R!=	${UNAME} -r
+COMMENT=	Python 2 bindings for GObject
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|SUBDIRS = examples gi tests|SUBDIRS = examples gi|g' \
-		${WRKSRC}/Makefile.in
+SLAVE_PORT=	python2
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyglib-gi-2.0-${PYTHON_VERSION}.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gi/*.so
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gi/*/*.so
+MASTERDIR=	${.CURDIR}/../../devel/pygobject3-common
+PLIST=		${.CURDIR}/pkg-plist
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/py-gobject3/distinfo b/devel/py-gobject3/distinfo
deleted file mode 100644
index 9b1d53617..000000000
--- a/devel/py-gobject3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/pygobject-3.8.1.tar.xz) = e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb
-SIZE (gnome3/pygobject-3.8.1.tar.xz) = 652864
diff --git a/devel/py-gobject3/pkg-descr b/devel/py-gobject3/pkg-descr
deleted file mode 100644
index eded7fcd4..000000000
--- a/devel/py-gobject3/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-PyGObject provides a convenient wrapper for the GObject+ library for use
-in Python programs, and takes care of many of the boring details such as
-managing memory and type casting.  When combined with PyGTK, PyORBit and
-gnome-python, it can be used to write full featured Gnome applications.
diff --git a/devel/py-gobject3/pkg-plist b/devel/py-gobject3/pkg-plist
index 8b8029063..1309cb7eb 100644
--- a/devel/py-gobject3/pkg-plist
+++ b/devel/py-gobject3/pkg-plist
@@ -1,36 +1,28 @@
-include/pygobject-3.0/pygobject.h
-lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.la
-lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so
-lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gi/__init__.py
 %%PYTHON_SITELIBDIR%%/gi/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gi/_constants.py
+%%PYTHON_SITELIBDIR%%/gi/_constants.pyc
+%%PYTHON_SITELIBDIR%%/gi/_constants.pyo
 %%PYTHON_SITELIBDIR%%/gi/_gi.la
 %%PYTHON_SITELIBDIR%%/gi/_gi.so
 %%PYTHON_SITELIBDIR%%/gi/_gi_cairo.la
 %%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
-%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/_glib/_glib.la
-%%PYTHON_SITELIBDIR%%/gi/_glib/_glib.so
-%%PYTHON_SITELIBDIR%%/gi/_glib/option.py
-%%PYTHON_SITELIBDIR%%/gi/_glib/option.pyc
-%%PYTHON_SITELIBDIR%%/gi/_glib/option.pyo
 %%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py
 %%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/_gobject/_gobject.la
-%%PYTHON_SITELIBDIR%%/gi/_gobject/_gobject.so
-%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.py
-%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.pyc
-%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.pyo
-%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.py
-%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.pyc
-%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.pyo
-%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.py
-%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.pyc
-%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.pyo
+%%PYTHON_SITELIBDIR%%/gi/_option.py
+%%PYTHON_SITELIBDIR%%/gi/_option.pyc
+%%PYTHON_SITELIBDIR%%/gi/_option.pyo
+%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
+%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.pyc
+%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.pyo
+%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
+%%PYTHON_SITELIBDIR%%/gi/_signalhelper.pyc
+%%PYTHON_SITELIBDIR%%/gi/_signalhelper.pyo
+%%PYTHON_SITELIBDIR%%/gi/docstring.py
+%%PYTHON_SITELIBDIR%%/gi/docstring.pyc
+%%PYTHON_SITELIBDIR%%/gi/docstring.pyo
 %%PYTHON_SITELIBDIR%%/gi/importer.py
 %%PYTHON_SITELIBDIR%%/gi/importer.pyc
 %%PYTHON_SITELIBDIR%%/gi/importer.pyo
@@ -73,7 +65,7 @@ lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gi/types.py
 %%PYTHON_SITELIBDIR%%/gi/types.pyc
 %%PYTHON_SITELIBDIR%%/gi/types.pyo
-%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-pypython%%PYTHON_VER%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info
+%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VERSION%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info
 %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
 %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo
@@ -83,11 +75,8 @@ lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
 %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc
 %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo
-libdata/pkgconfig/pygobject-3.0.pc
 @dirrm %%PYTHON_SITELIBDIR%%/pygtkcompat
 @dirrm %%PYTHON_SITELIBDIR%%/gi/repository
 @dirrm %%PYTHON_SITELIBDIR%%/gi/overrides
 @dirrm %%PYTHON_SITELIBDIR%%/gi/_gobject
-@dirrm %%PYTHON_SITELIBDIR%%/gi/_glib
 @dirrm %%PYTHON_SITELIBDIR%%/gi
-@dirrmtry include/pygobject-3.0