Sync w/ FreeBSD ports tree that I have committed since a few days.

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

5 files changed, 32 insertions, 25 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index d825cef49..444708940 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.84 2012/08/22 14:44:37 kwm Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.85 2012/12/14 16:09:28 kwm Exp $
 
 PORTNAME=	gvfs
 PORTVERSION=	1.12.3
@@ -24,7 +24,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-obexftp
+CONFIGURE_ARGS=	--disable-obexftp \
+		--disable-afc
 
 OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
 OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 11a2e7abf..4ed0994c1 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	py-gobject
-# Date created:				10 January 2006
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.56 2011/10/07 13:30:13 kwm Exp $
-#
+#   $MCom$
 
 PORTNAME=	gobject
 PORTVERSION=	2.28.6
@@ -20,6 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GObject
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
@@ -30,15 +27,21 @@ USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 USE_PYTHON=	2.5+
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-docs --disable-introspection
 
-CONFLICTS=	py*-gtk-0* 
+CONFLICTS=	py*-gtk-0*
 PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
 
-.if exists(${LOCALBASE}/lib/libffi.so)
-LIB_DEPENDS+=	ffi.5:${PORTSDIR}/devel/libffi
+OPTIONS_DEFINE=	LIBFFI
+LIBFFI_DESC=	Enable libffi support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLIBFFI}
+LIB_DEPENDS+=	ffi:${PORTSDIR}/devel/libffi
 CONFIGURE_ARGS+=--with-ffi
 .else
 CONFIGURE_ARGS+=--without-ffi
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index 30b42c982..771874406 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -1,9 +1,9 @@
 bin/pygobject-codegen-2.0
 include/pygtk-2.0/pyglib.h
 include/pygtk-2.0/pygobject.h
-lib/libpyglib-2.0-python2.7.la
-lib/libpyglib-2.0-python2.7.so
-lib/libpyglib-2.0-python2.7.so.0
+lib/libpyglib-2.0-python%%PYTHON_VER%%.la
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/glib/__init__.py
 %%PYTHON_SITELIBDIR%%/glib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glib/__init__.pyo
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index c81b5970e..1e460e912 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	py-gobject
-# Date created:				10 January 2006
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject3/Makefile,v 1.9 2012/05/01 11:41:22 kwm Exp $
-#
+#   $MCom$
 
 PORTNAME=	gobject
 PORTVERSION=	3.2.2
@@ -19,6 +15,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GObject
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
@@ -30,6 +27,7 @@ USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 USE_PYTHON=	2.5+
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -38,8 +36,13 @@ 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}"
 
-.if exists(${LOCALBASE}/lib/libffi.so)
-LIB_DEPENDS+=	ffi.5:${PORTSDIR}/devel/libffi
+OPTIONS_DEFINE=	LIBFFI
+LIBFFI_DESC=	Enable libffi support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLIBFFI}
+LIB_DEPENDS+=	ffi:${PORTSDIR}/devel/libffi
 CONFIGURE_ARGS+=--with-ffi
 .else
 CONFIGURE_ARGS+=--without-ffi
diff --git a/devel/py-gobject3/pkg-plist b/devel/py-gobject3/pkg-plist
index 8ccd8110c..5f1351539 100644
--- a/devel/py-gobject3/pkg-plist
+++ b/devel/py-gobject3/pkg-plist
@@ -1,7 +1,7 @@
 include/pygobject-3.0/pygobject.h
-lib/libpyglib-gi-2.0-python2.7.la
-lib/libpyglib-gi-2.0-python2.7.so
-lib/libpyglib-gi-2.0-python2.7.so.0
+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