Upgrade to 0.5.9.

16 files changed, 296 insertions, 292 deletions

diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index afbfa2cd7380..2d31dd627a22 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	pygtk
-# Version required:	0.5.2
-# Date created:		30 May 1998
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
+# Version required:			0.5.9
+# Date created:				12/26/1998
+# Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.13 1998/10/15 14:31:45 jseger Exp $
+# $Id: Makefile,v 1.14 1998/11/11 05:37:38 asami Exp $
 #
 
-DISTNAME=	pygtk-0.5.2
-PKGNAME=	py-gtk-0.5.2
+DISTNAME=	pygtk-0.5.9
+PKGNAME=	py-gtk-0.5.9
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
@@ -15,21 +15,14 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
 		ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
 
-MAINTAINER=	ports@FreeBSD.ORG
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 300000
-BROKEN=         python
-.endif
+MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	Imlib.1:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gtk-config=${X11BASE}/bin/gtk11-config
-ALL_TARGET=	sharedmods
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
 post-install:
@@ -41,6 +34,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pygtk
 .endif
 
-BROKEN=		gtk
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome/distinfo b/x11-toolkits/py-gnome/distinfo
index 538294d0b670..b86121e607c2 100644
--- a/x11-toolkits/py-gnome/distinfo
+++ b/x11-toolkits/py-gnome/distinfo
@@ -1 +1 @@
-MD5 (pygtk-0.5.2.tar.gz) = aa69699ce7c952937a591eaecb231f35
+MD5 (pygtk-0.5.9.tar.gz) = ce6057ec2385701e96c4f3ef708f0f2d
diff --git a/x11-toolkits/py-gnome/pkg-descr b/x11-toolkits/py-gnome/pkg-descr
index 8e2ab4392ce6..02198045d118 100644
--- a/x11-toolkits/py-gnome/pkg-descr
+++ b/x11-toolkits/py-gnome/pkg-descr
@@ -1,16 +1,15 @@
-Gtkmodule and Gtkinter
-======================
-Author: James Henstridge <james@daa.com.au>
+From the README:
 
-This archive contains modules that allow you to use gtk in Python
-programs.  At this point, it is still very much a work in progress.
-Despite the low version number, this peice of software is quite useful,
-and is usable to write moderately complex programs.  (see the examples
-directory for some examples of the simpler programs you could write).
+  PyGTK
+  =====
+  Author: James Henstridge <james@daa.com.au>
 
-If you have any enhancements or bug reports, please send them to me at
-james@daa.com.au.  If you are going to send me diffs, my prefered
-format is unified diff (ie. diff -u), although context diffs are OK as
-well.  Please don't send me diffs which don't have any context, as these
-are almost useless if I try to apply them manually, or have a different
-version of the source tree.
+  This archive contains modules that allow you to use gtk in Python
+  programs.  At present, it is a fairly complete set of bindings.
+  Despite the low version number, this piece of software is quite
+  useful, and is usable to write moderately complex programs.  
+
+ftp://ftp.daa.com.au/pub/james/python/		Primary site.
+pygtk-request@daa.com.au			Mailing list request.
+
+-- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
index d9e17789a854..c5274bb73f23 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -1,47 +1,62 @@
-lib/python1.5/site-packages/GDK.py
-lib/python1.5/site-packages/GDK.pyc
-lib/python1.5/site-packages/GdkImlib.py
-lib/python1.5/site-packages/GdkImlib.pyc
-lib/python1.5/site-packages/GTK.py
-lib/python1.5/site-packages/GTK.pyc
-lib/python1.5/site-packages/GtkExtra.py
-lib/python1.5/site-packages/GtkExtra.pyc
-lib/python1.5/site-packages/Gtkinter.py
-lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/pyglade/__init__.py
 lib/python1.5/site-packages/pyglade/build.py
-lib/python1.5/site-packages/pyglade/build.pyc
 lib/python1.5/site-packages/pyglade/style.py
-lib/python1.5/site-packages/pyglade/style.pyc
 lib/python1.5/site-packages/pyglade/xmlparse.py
-lib/python1.5/site-packages/pyglade/xmlparse.pyc
-lib/python1.5/site-packages/pyglade/__init__.py
 lib/python1.5/site-packages/pyglade/__init__.pyc
-lib/python1.5/site-packages/_gdkimlibmodule.so
-lib/python1.5/site-packages/_gtkmodule.so
+lib/python1.5/site-packages/pyglade/build.pyc
+lib/python1.5/site-packages/pyglade/style.pyc
+lib/python1.5/site-packages/pyglade/xmlparse.pyc
+lib/python1.5/site-packages/pyglade/__init__.pyo
+lib/python1.5/site-packages/pyglade/build.pyo
+lib/python1.5/site-packages/pyglade/style.pyo
+lib/python1.5/site-packages/pyglade/xmlparse.pyo
 @dirrm lib/python1.5/site-packages/pyglade
