Update to 2.9.3, and add a lot of new module support. Also, make Mozilla

mandatory, and add support for mozilla-devel.


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

5 files changed, 75 insertions, 21 deletions

diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 1c0b83d71..6271fae84 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.9.2
+PORTVERSION=	2.9.3
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -19,35 +19,54 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of Python bindings for GNOME 2
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/_gnome.so:${PORTSDIR}/x11-toolkits/py-gnome2
+LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \
+		gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
+		totem-plparser.0:${PORTSDIR}/multimedia/totem-gstreamer
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/_gnome.so:${PORTSDIR}/x11-toolkits/py-gnome2
 
-LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+MOZILLA=	mozilla
+HEADERS_SUFX=
+
+.if !defined(WITH_MOZILLA)
+MOZILLA=	mozilla
+HEADERS_SUFX=
+.else
+.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
+MOZILLA=	mozilla-devel
+HEADERS_SUFX=	-devel
+.else
+MOZILLA=	mozilla
+HEADERS_SUFX=
+.endif
+.endif
 
-LATEST_LINK=	py-gnome-extras
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack libgnomeprintui libgtkhtml gnomepanel \
-		gtksourceview libwnck
+		gtksourceview libwnck nautiluscdburner
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 EG_SRC_DIR=	${WRKSRC}/examples
 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 "
+.if ${OSVERSION} < 500000
+.if ${MOZILLA}=="mozilla-devel"
+USE_GCC=	3.4
+.endif
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \
+		s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g ; \
+		s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \
+		s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \
+		${WRKSRC}/configure
+
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${EG_DST_DIR}
@@ -58,10 +77,11 @@ post-install:
 .endif
 
 pre-everything::
-.ifndef(WITH_MOZILLA)
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Set WITH_MOZILLA to enable build of python gtkmozembed module"
+	@${ECHO_MSG} " By default py-gnome-extras uses www/mozilla for html rendering, but you can"
+	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "  mozilla-devel "
 	@${ECHO_MSG} ""
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 835db1d8d..feee95bdb 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-python-extras-2.9.2.tar.bz2) = a1639143a40ab1a78de69ddb7ecf0cfd
-SIZE (gnome2/gnome-python-extras-2.9.2.tar.bz2) = 318457
+MD5 (gnome2/gnome-python-extras-2.9.3.tar.bz2) = fe65f1b8c71a5dc24c378631b095f6b3
+SIZE (gnome2/gnome-python-extras-2.9.3.tar.bz2) = 344936
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-Makefile.in b/x11-toolkits/py-gnome-desktop/files/patch-Makefile.in
new file mode 100644
index 000000000..89faafbdc
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Jan 28 14:22:51 2005
++++ Makefile.in	Fri Jan 28 14:23:04 2005
+@@ -43,7 +43,7 @@
+ @BUILD_WNCK_TRUE@am__append_5 = wnck
+ @BUILD_GTKMOZEMBED_TRUE@am__append_6 = gtkmozembed
+ @BUILD_GTKSPELL_TRUE@am__append_7 = gtkspell
+-@BUILD_GDL_TRUE@am__append_8 = gdl
++@BUILD_GDL_TRUE@am__append_8 =
+ @BUILD_TOTEM_PLPARSER_TRUE@am__append_9 = totem
+ @BUILD_GTOP_TRUE@am__append_10 = gtop
+ @BUILD_NAUTILUSBURN_TRUE@am__append_11 = nautilusburn
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
new file mode 100644
index 000000000..98e0b4ff8
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
@@ -0,0 +1,10 @@
+--- gtop/gtop.c.orig	Fri Jan 28 14:09:00 2005
++++ gtop/gtop.c	Fri Jan 28 14:09:18 2005
+@@ -43,6 +43,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ 
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
index 472f9e79e..e2a1e1903 100644
--- a/x11-toolkits/py-gnome-desktop/pkg-plist
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -13,10 +13,16 @@
 %%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/gtkmozembed.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.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
@@ -26,6 +32,7 @@ libdata/pkgconfig/gnome-python-extras-2.0.pc
 %%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/gdl/gdl_test.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
@@ -43,9 +50,14 @@ libdata/pkgconfig/gnome-python-extras-2.0.pc
 %%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
+%%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
+%%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
+%%PORTDOCS%%share/examples/py-gnome/nautilusburn/write_iso.py
 share/pygtk/2.0/defs/applet.defs
 share/pygtk/2.0/defs/art.defs
 share/pygtk/2.0/defs/gtkhtml2.defs
+share/pygtk/2.0/defs/nautilus_burn.defs
+share/pygtk/2.0/defs/nb_drive_selection.defs
 share/pygtk/2.0/defs/print.defs
 share/pygtk/2.0/defs/printui.defs
 share/pygtk/2.0/defs/trayicon.defs
@@ -56,3 +68,4 @@ share/pygtk/2.0/defs/wnck.defs
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
 %%PORTDOCS%%@dirrm share/examples/py-gnome/egg
 %%PORTDOCS%%@dirrm share/examples/py-gnome/applet
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem