Join "gnome-python" with "py-gtk" package because their sources are

distributed bundled these days and trying to seperate them causes
build problems.

4 files changed, 93 insertions, 64 deletions

diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index d299baceeff..94fe2be3e06 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2000/01/02 18:02:43 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/02 18:11:22 tron Exp $
 
 DISTNAME=	gnome-python-1.0.50
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/releases/gnome-1.0.53/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gnome-python/}
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.daa.com.au/~james/gnome/
 
-DEPENDS+=	py-gtk-*:../py-gtk
+CONFLICTS+=	py-gtk-*
 
 GNU_CONFIGURE=	yes
 USE_X11=	yes
diff --git a/x11/gnome-python/files/patch-sum b/x11/gnome-python/files/patch-sum
deleted file mode 100644
index 269ff42afb0..00000000000
--- a/x11/gnome-python/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/11/20 20:17:48 tron Exp $
-
-MD5 (patch-aa) = b076b23801243a822940141323601e4e
diff --git a/x11/gnome-python/patches/patch-aa b/x11/gnome-python/patches/patch-aa
deleted file mode 100644
index b55caf0cd9f..00000000000
--- a/x11/gnome-python/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/20 20:17:48 tron Exp $
-
---- Makefile.in.orig	Fri Oct  1 10:36:40 1999
-+++ Makefile.in	Sat Nov 20 21:07:24 1999
-@@ -97,7 +97,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/gnome-python/pkg/PLIST b/x11/gnome-python/pkg/PLIST
index 7bebc5ab750..4867cfbb7d2 100644
--- a/x11/gnome-python/pkg/PLIST
+++ b/x11/gnome-python/pkg/PLIST
@@ -1,63 +1,108 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/20 20:17:48 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/01/02 18:11:24 tron Exp $
+include/pygtk/pygdkimlib.h
+include/pygtk/pygtk.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/_gtkglmodule.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/config.py
-lib/python1.5/site-packages/gnome/file.py
-lib/python1.5/site-packages/gnome/help.py
-lib/python1.5/site-packages/gnome/history.py
-lib/python1.5/site-packages/gnome/metadata.py
-lib/python1.5/site-packages/gnome/mime.py
-lib/python1.5/site-packages/gnome/score.py
-lib/python1.5/site-packages/gnome/triggers.py
-lib/python1.5/site-packages/gnome/url.py
-lib/python1.5/site-packages/gnome/ui.py
-lib/python1.5/site-packages/gnome/uiconsts.py
-lib/python1.5/site-packages/gnome/xmhtml.py
-lib/python1.5/site-packages/gnome/zvt.py
-lib/python1.5/site-packages/gnome/affine.py
-lib/python1.5/site-packages/gnome/applet.py
-lib/python1.5/site-packages/gnome/capplet.py
 lib/python1.5/site-packages/gnome/__init__.pyc
-lib/python1.5/site-packages/gnome/config.pyc
-lib/python1.5/site-packages/gnome/file.pyc
-lib/python1.5/site-packages/gnome/help.pyc
-lib/python1.5/site-packages/gnome/history.pyc
-lib/python1.5/site-packages/gnome/metadata.pyc
-lib/python1.5/site-packages/gnome/mime.pyc
-lib/python1.5/site-packages/gnome/score.pyc
-lib/python1.5/site-packages/gnome/triggers.pyc
-lib/python1.5/site-packages/gnome/url.pyc
-lib/python1.5/site-packages/gnome/ui.pyc
-lib/python1.5/site-packages/gnome/uiconsts.pyc
-lib/python1.5/site-packages/gnome/xmhtml.pyc
-lib/python1.5/site-packages/gnome/zvt.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/__init__.pyo
+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/url.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/gnome/affine.pyo
-lib/python1.5/site-packages/gnome/applet.pyo
-lib/python1.5/site-packages/gnome/capplet.pyo
-lib/python1.5/site-packages/_gnomemodule.so
-lib/python1.5/site-packages/_gnomeuimodule.so
-lib/python1.5/site-packages/_zvtmodule.so
-lib/python1.5/site-packages/_gtkxmhtmlmodule.so
-lib/python1.5/site-packages/_appletmodule.so
-lib/python1.5/site-packages/_cappletmodule.so
-lib/python1.5/site-packages/_gladegnomemodule.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/gtk.py
+lib/python1.5/site-packages/gtk.pyc
+lib/python1.5/site-packages/gtk.pyo
+lib/python1.5/site-packages/gtkgl.py
+lib/python1.5/site-packages/gtkgl.pyc
+lib/python1.5/site-packages/gtkgl.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
+@dirrm lib/python1.5/site-packages/pyglade
 @dirrm lib/python1.5/site-packages/gnome
+@unexec rmdir %D/lib/python1.5/site-packages 2>/dev/null || true
+@dirrm include/pygtk