+lib/python1.5/site-packages/_gtkmodule.so
+lib/python1.5/site-packages/_gdkimlibmodule.so
+lib/python1.5/site-packages/gtk.py
+lib/python1.5/site-packages/Gtkinter.py
+lib/python1.5/site-packages/GTK.py
+lib/python1.5/site-packages/GDK.py
+lib/python1.5/site-packages/GtkExtra.py
+lib/python1.5/site-packages/GdkImlib.py
+lib/python1.5/site-packages/gtk.pyc
+lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/GTK.pyc
+lib/python1.5/site-packages/GDK.pyc
+lib/python1.5/site-packages/GtkExtra.pyc
+lib/python1.5/site-packages/GdkImlib.pyc
+lib/python1.5/site-packages/gtk.pyo
+lib/python1.5/site-packages/Gtkinter.pyo
+lib/python1.5/site-packages/GTK.pyo
+lib/python1.5/site-packages/GDK.pyo
+lib/python1.5/site-packages/GtkExtra.pyo
+lib/python1.5/site-packages/GdkImlib.pyo
 share/doc/pygtk/README
+@dirrm share/doc/pygtk
 share/examples/pygtk/glade/README
+share/examples/pygtk/glade/test2.glade
 share/examples/pygtk/glade/glade.py
 share/examples/pygtk/glade/test.glade
-share/examples/pygtk/glade/test2.glade
-share/examples/pygtk/ide/README
-share/examples/pygtk/ide/break.xpm
-share/examples/pygtk/ide/browse.py
-share/examples/pygtk/ide/continue.xpm
-share/examples/pygtk/ide/edit.py
-share/examples/pygtk/ide/edit.xpm
+@dirrm share/examples/pygtk/glade
 share/examples/pygtk/ide/gtkcons.py
 share/examples/pygtk/ide/gtkdb.py
-share/examples/pygtk/ide/gtkprof.py
+share/examples/pygtk/ide/edit.py
+share/examples/pygtk/ide/browse.py
 share/examples/pygtk/ide/minibreak.xpm
-share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/README
+share/examples/pygtk/ide/gtkprof.py
 share/examples/pygtk/ide/pyide.py
-share/examples/pygtk/ide/quit.xpm
+share/examples/pygtk/ide/break.xpm
 share/examples/pygtk/ide/return.xpm
-share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/continue.xpm
 share/examples/pygtk/ide/step.xpm
+share/examples/pygtk/ide/edit.xpm
+share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/quit.xpm
+@dirrm share/examples/pygtk/ide
 share/examples/pygtk/imlib/view.py
-share/examples/pygtk/neil/README
+@dirrm share/examples/pygtk/imlib
 share/examples/pygtk/neil/TAppli.py
 share/examples/pygtk/neil/TAppli2.py
 share/examples/pygtk/neil/TAppli3.py
@@ -49,26 +64,22 @@ share/examples/pygtk/neil/TAppli4.py
 share/examples/pygtk/neil/TAppli5.py
 share/examples/pygtk/neil/bomb.xpm
 share/examples/pygtk/neil/gtk-logo.xpm
-share/examples/pygtk/neil/notebook.py
 share/examples/pygtk/neil/question.xpm
-share/examples/pygtk/simple/README
-share/examples/pygtk/simple/dnd.py
+share/examples/pygtk/neil/notebook.py
+share/examples/pygtk/neil/README
+@dirrm share/examples/pygtk/neil
 share/examples/pygtk/simple/hello1.py
 share/examples/pygtk/simple/hello2.py
-share/examples/pygtk/simple/scribble.py
 share/examples/pygtk/simple/simple1.py
 share/examples/pygtk/simple/simple2.py
 share/examples/pygtk/simple/tooltip1.py
 share/examples/pygtk/simple/tooltip2.py
-share/examples/pygtk/testgtk/README
-share/examples/pygtk/testgtk/test.xpm
+share/examples/pygtk/simple/scribble.py
+share/examples/pygtk/simple/README
+@dirrm share/examples/pygtk/simple
 share/examples/pygtk/testgtk/testgtk.py
+share/examples/pygtk/testgtk/test.xpm
 share/examples/pygtk/testgtk/testgtkrc
+share/examples/pygtk/testgtk/README
 @dirrm share/examples/pygtk/testgtk
-@dirrm share/examples/pygtk/simple
-@dirrm share/examples/pygtk/neil
-@dirrm share/examples/pygtk/imlib
-@dirrm share/examples/pygtk/ide
-@dirrm share/examples/pygtk/glade
 @dirrm share/examples/pygtk
