4 files changed, 54 insertions, 25 deletions

diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 65c4849a7725..afd8b8010442 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -1,29 +1,25 @@
 # New ports collection makefile for:	py-gnome
-# Version required:			1.0.1
+# Version required:			1.0.50
 # Date created:				3/14/1999
 # Whom:					nectar@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-python-1.0.4
-PKGNAME=	py-gnome-1.0.4
+DISTNAME=	gnome-python-1.0.50
+PKGNAME=	py-gnome-1.0.50
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
-		ftp://ftp.gimp.org/pub/gtk/python/ \
-		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
-		ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-python
 
 MAINTAINER=	nectar@FreeBSD.org
 
-BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP}
+BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12                  \
 		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
-RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP}
+RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python
 
-
-GTK_CONFIG=	${X11BASE}/bin/gtk12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	GTK_CONFIG=${GTK_CONFIG}
@@ -32,7 +28,6 @@ CONFIGURE_ARGS=	--with-python=python1.5                                 \
 
 EG_SRC_DIR=	${WRKSRC}/pygnome/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
-PYGTK_DEP=	${LOCALBASE}/lib/python1.5/site-packages/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
 PLIST_COMPLETE= ${PKGDIR}/PLIST
 
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/py-gnome/distinfo b/x11-toolkits/py-gnome/distinfo
index 2f33910943de..56bf7871dd2d 100644
--- a/x11-toolkits/py-gnome/distinfo
+++ b/x11-toolkits/py-gnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.0.4.tar.gz) = 886bb00f90545619544ff1e4beca1c77
+MD5 (gnome-python-1.0.50.tar.gz) = 7fee8cae9550d0f30f24b2a3a3c2e293
diff --git a/x11-toolkits/py-gnome/files/patch-ab b/x11-toolkits/py-gnome/files/patch-ab
deleted file mode 100644
index 103fec3cf319..000000000000
--- a/x11-toolkits/py-gnome/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Sep 13 23:01:39 1999
-+++ Makefile.in	Mon Sep 13 23:01:45 1999
-@@ -94,7 +94,7 @@
- pyexecdir = @pyexecdir@
- pythondir = @pythondir@
- 
--SUBDIRS = macros pygtk pygnome
-+SUBDIRS = macros pygnome
- 
- EXTRA_DIST = gnome-python.spec
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
index 8c08283cc82c..cd56b67c6f33 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -1,8 +1,29 @@
+include/pygtk/pygtk.h
+include/pygtk/pygdkimlib.h
+lib/python1.5/site-packages/GDK.py
+lib/python1.5/site-packages/GDK.pyc
+lib/python1.5/site-packages/GDK.pyo
+lib/python1.5/site-packages/GTK.py
+lib/python1.5/site-packages/GTK.pyc
+lib/python1.5/site-packages/GTK.pyo
+lib/python1.5/site-packages/GdkImlib.py
+lib/python1.5/site-packages/GdkImlib.pyc
+lib/python1.5/site-packages/GdkImlib.pyo
+lib/python1.5/site-packages/GtkExtra.py
+lib/python1.5/site-packages/GtkExtra.pyc
+lib/python1.5/site-packages/GtkExtra.pyo
+lib/python1.5/site-packages/Gtkinter.py
+lib/python1.5/site-packages/Gtkinter.pyc
+lib/python1.5/site-packages/Gtkinter.pyo
 lib/python1.5/site-packages/_appletmodule.so
 lib/python1.5/site-packages/_cappletmodule.so
+lib/python1.5/site-packages/_gdkimlibmodule.so
+lib/python1.5/site-packages/_gladegnomemodule.so
 lib/python1.5/site-packages/_gnomemodule.so
 lib/python1.5/site-packages/_gnomeuimodule.so
+lib/python1.5/site-packages/_gtkmodule.so
 lib/python1.5/site-packages/_gtkxmhtmlmodule.so
+lib/python1.5/site-packages/_libglademodule.so
 lib/python1.5/site-packages/_zvtmodule.so
 lib/python1.5/site-packages/gettext.py
 lib/python1.5/site-packages/gettext.pyc
@@ -58,15 +79,39 @@ lib/python1.5/site-packages/gnome/xmhtml.pyo
 lib/python1.5/site-packages/gnome/zvt.py
 lib/python1.5/site-packages/gnome/zvt.pyc
 lib/python1.5/site-packages/gnome/zvt.pyo
+lib/python1.5/site-packages/gtk.py
+lib/python1.5/site-packages/gtk.pyc
+lib/python1.5/site-packages/gtk.pyo
+lib/python1.5/site-packages/libglade.py
+lib/python1.5/site-packages/libglade.pyc
+lib/python1.5/site-packages/libglade.pyo
+lib/python1.5/site-packages/pyglade/__init__.py
+lib/python1.5/site-packages/pyglade/__init__.pyc
+lib/python1.5/site-packages/pyglade/__init__.pyo
+lib/python1.5/site-packages/pyglade/build.py
+lib/python1.5/site-packages/pyglade/build.pyc
+lib/python1.5/site-packages/pyglade/build.pyo
+lib/python1.5/site-packages/pyglade/style.py
+lib/python1.5/site-packages/pyglade/style.pyc
+lib/python1.5/site-packages/pyglade/style.pyo
+lib/python1.5/site-packages/pyglade/xmlparse.py
+lib/python1.5/site-packages/pyglade/xmlparse.pyc
+lib/python1.5/site-packages/pyglade/xmlparse.pyo
+share/examples/py-gnome/about.py
 share/examples/py-gnome/bookmarks-applet.py  
+share/examples/py-gnome/calculator.py
 share/examples/py-gnome/canvas-example.py
 share/examples/py-gnome/canvas.py
 share/examples/py-gnome/clock-applet.py
+share/examples/py-gnome/colorpicker.py
+share/examples/py-gnome/dial.py
 share/examples/py-gnome/fifteen.py
 share/examples/py-gnome/html_demo.py
 share/examples/py-gnome/stock_demo.py
 share/examples/py-gnome/ted_demo.py
 share/examples/py-gnome/uiinfo_demo.py
 share/examples/py-gnome/zterm.py
+@dirrm lib/python1.5/site-packages/pyglade
 @dirrm lib/python1.5/site-packages/gnome
 @dirrm share/examples/py-gnome
+@dirrm include/pygtk