10 files changed, 248 insertions, 182 deletions

diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index c0dab7619f6e..edd644e9bcb8 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	py-gnome
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.4
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-python
 DISTNAME=	gnome-python-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gtkhtml
+USE_GNOME=	gtkhtml libpanel
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure pygtk/configure
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}				\
diff --git a/x11-toolkits/py-gnome/distinfo b/x11-toolkits/py-gnome/distinfo
index 5a21d7311636..5df73588577b 100644
--- a/x11-toolkits/py-gnome/distinfo
+++ b/x11-toolkits/py-gnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.4.2.tar.gz) = a30fb606888a66bc52f595117c230eaf
+MD5 (gnome/gnome-python-1.4.4.tar.bz2) = b5069c8ac77ba7ad991afceeab332319
diff --git a/x11-toolkits/py-gnome/files/patch-pygnome::Makefile.in b/x11-toolkits/py-gnome/files/patch-pygnome::Makefile.in
deleted file mode 100644
index f5caef94525a..000000000000
--- a/x11-toolkits/py-gnome/files/patch-pygnome::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- pygnome/Makefile.in.orig	Thu Jan  3 15:21:15 2002
-+++ pygnome/Makefile.in	Thu Feb  7 15:35:50 2002
-@@ -123,7 +123,7 @@
- SUBDIRS = generate gnome
- 
- INCLUDES = $(PYTHON_INCLUDES) $(GNOME_INCLUDEDIR) \
--	$(LIBGLADE_CFLAGS)
-+	$(LIBGLADE_CFLAGS) `$(GNOME_CONFIG) --cflags gtkhtml capplet`
- 
- 
- @WITH_APPLETS_TRUE@appletmodule = _appletmodule.la
diff --git a/x11-toolkits/py-gnome/files/patch-pygtk::configure b/x11-toolkits/py-gnome/files/patch-pygtk::configure
index ca4f17c4ef8f..d3a68b8efcfa 100644
--- a/x11-toolkits/py-gnome/files/patch-pygtk::configure
+++ b/x11-toolkits/py-gnome/files/patch-pygtk::configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- pygtk/configure.orig	Thu Jan  3 15:20:58 2002
-+++ pygtk/configure	Sun Jul 14 15:24:57 2002
-@@ -6321,6 +6321,7 @@
+--- pygtk/configure.orig	Sat Aug 24 10:37:08 2002
++++ pygtk/configure	Wed Aug 28 20:20:53 2002
+@@ -7372,6 +7372,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,3 +11,51 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8888,6 +8889,7 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++#include <Python.h>
+ #include <arrayobject.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -8918,6 +8920,7 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
++#include <Python.h>
+ #include <arrayobject.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -8999,6 +9002,7 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++#include <Python.h>
+ #include <Extensions/arrayobject.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -9029,6 +9033,7 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
++#include <Python.h>
+ #include <Extensions/arrayobject.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -9110,6 +9115,7 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++#include <Python.h>
+ #include <Numeric/arrayobject.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -9140,6 +9146,7 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
++#include <Python.h>
+ #include <Numeric/arrayobject.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
diff --git a/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
index 92f764fb8720..06b350c57c5a 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -1,71 +1,68 @@
-lib/%%PYTHON_VERSION%%/site-packages/_appletmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_cappletmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gladegnomemodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gnomemodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gnomeuimodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gtkhtmlmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gtkxmhtmlmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_zvtmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/gettext.py
-lib/%%PYTHON_VERSION%%/site-packages/gettext.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gettext.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/config.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/config.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/config.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/file.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/file.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/file.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/help.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/help.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/help.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/history.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/history.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/history.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/score.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/score.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/score.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/url.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/url.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/url.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/util.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/util.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gtkhtml.py
-lib/%%PYTHON_VERSION%%/site-packages/gtkhtml.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gtkhtml.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_appletmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_cappletmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gladegnomemodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomemodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomeuimodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkhtmlmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkxmhtmlmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_zvtmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.pyo
 share/examples/py-gnome/about.py
 share/examples/py-gnome/bookmarks-applet.py
 share/examples/py-gnome/calculator.py
@@ -90,4 +87,4 @@ share/pygtk/1.2/defs/gtkhtml.defs
 share/pygtk/1.2/defs/xmhtml.defs
 share/pygtk/1.2/defs/zvt.defs
 @dirrm share/examples/py-gnome
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/gnome
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-1.2/gnome
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index c0dab7619f6e..edd644e9bcb8 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	py-gnome
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.4
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-python
 DISTNAME=	gnome-python-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gtkhtml