-@dirrm share/doc/pygtk
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index afbfa2cd7380..2d31dd627a22 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	pygtk
-# Version required:	0.5.2
-# Date created:		30 May 1998
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
+# Version required:			0.5.9
+# Date created:				12/26/1998
+# Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.13 1998/10/15 14:31:45 jseger Exp $
+# $Id: Makefile,v 1.14 1998/11/11 05:37:38 asami Exp $
 #
 
-DISTNAME=	pygtk-0.5.2
-PKGNAME=	py-gtk-0.5.2
+DISTNAME=	pygtk-0.5.9
+PKGNAME=	py-gtk-0.5.9
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
@@ -15,21 +15,14 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
 		ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
 
-MAINTAINER=	ports@FreeBSD.ORG
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 300000
-BROKEN=         python
-.endif
+MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	Imlib.1:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gtk-config=${X11BASE}/bin/gtk11-config
-ALL_TARGET=	sharedmods
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
 post-install:
@@ -41,6 +34,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pygtk
 .endif
 
-BROKEN=		gtk
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index 538294d0b670..b86121e607c2 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1 +1 @@
-MD5 (pygtk-0.5.2.tar.gz) = aa69699ce7c952937a591eaecb231f35
+MD5 (pygtk-0.5.9.tar.gz) = ce6057ec2385701e96c4f3ef708f0f2d
diff --git a/x11-toolkits/py-gnome2/pkg-descr b/x11-toolkits/py-gnome2/pkg-descr
index 8e2ab4392ce6..02198045d118 100644
--- a/x11-toolkits/py-gnome2/pkg-descr
+++ b/x11-toolkits/py-gnome2/pkg-descr
@@ -1,16 +1,15 @@
-Gtkmodule and Gtkinter
-======================
-Author: James Henstridge <james@daa.com.au>
+From the README:
 
-This archive contains modules that allow you to use gtk in Python
-programs.  At this point, it is still very much a work in progress.
-Despite the low version number, this peice of software is quite useful,
-and is usable to write moderately complex programs.  (see the examples
-directory for some examples of the simpler programs you could write).
+  PyGTK
+  =====
+  Author: James Henstridge <james@daa.com.au>
 
-If you have any enhancements or bug reports, please send them to me at
-james@daa.com.au.  If you are going to send me diffs, my prefered
-format is unified diff (ie. diff -u), although context diffs are OK as
-well.  Please don't send me diffs which don't have any context, as these
-are almost useless if I try to apply them manually, or have a different
-version of the source tree.
+  This archive contains modules that allow you to use gtk in Python
+  programs.  At present, it is a fairly complete set of bindings.
+  Despite the low version number, this piece of software is quite
+  useful, and is usable to write moderately complex programs.  
+
+ftp://ftp.daa.com.au/pub/james/python/		Primary site.
+pygtk-request@daa.com.au			Mailing list request.
+
+-- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index d9e17789a854..c5274bb73f23 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -1,47 +1,62 @@
-lib/python1.5/site-packages/GDK.py
-lib/python1.5/site-packages/GDK.pyc
-lib/python1.5/site-packages/GdkImlib.py
-lib/python1.5/site-packages/GdkImlib.pyc
-lib/python1.5/site-packages/GTK.py
-lib/python1.5/site-packages/GTK.pyc
-lib/python1.5/site-packages/GtkExtra.py
-lib/python1.5/site-packages/GtkExtra.pyc
-lib/python1.5/site-packages/Gtkinter.py
-lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/pyglade/__init__.py
 lib/python1.5/site-packages/pyglade/build.py
-lib/python1.5/site-packages/pyglade/build.pyc
 lib/python1.5/site-packages/pyglade/style.py
-lib/python1.5/site-packages/pyglade/style.pyc
 lib/python1.5/site-packages/pyglade/xmlparse.py
-lib/python1.5/site-packages/pyglade/xmlparse.pyc
-lib/python1.5/site-packages/pyglade/__init__.py
 lib/python1.5/site-packages/pyglade/__init__.pyc
-lib/python1.5/site-packages/_gdkimlibmodule.so
-lib/python1.5/site-packages/_gtkmodule.so
+lib/python1.5/site-packages/pyglade/build.pyc
+lib/python1.5/site-packages/pyglade/style.pyc
+lib/python1.5/site-packages/pyglade/xmlparse.pyc
+lib/python1.5/site-packages/pyglade/__init__.pyo
+lib/python1.5/site-packages/pyglade/build.pyo
+lib/python1.5/site-packages/pyglade/style.pyo
+lib/python1.5/site-packages/pyglade/xmlparse.pyo
 @dirrm lib/python1.5/site-packages/pyglade
