4 files changed, 100 insertions, 45 deletions

diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 25748c483290..58652515390c 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	py-gtk
-PORTVERSION=	0.6.9
+PORTVERSION=	0.6.10
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-python	
-DISTNAME=	gnome-python-1.4.2
+DISTNAME=	gnome-python-1.4.4
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -20,6 +21,7 @@ RUN_DEPENDS=	${PYNUMERIC}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomelibs gdkpixbuf libglade
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 5a21d7311636..5df73588577b 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/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-gtk2/files/patch-configure b/x11-toolkits/py-gtk2/files/patch-configure
index f91c22b56f99..f2a3b46431df 100644
--- a/x11-toolkits/py-gtk2/files/patch-configure
+++ b/x11-toolkits/py-gtk2/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure	2002/07/14 12:15:07	1.1
-+++ configure	2002/07/14 12:15:18
-@@ -6321,6 +6321,7 @@
+--- configure.orig	Sat Aug 24 10:37:08 2002
++++ 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-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index f2da33df3ebb..ca64c22a1d9d 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -2,44 +2,48 @@ bin/pygtk-codegen-1.2
 include/pygtk/pygdkimlib.h
 include/pygtk/pygdkpixbuf.h
 include/pygtk/pygtk.h
-lib/%%PYTHON_VERSION%%/site-packages/GDK.py
-lib/%%PYTHON_VERSION%%/site-packages/GDK.pyc
-lib/%%PYTHON_VERSION%%/site-packages/GDK.pyo
-lib/%%PYTHON_VERSION%%/site-packages/GTK.py
-lib/%%PYTHON_VERSION%%/site-packages/GTK.pyc
-lib/%%PYTHON_VERSION%%/site-packages/GTK.pyo
-lib/%%PYTHON_VERSION%%/site-packages/GdkImlib.py
-lib/%%PYTHON_VERSION%%/site-packages/GdkImlib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/GdkImlib.pyo
-lib/%%PYTHON_VERSION%%/site-packages/GtkExtra.py
-lib/%%PYTHON_VERSION%%/site-packages/GtkExtra.pyc
-lib/%%PYTHON_VERSION%%/site-packages/GtkExtra.pyo
-lib/%%PYTHON_VERSION%%/site-packages/_gdkimlibmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gtkglmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_gtkmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/_libglademodule.so
-lib/%%PYTHON_VERSION%%/site-packages/gdkpixbufmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/gtk.py
-lib/%%PYTHON_VERSION%%/site-packages/gtk.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gtk.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gtkgl.py
-lib/%%PYTHON_VERSION%%/site-packages/gtkgl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gtkgl.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libglade.py
-lib/%%PYTHON_VERSION%%/site-packages/libglade.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libglade.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/build.py
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/build.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/build.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/style.py
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/style.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/style.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/xmlparse.py
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/xmlparse.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pyglade/xmlparse.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GDK.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GDK.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GDK.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GTK.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GTK.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GTK.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GdkImlib.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GdkImlib.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GdkImlib.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GtkExtra.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GtkExtra.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/GtkExtra.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gdkimlibmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkglmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_libglademodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gdkpixbufmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtk.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtk.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtk.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkgl.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkgl.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gtkgl.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/libglade.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/libglade.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/libglade.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/build.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/build.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/build.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/style.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/style.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/style.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/xmlparse.py
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/xmlparse.pyc
+%%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade/xmlparse.pyo
+%%PYTHON_SITELIBDIR%%/pygtk.pth
+%%PYTHON_SITELIBDIR%%/pygtk.py
+%%PYTHON_SITELIBDIR%%/pygtk.pyc
+%%PYTHON_SITELIBDIR%%/pygtk.pyo
 share/doc/py-gtk/MAPPING
 share/examples/py-gtk/gl/README
 share/examples/py-gtk/gl/cone.py
@@ -122,5 +126,6 @@ share/pygtk/1.2/defs/libglade.defs
 @dirrm share/examples/py-gtk/gl
 @dirrm share/examples/py-gtk
 @dirrm share/doc/py-gtk
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-1.2/pyglade
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-1.2
 @dirrm include/pygtk