4 files changed, 74 insertions, 118 deletions

diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index afd8b8010442..65c4849a7725 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -1,25 +1,29 @@
 # New ports collection makefile for:	py-gnome
-# Version required:			1.0.50
+# Version required:			1.0.1
 # Date created:				3/14/1999
 # Whom:					nectar@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-python-1.0.50
-PKGNAME=	py-gnome-1.0.50
+DISTNAME=	gnome-python-1.0.4
+PKGNAME=	py-gnome-1.0.4
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-python
+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/
 
 MAINTAINER=	nectar@FreeBSD.org
 
-BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP}
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12                  \
 		capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
-RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python
+RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP}
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+GTK_CONFIG=	${X11BASE}/bin/gtk12-config
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	GTK_CONFIG=${GTK_CONFIG}
@@ -28,6 +32,7 @@ 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 56bf7871dd2d..2f33910943de 100644
--- a/x11-toolkits/py-gnome/distinfo
+++ b/x11-toolkits/py-gnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-python-1.0.50.tar.gz) = 7fee8cae9550d0f30f24b2a3a3c2e293
+MD5 (gnome-python-1.0.4.tar.gz) = 886bb00f90545619544ff1e4beca1c77
diff --git a/x11-toolkits/py-gnome/files/patch-ab b/x11-toolkits/py-gnome/files/patch-ab
new file mode 100644
index 000000000000..103fec3cf319
--- /dev/null
+++ b/x11-toolkits/py-gnome/files/patch-ab
@@ -0,0 +1,11 @@
+--- 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 cd56b67c6f33..5b6ed9cd952d 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -1,117 +1,57 @@
-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
-lib/python1.5/site-packages/gettext.pyo
-lib/python1.5/site-packages/gnome/__init__.py
-lib/python1.5/site-packages/gnome/__init__.pyc
-lib/python1.5/site-packages/gnome/__init__.pyo
-lib/python1.5/site-packages/gnome/affine.py
-lib/python1.5/site-packages/gnome/affine.pyc
-lib/python1.5/site-packages/gnome/affine.pyo
-lib/python1.5/site-packages/gnome/applet.py
-lib/python1.5/site-packages/gnome/applet.pyc
-lib/python1.5/site-packages/gnome/applet.pyo
-lib/python1.5/site-packages/gnome/capplet.py
-lib/python1.5/site-packages/gnome/capplet.pyc
-lib/python1.5/site-packages/gnome/capplet.pyo
-lib/python1.5/site-packages/gnome/config.py
-lib/python1.5/site-packages/gnome/config.pyc
-lib/python1.5/site-packages/gnome/config.pyo
-lib/python1.5/site-packages/gnome/file.py
-lib/python1.5/site-packages/gnome/file.pyc
-lib/python1.5/site-packages/gnome/file.pyo
-lib/python1.5/site-packages/gnome/help.py
-lib/python1.5/site-packages/gnome/help.pyc
-lib/python1.5/site-packages/gnome/help.pyo
-lib/python1.5/site-packages/gnome/history.py
-lib/python1.5/site-packages/gnome/history.pyc
-lib/python1.5/site-packages/gnome/history.pyo
-lib/python1.5/site-packages/gnome/metadata.py
-lib/python1.5/site-packages/gnome/metadata.pyc
-lib/python1.5/site-packages/gnome/metadata.pyo
-lib/python1.5/site-packages/gnome/mime.py
-lib/python1.5/site-packages/gnome/mime.pyc
-lib/python1.5/site-packages/gnome/mime.pyo
-lib/python1.5/site-packages/gnome/score.py
-lib/python1.5/site-packages/gnome/score.pyc
-lib/python1.5/site-packages/gnome/score.pyo
-lib/python1.5/site-packages/gnome/triggers.py
-lib/python1.5/site-packages/gnome/triggers.pyc
-lib/python1.5/site-packages/gnome/triggers.pyo
-lib/python1.5/site-packages/gnome/ui.py
-lib/python1.5/site-packages/gnome/ui.pyc
-lib/python1.5/site-packages/gnome/ui.pyo
-lib/python1.5/site-packages/gnome/uiconsts.py
-lib/python1.5/site-packages/gnome/uiconsts.pyc
-lib/python1.5/site-packages/gnome/uiconsts.pyo
-lib/python1.5/site-packages/gnome/url.py
-lib/python1.5/site-packages/gnome/url.pyc
-lib/python1.5/site-packages/gnome/url.pyo
-lib/python1.5/site-packages/gnome/xmhtml.py
-lib/python1.5/site-packages/gnome/xmhtml.pyc
-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
+lib/python1.5/site-packages/gtkmodule.so
+share/doc/pygtk/README
+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
+share/examples/pygtk/ide/gtkcons.py
+share/examples/pygtk/ide/gtkdb.py
+share/examples/pygtk/ide/gtkprof.py
+share/examples/pygtk/ide/minibreak.xpm
+share/examples/pygtk/ide/next.xpm
+share/examples/pygtk/ide/pyide.py
+share/examples/pygtk/ide/quit.xpm
+share/examples/pygtk/ide/return.xpm
+share/examples/pygtk/ide/run.xpm
+share/examples/pygtk/ide/step.xpm
+share/examples/pygtk/imlib/view.py
+share/examples/pygtk/neil/README
+share/examples/pygtk/neil/TAppli.py
+share/examples/pygtk/neil/TAppli2.py
+share/examples/pygtk/neil/TAppli3.py
+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/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/testgtk/testgtk.py
+share/examples/pygtk/testgtk/testgtkrc
+@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
+@dirrm share/doc/pygtk