+lib/python1.5/site-packages/_gtkmodule.so
+lib/python1.5/site-packages/_gdkimlibmodule.so
+lib/python1.5/site-packages/gtk.py
+lib/python1.5/site-packages/Gtkinter.py
+lib/python1.5/site-packages/GTK.py
+lib/python1.5/site-packages/GDK.py
+lib/python1.5/site-packages/GtkExtra.py
+lib/python1.5/site-packages/GdkImlib.py
+lib/python1.5/site-packages/gtk.pyc
+lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/GTK.pyc
+lib/python1.5/site-packages/GDK.pyc
+lib/python1.5/site-packages/GtkExtra.pyc
+lib/python1.5/site-packages/GdkImlib.pyc
+lib/python1.5/site-packages/gtk.pyo
+lib/python1.5/site-packages/Gtkinter.pyo
+lib/python1.5/site-packages/GTK.pyo
+lib/python1.5/site-packages/GDK.pyo
+lib/python1.5/site-packages/GtkExtra.pyo
+lib/python1.5/site-packages/GdkImlib.pyo
 share/doc/pygtk/README
+@dirrm share/doc/pygtk
 share/examples/pygtk/glade/README
+share/examples/pygtk/glade/test2.glade
 share/examples/pygtk/glade/glade.py
 share/examples/pygtk/glade/test.glade
-share/examples/pygtk/glade/test2.glade
-share/examples/pygtk/ide/README
-share/examples/pygtk/ide/break.xpm
-share/examples/pygtk/ide/browse.py
-share/examples/pygtk/ide/continue.xpm
-share/examples/pygtk/ide/edit.py
-share/examples/pygtk/ide/edit.xpm
+@dirrm share/examples/pygtk/glade
 share/examples/pygtk/ide/gtkcons.py
 share/examples/pygtk/ide/gtkdb.py
-share/examples/pygtk/ide/gtkprof.py
+share/examples/pygtk/ide/edit.py
+share/examples/pygtk/ide/browse.py
 share/examples/pygtk/ide/minibreak.xpm
-share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/README
+share/examples/pygtk/ide/gtkprof.py
 share/examples/pygtk/ide/pyide.py
-share/examples/pygtk/ide/quit.xpm
+share/examples/pygtk/ide/break.xpm
 share/examples/pygtk/ide/return.xpm
-share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/continue.xpm
 share/examples/pygtk/ide/step.xpm
+share/examples/pygtk/ide/edit.xpm
+share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/quit.xpm
+@dirrm share/examples/pygtk/ide
 share/examples/pygtk/imlib/view.py
-share/examples/pygtk/neil/README
+@dirrm share/examples/pygtk/imlib
 share/examples/pygtk/neil/TAppli.py
 share/examples/pygtk/neil/TAppli2.py
 share/examples/pygtk/neil/TAppli3.py
@@ -49,26 +64,22 @@ share/examples/pygtk/neil/TAppli4.py
 share/examples/pygtk/neil/TAppli5.py
 share/examples/pygtk/neil/bomb.xpm
 share/examples/pygtk/neil/gtk-logo.xpm
-share/examples/pygtk/neil/notebook.py
 share/examples/pygtk/neil/question.xpm
-share/examples/pygtk/simple/README
-share/examples/pygtk/simple/dnd.py
+share/examples/pygtk/neil/notebook.py
+share/examples/pygtk/neil/README
+@dirrm share/examples/pygtk/neil
 share/examples/pygtk/simple/hello1.py
 share/examples/pygtk/simple/hello2.py
-share/examples/pygtk/simple/scribble.py
 share/examples/pygtk/simple/simple1.py
 share/examples/pygtk/simple/simple2.py
 share/examples/pygtk/simple/tooltip1.py
 share/examples/pygtk/simple/tooltip2.py
-share/examples/pygtk/testgtk/README
-share/examples/pygtk/testgtk/test.xpm
+share/examples/pygtk/simple/scribble.py
+share/examples/pygtk/simple/README
+@dirrm share/examples/pygtk/simple
 share/examples/pygtk/testgtk/testgtk.py
+share/examples/pygtk/testgtk/test.xpm
 share/examples/pygtk/testgtk/testgtkrc
+share/examples/pygtk/testgtk/README
 @dirrm share/examples/pygtk/testgtk
-@dirrm share/examples/pygtk/simple
-@dirrm share/examples/pygtk/neil
-@dirrm share/examples/pygtk/imlib
-@dirrm share/examples/pygtk/ide
-@dirrm share/examples/pygtk/glade
 @dirrm share/examples/pygtk
