4 files changed, 59 insertions, 7 deletions

diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 3955f7504649..4b5159f09896 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -6,21 +6,28 @@
 #
 
 PORTNAME=	py-gtk
-PORTVERSION=	0.6.7
+PORTVERSION=	0.6.8
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-python	
-DISTNAME=	gnome-python-1.4.0
+DISTNAME=	gnome-python-1.4.1
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 
 USE_GMAKE=	yes
 USE_GNOME=	yes
 USE_PYTHON=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
+		--datadir=${PREFIX}/share
 
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gtk
diff --git a/x11-toolkits/py-gtk/distinfo b/x11-toolkits/py-gtk/distinfo
index 563b6e614aa0..321d29ecd05d 100644
--- a/x11-toolkits/py-gtk/distinfo
+++ b/x11-toolkits/py-gtk/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.4.0.tar.gz) = bbb83517e6d042832c86c96c0451fdad
+MD5 (gnome-python-1.4.1.tar.gz) = 52f8b5ef4cbdaba3c00c08e28702be69
diff --git a/x11-toolkits/py-gtk/files/patch-..::ltmain.sh b/x11-toolkits/py-gtk/files/patch-..::ltmain.sh
new file mode 100644
index 000000000000..a269fa9ddf37
--- /dev/null
+++ b/x11-toolkits/py-gtk/files/patch-..::ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ../ltmain.sh	2001/07/03 13:03:22	1.1
++++ ../ltmain.sh	2001/07/03 13:03:38
+@@ -4136,10 +4136,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/py-gtk/pkg-plist b/x11-toolkits/py-gtk/pkg-plist
index 0d4f663222cd..f2da33df3ebb 100644
--- a/x11-toolkits/py-gtk/pkg-plist
+++ b/x11-toolkits/py-gtk/pkg-plist
@@ -1,4 +1,6 @@
+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
@@ -12,15 +14,17 @@ 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/Gtkinter.py
-lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyc
-lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.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
@@ -86,6 +90,29 @@ share/examples/py-gtk/testgtk/README
 share/examples/py-gtk/testgtk/test.xpm
 share/examples/py-gtk/testgtk/testgtk.py
 share/examples/py-gtk/testgtk/testgtkrc
+share/pygtk/1.2/codegen/generate.py
+share/pygtk/1.2/codegen/generate.pyc
+share/pygtk/1.2/codegen/generate.pyo
+share/pygtk/1.2/codegen/scmexpr.py
+share/pygtk/1.2/codegen/scmexpr.pyc
+share/pygtk/1.2/codegen/scmexpr.pyo
+share/pygtk/1.2/defs/gtk.defs
+share/pygtk/1.2/defs/gtkbase.defs
+share/pygtk/1.2/defs/gtkcontainers.defs
+share/pygtk/1.2/defs/gtkdata.defs
+share/pygtk/1.2/defs/gtkdnd.defs
+share/pygtk/1.2/defs/gtkedit.defs
+share/pygtk/1.2/defs/gtkenums.defs
+share/pygtk/1.2/defs/gtkgl.defs
+share/pygtk/1.2/defs/gtklists.defs
+share/pygtk/1.2/defs/gtkmenus.defs
+share/pygtk/1.2/defs/gtkmisc.defs
+share/pygtk/1.2/defs/gtkranges.defs
+share/pygtk/1.2/defs/libglade.defs
+@dirrm share/pygtk/1.2/defs
+@dirrm share/pygtk/1.2/codegen
+@dirrm share/pygtk/1.2
+@dirrm share/pygtk
 @dirrm share/examples/py-gtk/testgtk
 @dirrm share/examples/py-gtk/simple
 @dirrm share/examples/py-gtk/neil