also build the gtkmozembed module, bump PKGREVISION

4 files changed, 36 insertions, 6 deletions

diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index 46ca8146e2f..6722ecab4b8 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2007/06/05 05:37:40 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/03 09:39:57 drochner Exp $
 #
 
 DISTNAME=	gnome-python-extras-2.14.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,19 +17,24 @@ USE_LIBTOOL=	YES
 PKGCONFIG_OVERRIDE+=	gnome-python-extras-2.0.pc.in
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		pkg-config gmake
 
 PYTHON_VERSIONS_ACCEPTED=	24
 
+SUBST_CLASSES+=	ffhome
+SUBST_STAGE.ffhome=	pre-configure
+SUBST_FILES.ffhome=	gtkmozembed/gtkmozembedmodule.c
+SUBST_VARS.ffhome=	LOCALBASE
+
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 
 .include "../../www/libgtkhtml/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
-# XXX optional? or firefox?
 # seamonkey untested.
 #.include "../../www/seamonkey/buildlink3.mk"
+.include "../../www/firefox/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../devel/gdl/buildlink3.mk"
 # needs older version than is in pkgsrc
diff --git a/x11/py-gnome2-extras/PLIST b/x11/py-gnome2-extras/PLIST
index 9822c1fa5e6..20f968000d9 100644
--- a/x11/py-gnome2-extras/PLIST
+++ b/x11/py-gnome2-extras/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/04 09:32:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/09/03 09:39:57 drochner Exp $
 lib/pkgconfig/gnome-python-extras-2.0.pc
 ${PYSITELIB}/gtk-2.0/egg/__init__.py
 ${PYSITELIB}/gtk-2.0/egg/__init__.pyc
@@ -10,6 +10,7 @@ ${PYSITELIB}/gtk-2.0/gksu/__init__.py
 ${PYSITELIB}/gtk-2.0/gksu/__init__.pyc
 ${PYSITELIB}/gtk-2.0/gksu/__init__.pyo
 ${PYSITELIB}/gtk-2.0/gtkhtml2.la
+${PYSITELIB}/gtk-2.0/gtkmozembed.la
 ${PYSITELIB}/gtk-2.0/gtkspell.la
 share/gtk-doc/html/pygtkmozembed/class-gtkmozembed.html
 share/gtk-doc/html/pygtkmozembed/gtkmozembed-class-reference.html
@@ -22,6 +23,7 @@ share/gtk-doc/html/pygtkspell/index.html
 share/gtk-doc/html/pygtkspell/index.sgml
 share/gtk-doc/html/pygtkspell/pygtkspell.devhelp
 share/pygtk/2.0/defs/gtkhtml2.defs
+share/pygtk/2.0/defs/gtkmozembed.defs
 share/pygtk/2.0/defs/trayicon.defs
 @dirrm share/gtk-doc/html/pygtkspell
 @dirrm share/gtk-doc/html/pygtkmozembed
diff --git a/x11/py-gnome2-extras/distinfo b/x11/py-gnome2-extras/distinfo
index 1b2aa71509c..1035324a873 100644
--- a/x11/py-gnome2-extras/distinfo
+++ b/x11/py-gnome2-extras/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/02/04 09:32:19 wiz Exp $
+$NetBSD: distinfo,v 1.6 2007/09/03 09:39:57 drochner Exp $
 
 SHA1 (gnome-python-extras-2.14.2.tar.bz2) = 0e5a3288864d652d7f0862ce85ef4d634d90b217
 RMD160 (gnome-python-extras-2.14.2.tar.bz2) = d2707eee20a103f070455fef3bd9cddc1060ce93
 Size (gnome-python-extras-2.14.2.tar.bz2) = 351780 bytes
+SHA1 (patch-aa) = ca71fde88d061e79c8711a9233583dfc26050dd9
diff --git a/x11/py-gnome2-extras/patches/patch-aa b/x11/py-gnome2-extras/patches/patch-aa
new file mode 100644
index 00000000000..52cb47efcfc
--- /dev/null
+++ b/x11/py-gnome2-extras/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.4 2007/09/03 09:39:58 drochner Exp $
+
+--- gtkmozembed/gtkmozembedmodule.c.orig	2004-12-15 01:30:45.000000000 +0100
++++ gtkmozembed/gtkmozembedmodule.c
+@@ -5,6 +5,8 @@
+ /* include this first, before NO_IMPORT_PYGOBJECT is defined */
+ #include <pygobject.h>
+ 
++#include <stdlib.h>
++
+ void pygtkmozembed_register_classes (PyObject *d);
+ void pygtkmozembed_add_constants(PyObject *module, const gchar *strip_prefix);
+ 
+@@ -15,6 +17,8 @@ initgtkmozembed(void)
+ {
+     PyObject *m, *d;
+ 
++    setenv("MOZILLA_FIVE_HOME", "@LOCALBASE@/lib/firefox", 1);
++
+     init_pygobject ();
+ 
+     m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);