-@dirrm share/doc/pygtk
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index afbfa2cd7380..2d31dd627a22 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	pygtk
-# Version required:	0.5.2
-# Date created:		30 May 1998
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
+# Version required:			0.5.9
+# Date created:				12/26/1998
+# Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.13 1998/10/15 14:31:45 jseger Exp $
+# $Id: Makefile,v 1.14 1998/11/11 05:37:38 asami Exp $
 #
 
-DISTNAME=	pygtk-0.5.2
-PKGNAME=	py-gtk-0.5.2
+DISTNAME=	pygtk-0.5.9
+PKGNAME=	py-gtk-0.5.9
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
@@ -15,21 +15,14 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
 		ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
 
-MAINTAINER=	ports@FreeBSD.ORG
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 300000
-BROKEN=         python
-.endif
+MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	Imlib.1:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gtk-config=${X11BASE}/bin/gtk11-config
-ALL_TARGET=	sharedmods
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
 post-install:
@@ -41,6 +34,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pygtk
 .endif
 
-BROKEN=		gtk
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk/distinfo b/x11-toolkits/py-gtk/distinfo
index 538294d0b670..b86121e607c2 100644
--- a/x11-toolkits/py-gtk/distinfo
+++ b/x11-toolkits/py-gtk/distinfo
@@ -1 +1 @@
-MD5 (pygtk-0.5.2.tar.gz) = aa69699ce7c952937a591eaecb231f35
+MD5 (pygtk-0.5.9.tar.gz) = ce6057ec2385701e96c4f3ef708f0f2d
diff --git a/x11-toolkits/py-gtk/pkg-descr b/x11-toolkits/py-gtk/pkg-descr
index 8e2ab4392ce6..02198045d118 100644
--- a/x11-toolkits/py-gtk/pkg-descr
+++ b/x11-toolkits/py-gtk/pkg-descr
@@ -1,16 +1,15 @@
-Gtkmodule and Gtkinter
-======================
-Author: James Henstridge <james@daa.com.au>
+From the README:
 
-This archive contains modules that allow you to use gtk in Python
-programs.  At this point, it is still very much a work in progress.
-Despite the low version number, this peice of software is quite useful,
-and is usable to write moderately complex programs.  (see the examples
-directory for some examples of the simpler programs you could write).
+  PyGTK
+  =====
+  Author: James Henstridge <james@daa.com.au>
 
-If you have any enhancements or bug reports, please send them to me at
-james@daa.com.au.  If you are going to send me diffs, my prefered
-format is unified diff (ie. diff -u), although context diffs are OK as
-well.  Please don't send me diffs which don't have any context, as these
-are almost useless if I try to apply them manually, or have a different
-version of the source tree.
+  This archive contains modules that allow you to use gtk in Python
+  programs.  At present, it is a fairly complete set of bindings.
+  Despite the low version number, this piece of software is quite
+  useful, and is usable to write moderately complex programs.  
+
+ftp://ftp.daa.com.au/pub/james/python/		Primary site.
+pygtk-request@daa.com.au			Mailing list request.
+
+-- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gtk/pkg-plist b/x11-toolkits/py-gtk/pkg-plist
index d9e17789a854..c5274bb73f23 100644
--- a/x11-toolkits/py-gtk/pkg-plist
+++ b/x11-toolkits/py-gtk/pkg-plist
@@ -1,47 +1,62 @@
-lib/python1.5/site-packages/GDK.py
-lib/python1.5/site-packages/GDK.pyc
-lib/python1.5/site-packages/GdkImlib.py
-lib/python1.5/site-packages/GdkImlib.pyc
-lib/python1.5/site-packages/GTK.py
-lib/python1.5/site-packages/GTK.pyc
-lib/python1.5/site-packages/GtkExtra.py
-lib/python1.5/site-packages/GtkExtra.pyc
-lib/python1.5/site-packages/Gtkinter.py
-lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/pyglade/__init__.py
 lib/python1.5/site-packages/pyglade/build.py
-lib/python1.5/site-packages/pyglade/build.pyc
 lib/python1.5/site-packages/pyglade/style.py
-lib/python1.5/site-packages/pyglade/style.pyc
 lib/python1.5/site-packages/pyglade/xmlparse.py
-lib/python1.5/site-packages/pyglade/xmlparse.pyc
-lib/python1.5/site-packages/pyglade/__init__.py
 lib/python1.5/site-packages/pyglade/__init__.pyc
-lib/python1.5/site-packages/_gdkimlibmodule.so
-lib/python1.5/site-packages/_gtkmodule.so
+lib/python1.5/site-packages/pyglade/build.pyc
+lib/python1.5/site-packages/pyglade/style.pyc
+lib/python1.5/site-packages/pyglade/xmlparse.pyc
+lib/python1.5/site-packages/pyglade/__init__.pyo
+lib/python1.5/site-packages/pyglade/build.pyo
+lib/python1.5/site-packages/pyglade/style.pyo
+lib/python1.5/site-packages/pyglade/xmlparse.pyo
 @dirrm lib/python1.5/site-packages/pyglade
