Update dependencies, make mozilla optional for the gtkmozembed module.

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

3 files changed, 32 insertions, 5 deletions

diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 90f4851fc..1c0b83d71 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.9.1
+PORTVERSION=	2.9.2
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -21,12 +21,14 @@ COMMENT=	A set of Python bindings for GNOME 2
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/_gnome.so:${PORTSDIR}/x11-toolkits/py-gnome2
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/_gnome.so:${PORTSDIR}/x11-toolkits/py-gnome2
 
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+
 LATEST_LINK=	py-gnome-extras
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack libgnomeprintui libgtkhtml gnomepanel \
-		nautilus2 pygtk2
+		gtksourceview libwnck
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -36,6 +38,16 @@ EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
 
 CONFLICTS=	py*-gnome-1*
 
+.include <bsd.port.pre.mk>
+
+.if exists(${X11BASE}/libdata/pkgconfig/mozilla-gtkmozembed.pc) || defined(WITH_MOZILLA)
+BUILD_DEPENDS+=	${X11BASE}/lib/mozilla/components/libwidget_gtk2.so:${PORTSDIR}/www/mozilla
+RUN_DEPENDS+=	${X11BASE}/lib/mozilla/components/libwidget_gtk2.so:${PORTSDIR}/www/mozilla
+PLIST_SUB+=	MOZILLA=""
+.else
+PLIST_SUB+=	MOZILLA="@comment "
+.endif
+
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${EG_DST_DIR}
@@ -45,4 +57,11 @@ post-install:
 	${FIND} ${EG_DST_DIR} -type f -print | ${XARGS} ${CHMOD} 0444
 .endif
 
-.include <bsd.port.mk>
+pre-everything::
+.ifndef(WITH_MOZILLA)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Set WITH_MOZILLA to enable build of python gtkmozembed module"
+	@${ECHO_MSG} ""
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo
index cc5682a7a..835db1d8d 100644
--- a/x11-toolkits/py-gnome-extras/distinfo
+++ b/x11-toolkits/py-gnome-extras/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-python-extras-2.9.1.tar.bz2) = 6ceaa4cae4535dfaaf2ce4120dd791e9
-SIZE (gnome2/gnome-python-extras-2.9.1.tar.bz2) = 309260
+MD5 (gnome2/gnome-python-extras-2.9.2.tar.bz2) = a1639143a40ab1a78de69ddb7ecf0cfd
+SIZE (gnome2/gnome-python-extras-2.9.2.tar.bz2) = 318457
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 851f27459..472f9e79e 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -13,13 +13,19 @@
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.so
+%%MOZILLA%%%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembedmodule.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceviewmodule.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
+%%PYTHON_SITELIBDIR%%/gtkspell.so
 libdata/pkgconfig/gnome-python-extras-2.0.pc
 %%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
 %%PORTDOCS%%share/examples/py-gnome/applet/README
 %%PORTDOCS%%share/examples/py-gnome/applet/applet.py
 %%PORTDOCS%%share/examples/py-gnome/egg/trayicon.py
+%%PORTDOCS%%share/examples/py-gnome/egg/recent/Bonobo_Sample_Hello.xml
+%%PORTDOCS%%share/examples/py-gnome/egg/recent/bonobo-view.py
+%%PORTDOCS%%share/examples/py-gnome/egg/recent/gtk-view.py
+%%PORTDOCS%%share/examples/py-gnome/egg/recent/populate-recent.py
 %%PORTDOCS%%share/examples/py-gnome/gnomeprint/README
 %%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_01.py
 %%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_02.py
@@ -36,6 +42,7 @@ libdata/pkgconfig/gnome-python-extras-2.0.pc
 %%PORTDOCS%%share/examples/py-gnome/gnomeprint/test-print.py
 %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
 %%PORTDOCS%%share/examples/py-gnome/gtksourceview/test-widget.py
+%%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
 share/pygtk/2.0/defs/applet.defs
 share/pygtk/2.0/defs/art.defs
 share/pygtk/2.0/defs/gtkhtml2.defs
@@ -46,5 +53,6 @@ share/pygtk/2.0/defs/wnck.defs
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gtkhtml2
 %%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
+%%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg
 %%PORTDOCS%%@dirrm share/examples/py-gnome/applet