+USE_GNOME=	gtkhtml libpanel
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure pygtk/configure
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}				\
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index 5a21d7311636..5df73588577b 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.4.2.tar.gz) = a30fb606888a66bc52f595117c230eaf
+MD5 (gnome/gnome-python-1.4.4.tar.bz2) = b5069c8ac77ba7ad991afceeab332319
diff --git a/x11-toolkits/py-gnome2/files/patch-pygnome::Makefile.in b/x11-toolkits/py-gnome2/files/patch-pygnome::Makefile.in
deleted file mode 100644
index f5caef94525a..000000000000
--- a/x11-toolkits/py-gnome2/files/patch-pygnome::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- pygnome/Makefile.in.orig	Thu Jan  3 15:21:15 2002
-+++ pygnome/Makefile.in	Thu Feb  7 15:35:50 2002
-@@ -123,7 +123,7 @@
- SUBDIRS = generate gnome
- 
- INCLUDES = $(PYTHON_INCLUDES) $(GNOME_INCLUDEDIR) \
--	$(LIBGLADE_CFLAGS)
-+	$(LIBGLADE_CFLAGS) `$(GNOME_CONFIG) --cflags gtkhtml capplet`
- 
- 
- @WITH_APPLETS_TRUE@appletmodule = _appletmodule.la
diff --git a/x11-toolkits/py-gnome2/files/patch-pygtk::configure b/x11-toolkits/py-gnome2/files/patch-pygtk::configure
index ca4f17c4ef8f..d3a68b8efcfa 100644
--- a/x11-toolkits/py-gnome2/files/patch-pygtk::configure
+++ b/x11-toolkits/py-gnome2/files/patch-pygtk::configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- pygtk/configure.orig	Thu Jan  3 15:20:58 2002
-+++ pygtk/configure	Sun Jul 14 15:24:57 2002
-@@ -6321,6 +6321,7 @@
+--- pygtk/configure.orig	Sat Aug 24 10:37:08 2002
++++ pygtk/configure	Wed Aug 28 20:20:53 2002
+@@ -7372,6 +7372,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,3 +11,51 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8888,6 +8889,7 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++#include <Python.h>
+ #include <arrayobject.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -8918,6 +8920,7 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
++#include <Python.h>
+ #include <arrayobject.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -8999,6 +9002,7 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++#include <Python.h>
+ #include <Extensions/arrayobject.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -9029,6 +9033,7 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
++#include <Python.h>
+ #include <Extensions/arrayobject.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -9110,6 +9115,7 @@
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++#include <Python.h>
+ #include <Numeric/arrayobject.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -9140,6 +9146,7 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
++#include <Python.h>
+ #include <Numeric/arrayobject.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 92f764fb8720..06b350c57c5a 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -1,71 +1,68 @@
-lib/%%PYTHON_VERSION%%/site-packages/_appletmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_cappletmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gladegnomemodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gnomemodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gnomeuimodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gtkhtmlmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gtkxmhtmlmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_zvtmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/gettext.py
-lib/%%PYTHON_VERSION%%/site-packages/gettext.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gettext.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/affine.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/applet.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/capplet.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/config.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/config.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/config.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/file.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/file.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/file.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/help.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/help.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/help.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/history.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/history.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/history.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/metadata.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/mime.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/score.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/score.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/score.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/triggers.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/ui.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/uiconsts.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/url.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/url.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/url.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/util.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/util.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/xmhtml.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.py
-lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gnome/zvt.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gtkhtml.py
-lib/%%PYTHON_VERSION%%/site-packages/gtkhtml.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gtkhtml.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_appletmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_cappletmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gladegnomemodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomemodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomeuimodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkhtmlmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkxmhtmlmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_zvtmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/affine.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/applet.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/capplet.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/config.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/file.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/help.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/history.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/metadata.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/mime.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/score.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/triggers.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/ui.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/uiconsts.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/url.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/util.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/xmhtml.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/zvt.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkhtml.pyo
 share/examples/py-gnome/about.py
 share/examples/py-gnome/bookmarks-applet.py
 share/examples/py-gnome/calculator.py
@@ -90,4 +87,4 @@ share/pygtk/1.2/defs/gtkhtml.defs
 share/pygtk/1.2/defs/xmhtml.defs
 share/pygtk/1.2/defs/zvt.defs
 @dirrm share/examples/py-gnome
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/gnome
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-1.2/gnome