+lib/python1.5/site-packages/_gtkmodule.so
+lib/python1.5/site-packages/_gdkimlibmodule.so
+lib/python1.5/site-packages/gtk.py
+lib/python1.5/site-packages/Gtkinter.py
+lib/python1.5/site-packages/GTK.py
+lib/python1.5/site-packages/GDK.py
+lib/python1.5/site-packages/GtkExtra.py
+lib/python1.5/site-packages/GdkImlib.py
+lib/python1.5/site-packages/gtk.pyc
+lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/GTK.pyc
+lib/python1.5/site-packages/GDK.pyc
+lib/python1.5/site-packages/GtkExtra.pyc
+lib/python1.5/site-packages/GdkImlib.pyc
+lib/python1.5/site-packages/gtk.pyo
+lib/python1.5/site-packages/Gtkinter.pyo
+lib/python1.5/site-packages/GTK.pyo
+lib/python1.5/site-packages/GDK.pyo
+lib/python1.5/site-packages/GtkExtra.pyo
+lib/python1.5/site-packages/GdkImlib.pyo
 share/doc/pygtk/README
+@dirrm share/doc/pygtk
 share/examples/pygtk/glade/README
+share/examples/pygtk/glade/test2.glade
 share/examples/pygtk/glade/glade.py
 share/examples/pygtk/glade/test.glade
-share/examples/pygtk/glade/test2.glade
-share/examples/pygtk/ide/README
-share/examples/pygtk/ide/break.xpm
-share/examples/pygtk/ide/browse.py
-share/examples/pygtk/ide/continue.xpm
-share/examples/pygtk/ide/edit.py
-share/examples/pygtk/ide/edit.xpm
+@dirrm share/examples/pygtk/glade
 share/examples/pygtk/ide/gtkcons.py
 share/examples/pygtk/ide/gtkdb.py
-share/examples/pygtk/ide/gtkprof.py
+share/examples/pygtk/ide/edit.py
+share/examples/pygtk/ide/browse.py
 share/examples/pygtk/ide/minibreak.xpm
-share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/README
+share/examples/pygtk/ide/gtkprof.py
 share/examples/pygtk/ide/pyide.py
-share/examples/pygtk/ide/quit.xpm
+share/examples/pygtk/ide/break.xpm
 share/examples/pygtk/ide/return.xpm
-share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/continue.xpm
 share/examples/pygtk/ide/step.xpm
+share/examples/pygtk/ide/edit.xpm
+share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/quit.xpm
+@dirrm share/examples/pygtk/ide
 share/examples/pygtk/imlib/view.py
-share/examples/pygtk/neil/README
+@dirrm share/examples/pygtk/imlib
 share/examples/pygtk/neil/TAppli.py
 share/examples/pygtk/neil/TAppli2.py
 share/examples/pygtk/neil/TAppli3.py
@@ -49,26 +64,22 @@ share/examples/pygtk/neil/TAppli4.py
 share/examples/pygtk/neil/TAppli5.py
 share/examples/pygtk/neil/bomb.xpm
 share/examples/pygtk/neil/gtk-logo.xpm
-share/examples/pygtk/neil/notebook.py
 share/examples/pygtk/neil/question.xpm
-share/examples/pygtk/simple/README
-share/examples/pygtk/simple/dnd.py
+share/examples/pygtk/neil/notebook.py
+share/examples/pygtk/neil/README
+@dirrm share/examples/pygtk/neil
 share/examples/pygtk/simple/hello1.py
 share/examples/pygtk/simple/hello2.py
-share/examples/pygtk/simple/scribble.py
 share/examples/pygtk/simple/simple1.py
 share/examples/pygtk/simple/simple2.py
 share/examples/pygtk/simple/tooltip1.py
 share/examples/pygtk/simple/tooltip2.py
-share/examples/pygtk/testgtk/README
-share/examples/pygtk/testgtk/test.xpm
+share/examples/pygtk/simple/scribble.py
+share/examples/pygtk/simple/README
+@dirrm share/examples/pygtk/simple
 share/examples/pygtk/testgtk/testgtk.py
+share/examples/pygtk/testgtk/test.xpm
 share/examples/pygtk/testgtk/testgtkrc
+share/examples/pygtk/testgtk/README
 @dirrm share/examples/pygtk/testgtk
-@dirrm share/examples/pygtk/simple
-@dirrm share/examples/pygtk/neil
-@dirrm share/examples/pygtk/imlib
-@dirrm share/examples/pygtk/ide
-@dirrm share/examples/pygtk/glade
 @dirrm share/examples/pygtk
-@dirrm share/doc/pygtk
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index afbfa2cd7380..2d31dd627a22 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	pygtk
-# Version required:	0.5.2
-# Date created:		30 May 1998
-# Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
+# Version required:			0.5.9
+# Date created:				12/26/1998
+# Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.13 1998/10/15 14:31:45 jseger Exp $
+# $Id: Makefile,v 1.14 1998/11/11 05:37:38 asami Exp $
 #
 
-DISTNAME=	pygtk-0.5.2
-PKGNAME=	py-gtk-0.5.2
+DISTNAME=	pygtk-0.5.9
+PKGNAME=	py-gtk-0.5.9
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
@@ -15,21 +15,14 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
 		ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
 
-MAINTAINER=	ports@FreeBSD.ORG
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 300000
-BROKEN=         python
-.endif
+MAINTAINER=	nectar@FreeBSD.ORG
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	Imlib.1:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gtk-config=${X11BASE}/bin/gtk11-config
-ALL_TARGET=	sharedmods
+CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk11d-config
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
 post-install:
@@ -41,6 +34,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pygtk
 .endif
 
-BROKEN=		gtk
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 538294d0b670..b86121e607c2 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1 +1 @@
-MD5 (pygtk-0.5.2.tar.gz) = aa69699ce7c952937a591eaecb231f35
+MD5 (pygtk-0.5.9.tar.gz) = ce6057ec2385701e96c4f3ef708f0f2d
diff --git a/x11-toolkits/py-gtk2/pkg-descr b/x11-toolkits/py-gtk2/pkg-descr
index 8e2ab4392ce6..02198045d118 100644
--- a/x11-toolkits/py-gtk2/pkg-descr
+++ b/x11-toolkits/py-gtk2/pkg-descr
@@ -1,16 +1,15 @@
-Gtkmodule and Gtkinter
-======================
-Author: James Henstridge <james@daa.com.au>
+From the README:
 
-This archive contains modules that allow you to use gtk in Python
-programs.  At this point, it is still very much a work in progress.
-Despite the low version number, this peice of software is quite useful,
-and is usable to write moderately complex programs.  (see the examples
-directory for some examples of the simpler programs you could write).
+  PyGTK
+  =====
+  Author: James Henstridge <james@daa.com.au>
 
-If you have any enhancements or bug reports, please send them to me at
-james@daa.com.au.  If you are going to send me diffs, my prefered
-format is unified diff (ie. diff -u), although context diffs are OK as
-well.  Please don't send me diffs which don't have any context, as these
-are almost useless if I try to apply them manually, or have a different
-version of the source tree.
+  This archive contains modules that allow you to use gtk in Python
+  programs.  At present, it is a fairly complete set of bindings.
+  Despite the low version number, this piece of software is quite
+  useful, and is usable to write moderately complex programs.  
+
+ftp://ftp.daa.com.au/pub/james/python/		Primary site.
+pygtk-request@daa.com.au			Mailing list request.
+
+-- Jacques Vidrine <nectar@FreeBSD.ORG>
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index d9e17789a854..c5274bb73f23 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -1,47 +1,62 @@
-lib/python1.5/site-packages/GDK.py
-lib/python1.5/site-packages/GDK.pyc
-lib/python1.5/site-packages/GdkImlib.py
-lib/python1.5/site-packages/GdkImlib.pyc
-lib/python1.5/site-packages/GTK.py
-lib/python1.5/site-packages/GTK.pyc
-lib/python1.5/site-packages/GtkExtra.py
-lib/python1.5/site-packages/GtkExtra.pyc
-lib/python1.5/site-packages/Gtkinter.py
-lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/pyglade/__init__.py
 lib/python1.5/site-packages/pyglade/build.py
-lib/python1.5/site-packages/pyglade/build.pyc
 lib/python1.5/site-packages/pyglade/style.py
-lib/python1.5/site-packages/pyglade/style.pyc
 lib/python1.5/site-packages/pyglade/xmlparse.py
-lib/python1.5/site-packages/pyglade/xmlparse.pyc
-lib/python1.5/site-packages/pyglade/__init__.py
 lib/python1.5/site-packages/pyglade/__init__.pyc
-lib/python1.5/site-packages/_gdkimlibmodule.so
-lib/python1.5/site-packages/_gtkmodule.so
+lib/python1.5/site-packages/pyglade/build.pyc
+lib/python1.5/site-packages/pyglade/style.pyc
+lib/python1.5/site-packages/pyglade/xmlparse.pyc
+lib/python1.5/site-packages/pyglade/__init__.pyo
+lib/python1.5/site-packages/pyglade/build.pyo
+lib/python1.5/site-packages/pyglade/style.pyo
+lib/python1.5/site-packages/pyglade/xmlparse.pyo
 @dirrm lib/python1.5/site-packages/pyglade
+lib/python1.5/site-packages/_gtkmodule.so
+lib/python1.5/site-packages/_gdkimlibmodule.so
+lib/python1.5/site-packages/gtk.py
+lib/python1.5/site-packages/Gtkinter.py
+lib/python1.5/site-packages/GTK.py
+lib/python1.5/site-packages/GDK.py
+lib/python1.5/site-packages/GtkExtra.py
+lib/python1.5/site-packages/GdkImlib.py
+lib/python1.5/site-packages/gtk.pyc
+lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/GTK.pyc
+lib/python1.5/site-packages/GDK.pyc
+lib/python1.5/site-packages/GtkExtra.pyc
+lib/python1.5/site-packages/GdkImlib.pyc
+lib/python1.5/site-packages/gtk.pyo
+lib/python1.5/site-packages/Gtkinter.pyo
+lib/python1.5/site-packages/GTK.pyo
+lib/python1.5/site-packages/GDK.pyo
+lib/python1.5/site-packages/GtkExtra.pyo
+lib/python1.5/site-packages/GdkImlib.pyo
 share/doc/pygtk/README
+@dirrm share/doc/pygtk
 share/examples/pygtk/glade/README
+share/examples/pygtk/glade/test2.glade
 share/examples/pygtk/glade/glade.py
 share/examples/pygtk/glade/test.glade
-share/examples/pygtk/glade/test2.glade
-share/examples/pygtk/ide/README
-share/examples/pygtk/ide/break.xpm
-share/examples/pygtk/ide/browse.py
-share/examples/pygtk/ide/continue.xpm
-share/examples/pygtk/ide/edit.py
-share/examples/pygtk/ide/edit.xpm
+@dirrm share/examples/pygtk/glade
 share/examples/pygtk/ide/gtkcons.py
 share/examples/pygtk/ide/gtkdb.py
-share/examples/pygtk/ide/gtkprof.py
+share/examples/pygtk/ide/edit.py
+share/examples/pygtk/ide/browse.py
 share/examples/pygtk/ide/minibreak.xpm
-share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/README
+share/examples/pygtk/ide/gtkprof.py
 share/examples/pygtk/ide/pyide.py
-share/examples/pygtk/ide/quit.xpm
+share/examples/pygtk/ide/break.xpm
 share/examples/pygtk/ide/return.xpm
-share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/continue.xpm
 share/examples/pygtk/ide/step.xpm
+share/examples/pygtk/ide/edit.xpm
+share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/quit.xpm
+@dirrm share/examples/pygtk/ide
 share/examples/pygtk/imlib/view.py
-share/examples/pygtk/neil/README
+@dirrm share/examples/pygtk/imlib
 share/examples/pygtk/neil/TAppli.py
 share/examples/pygtk/neil/TAppli2.py
 share/examples/pygtk/neil/TAppli3.py
@@ -49,26 +64,22 @@ share/examples/pygtk/neil/TAppli4.py
 share/examples/pygtk/neil/TAppli5.py
 share/examples/pygtk/neil/bomb.xpm
 share/examples/pygtk/neil/gtk-logo.xpm
-share/examples/pygtk/neil/notebook.py
 share/examples/pygtk/neil/question.xpm
-share/examples/pygtk/simple/README
-share/examples/pygtk/simple/dnd.py
+share/examples/pygtk/neil/notebook.py
+share/examples/pygtk/neil/README
+@dirrm share/examples/pygtk/neil
 share/examples/pygtk/simple/hello1.py
 share/examples/pygtk/simple/hello2.py
-share/examples/pygtk/simple/scribble.py
 share/examples/pygtk/simple/simple1.py
 share/examples/pygtk/simple/simple2.py
 share/examples/pygtk/simple/tooltip1.py
 share/examples/pygtk/simple/tooltip2.py
-share/examples/pygtk/testgtk/README
-share/examples/pygtk/testgtk/test.xpm
+share/examples/pygtk/simple/scribble.py
+share/examples/pygtk/simple/README
+@dirrm share/examples/pygtk/simple
 share/examples/pygtk/testgtk/testgtk.py
+share/examples/pygtk/testgtk/test.xpm
 share/examples/pygtk/testgtk/testgtkrc
+share/examples/pygtk/testgtk/README
 @dirrm share/examples/pygtk/testgtk
-@dirrm share/examples/pygtk/simple
-@dirrm share/examples/pygtk/neil
-@dirrm share/examples/pygtk/imlib
-@dirrm share/examples/pygtk/ide
-@dirrm share/examples/pygtk/glade
 @dirrm share/examples/pygtk
-@dirrm share/doc/pygtk