use python buildlink,

install headers into a subdir of the python includes

5 files changed, 162 insertions, 136 deletions

diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index 9125c3fea06..8672d65532c 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2001/09/27 23:19:00 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/01/19 11:44:19 drochner Exp $
 
 DISTNAME=		gnome-python-1.4.0
+PKGNAME=		${PYPKGPREFIX}-gnome-1.4.0
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-python/}
 
@@ -11,15 +12,19 @@ COMMENT=		Python Bindings for the GNU Network Object Model Environment
 DEPENDS+=		gnome-core>1.4.0:../gnome-core
 DEPENDS+=		gtkglarea-[0-9]*:../../x11/gtkglarea
 DEPENDS+=		libglade-[0-9]*:../../devel/libglade
-DEPENDS+=		python>=2.0:../../lang/python
 
 CONFLICTS+=		py-gtk-[0-9]*
+CONFLICTS+=		gnome-python-*
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
+MAKE_ENV+=		PYINC=${PYINC}
+PY_PATCHPLIST=		yes
+PYBINMODULE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -32,4 +37,5 @@ post-configure:
 .endfor
 .endif
 
+.include "../../lang/python/extension.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-python/PLIST b/x11/gnome-python/PLIST
index e042db249c8..a6a4fd6da51 100644
--- a/x11/gnome-python/PLIST
+++ b/x11/gnome-python/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:51 zuntum Exp $
-include/pygtk/pygdkimlib.h
-include/pygtk/pygtk.h
-lib/python2.0/site-packages/GDK.py
-lib/python2.0/site-packages/GDK.pyc
-lib/python2.0/site-packages/GDK.pyo
-lib/python2.0/site-packages/GTK.py
-lib/python2.0/site-packages/GTK.pyc
-lib/python2.0/site-packages/GTK.pyo
-lib/python2.0/site-packages/GdkImlib.py
-lib/python2.0/site-packages/GdkImlib.pyc
-lib/python2.0/site-packages/GdkImlib.pyo
-lib/python2.0/site-packages/GtkExtra.py
-lib/python2.0/site-packages/GtkExtra.pyc
-lib/python2.0/site-packages/GtkExtra.pyo
-lib/python2.0/site-packages/Gtkinter.py
-lib/python2.0/site-packages/Gtkinter.pyc
-lib/python2.0/site-packages/Gtkinter.pyo
-lib/python2.0/site-packages/_gtkmodule.la
-lib/python2.0/site-packages/_gtkmodule.a
-lib/python2.0/site-packages/_gtkmodule.so
-lib/python2.0/site-packages/_gdkimlibmodule.la
-lib/python2.0/site-packages/_gdkimlibmodule.a
-lib/python2.0/site-packages/_gdkimlibmodule.so
-lib/python2.0/site-packages/_gtkglmodule.la
-lib/python2.0/site-packages/_gtkglmodule.a
-lib/python2.0/site-packages/_gtkglmodule.so
-lib/python2.0/site-packages/_libglademodule.la
-lib/python2.0/site-packages/_libglademodule.a
-lib/python2.0/site-packages/_libglademodule.so
-lib/python2.0/site-packages/_gnomemodule.la
-lib/python2.0/site-packages/_gnomemodule.a
-lib/python2.0/site-packages/_gnomemodule.so
-lib/python2.0/site-packages/_gnomeuimodule.la
-lib/python2.0/site-packages/_gnomeuimodule.a
-lib/python2.0/site-packages/_gnomeuimodule.so
-lib/python2.0/site-packages/_zvtmodule.la
-lib/python2.0/site-packages/_zvtmodule.a
-lib/python2.0/site-packages/_zvtmodule.so
-lib/python2.0/site-packages/_gtkxmhtmlmodule.la
-lib/python2.0/site-packages/_gtkxmhtmlmodule.a
-lib/python2.0/site-packages/_gtkxmhtmlmodule.so
-lib/python2.0/site-packages/_appletmodule.la
-lib/python2.0/site-packages/_appletmodule.a
-lib/python2.0/site-packages/_appletmodule.so
-lib/python2.0/site-packages/_cappletmodule.la
-lib/python2.0/site-packages/_cappletmodule.a
-lib/python2.0/site-packages/_cappletmodule.so
-lib/python2.0/site-packages/_gladegnomemodule.la
-lib/python2.0/site-packages/_gladegnomemodule.a
-lib/python2.0/site-packages/_gladegnomemodule.so
-lib/python2.0/site-packages/gettext.py
-lib/python2.0/site-packages/gettext.pyc
-lib/python2.0/site-packages/gettext.pyo
-lib/python2.0/site-packages/gnome/__init__.py
-lib/python2.0/site-packages/gnome/__init__.pyc
-lib/python2.0/site-packages/gnome/__init__.pyo
-lib/python2.0/site-packages/gnome/affine.py
-lib/python2.0/site-packages/gnome/affine.pyc
-lib/python2.0/site-packages/gnome/affine.pyo
-lib/python2.0/site-packages/gnome/applet.py
-lib/python2.0/site-packages/gnome/applet.pyc
-lib/python2.0/site-packages/gnome/applet.pyo
-lib/python2.0/site-packages/gnome/capplet.py
-lib/python2.0/site-packages/gnome/capplet.pyc
-lib/python2.0/site-packages/gnome/capplet.pyo
-lib/python2.0/site-packages/gnome/config.py
-lib/python2.0/site-packages/gnome/config.pyc
-lib/python2.0/site-packages/gnome/config.pyo
-lib/python2.0/site-packages/gnome/file.py
-lib/python2.0/site-packages/gnome/file.pyc
-lib/python2.0/site-packages/gnome/file.pyo
-lib/python2.0/site-packages/gnome/help.py
-lib/python2.0/site-packages/gnome/help.pyc
-lib/python2.0/site-packages/gnome/help.pyo
-lib/python2.0/site-packages/gnome/history.py
-lib/python2.0/site-packages/gnome/history.pyc
-lib/python2.0/site-packages/gnome/history.pyo
-lib/python2.0/site-packages/gnome/metadata.py
-lib/python2.0/site-packages/gnome/metadata.pyc
-lib/python2.0/site-packages/gnome/metadata.pyo
-lib/python2.0/site-packages/gnome/mime.py
-lib/python2.0/site-packages/gnome/mime.pyc
-lib/python2.0/site-packages/gnome/mime.pyo
-lib/python2.0/site-packages/gnome/score.py
-lib/python2.0/site-packages/gnome/score.pyc
-lib/python2.0/site-packages/gnome/score.pyo
-lib/python2.0/site-packages/gnome/triggers.py
-lib/python2.0/site-packages/gnome/triggers.pyc
-lib/python2.0/site-packages/gnome/triggers.pyo
-lib/python2.0/site-packages/gnome/ui.py
-lib/python2.0/site-packages/gnome/ui.pyc
-lib/python2.0/site-packages/gnome/ui.pyo
-lib/python2.0/site-packages/gnome/uiconsts.py
-lib/python2.0/site-packages/gnome/uiconsts.pyc
-lib/python2.0/site-packages/gnome/uiconsts.pyo
-lib/python2.0/site-packages/gnome/url.py
-lib/python2.0/site-packages/gnome/url.pyc
-lib/python2.0/site-packages/gnome/url.pyo
-lib/python2.0/site-packages/gnome/util.py
-lib/python2.0/site-packages/gnome/util.pyc
-lib/python2.0/site-packages/gnome/util.pyo
-lib/python2.0/site-packages/gnome/xmhtml.py
-lib/python2.0/site-packages/gnome/xmhtml.pyc
-lib/python2.0/site-packages/gnome/xmhtml.pyo
-lib/python2.0/site-packages/gnome/zvt.py
-lib/python2.0/site-packages/gnome/zvt.pyc
-lib/python2.0/site-packages/gnome/zvt.pyo
-lib/python2.0/site-packages/gtk.py
-lib/python2.0/site-packages/gtk.pyc
-lib/python2.0/site-packages/gtk.pyo
-lib/python2.0/site-packages/gtkgl.py
-lib/python2.0/site-packages/gtkgl.pyc
-lib/python2.0/site-packages/gtkgl.pyo
-lib/python2.0/site-packages/libglade.py
-lib/python2.0/site-packages/libglade.pyc
-lib/python2.0/site-packages/libglade.pyo
-lib/python2.0/site-packages/pyglade/__init__.py
-lib/python2.0/site-packages/pyglade/__init__.pyc
-lib/python2.0/site-packages/pyglade/__init__.pyo
-lib/python2.0/site-packages/pyglade/build.py
-lib/python2.0/site-packages/pyglade/build.pyc
-lib/python2.0/site-packages/pyglade/build.pyo
-lib/python2.0/site-packages/pyglade/style.py
-lib/python2.0/site-packages/pyglade/style.pyc
-lib/python2.0/site-packages/pyglade/style.pyo
-lib/python2.0/site-packages/pyglade/xmlparse.py
-lib/python2.0/site-packages/pyglade/xmlparse.pyc
-lib/python2.0/site-packages/pyglade/xmlparse.pyo
-@dirrm lib/python2.0/site-packages/pyglade
-@dirrm lib/python2.0/site-packages/gnome
-@unexec rmdir %D/lib/python2.0/site-packages 2>/dev/null || true
-@dirrm include/pygtk
+@comment $NetBSD: PLIST,v 1.2 2002/01/19 11:44:19 drochner Exp $
+${PYINC}/pygtk/pygdkimlib.h
+${PYINC}/pygtk/pygtk.h
+${PYSITELIB}/GDK.py
+${PYSITELIB}/GDK.pyc
+${PYSITELIB}/GDK.pyo
+${PYSITELIB}/GTK.py
+${PYSITELIB}/GTK.pyc
+${PYSITELIB}/GTK.pyo
+${PYSITELIB}/GdkImlib.py
+${PYSITELIB}/GdkImlib.pyc
+${PYSITELIB}/GdkImlib.pyo
+${PYSITELIB}/GtkExtra.py
+${PYSITELIB}/GtkExtra.pyc
+${PYSITELIB}/GtkExtra.pyo
+${PYSITELIB}/Gtkinter.py
+${PYSITELIB}/Gtkinter.pyc
+${PYSITELIB}/Gtkinter.pyo
+${PYSITELIB}/_gtkmodule.la
+${PYSITELIB}/_gtkmodule.a
+${PYSITELIB}/_gtkmodule.so
+${PYSITELIB}/_gdkimlibmodule.la
+${PYSITELIB}/_gdkimlibmodule.a
+${PYSITELIB}/_gdkimlibmodule.so
+${PYSITELIB}/_gtkglmodule.la
+${PYSITELIB}/_gtkglmodule.a
+${PYSITELIB}/_gtkglmodule.so
+${PYSITELIB}/_libglademodule.la
+${PYSITELIB}/_libglademodule.a
+${PYSITELIB}/_libglademodule.so
+${PYSITELIB}/_gnomemodule.la
+${PYSITELIB}/_gnomemodule.a
+${PYSITELIB}/_gnomemodule.so
+${PYSITELIB}/_gnomeuimodule.la
+${PYSITELIB}/_gnomeuimodule.a
+${PYSITELIB}/_gnomeuimodule.so
+${PYSITELIB}/_zvtmodule.la
+${PYSITELIB}/_zvtmodule.a
+${PYSITELIB}/_zvtmodule.so
+${PYSITELIB}/_gtkxmhtmlmodule.la
+${PYSITELIB}/_gtkxmhtmlmodule.a
+${PYSITELIB}/_gtkxmhtmlmodule.so
+${PYSITELIB}/_appletmodule.la
+${PYSITELIB}/_appletmodule.a
+${PYSITELIB}/_appletmodule.so
+${PYSITELIB}/_cappletmodule.la
+${PYSITELIB}/_cappletmodule.a
+${PYSITELIB}/_cappletmodule.so
+${PYSITELIB}/_gladegnomemodule.la
+${PYSITELIB}/_gladegnomemodule.a
+${PYSITELIB}/_gladegnomemodule.so
+${PYSITELIB}/gettext.py
+${PYSITELIB}/gettext.pyc
+${PYSITELIB}/gettext.pyo
+${PYSITELIB}/gnome/__init__.py
+${PYSITELIB}/gnome/__init__.pyc
+${PYSITELIB}/gnome/__init__.pyo
+${PYSITELIB}/gnome/affine.py
+${PYSITELIB}/gnome/affine.pyc
+${PYSITELIB}/gnome/affine.pyo
+${PYSITELIB}/gnome/applet.py
+${PYSITELIB}/gnome/applet.pyc
+${PYSITELIB}/gnome/applet.pyo
+${PYSITELIB}/gnome/capplet.py
+${PYSITELIB}/gnome/capplet.pyc
+${PYSITELIB}/gnome/capplet.pyo
+${PYSITELIB}/gnome/config.py
+${PYSITELIB}/gnome/config.pyc
+${PYSITELIB}/gnome/config.pyo
+${PYSITELIB}/gnome/file.py
+${PYSITELIB}/gnome/file.pyc
+${PYSITELIB}/gnome/file.pyo
+${PYSITELIB}/gnome/help.py
+${PYSITELIB}/gnome/help.pyc
+${PYSITELIB}/gnome/help.pyo
+${PYSITELIB}/gnome/history.py
+${PYSITELIB}/gnome/history.pyc
+${PYSITELIB}/gnome/history.pyo
+${PYSITELIB}/gnome/metadata.py
+${PYSITELIB}/gnome/metadata.pyc
+${PYSITELIB}/gnome/metadata.pyo
+${PYSITELIB}/gnome/mime.py
+${PYSITELIB}/gnome/mime.pyc
+${PYSITELIB}/gnome/mime.pyo
+${PYSITELIB}/gnome/score.py
+${PYSITELIB}/gnome/score.pyc
+${PYSITELIB}/gnome/score.pyo
+${PYSITELIB}/gnome/triggers.py
+${PYSITELIB}/gnome/triggers.pyc
+${PYSITELIB}/gnome/triggers.pyo
+${PYSITELIB}/gnome/ui.py
+${PYSITELIB}/gnome/ui.pyc
+${PYSITELIB}/gnome/ui.pyo
+${PYSITELIB}/gnome/uiconsts.py
+${PYSITELIB}/gnome/uiconsts.pyc
+${PYSITELIB}/gnome/uiconsts.pyo
+${PYSITELIB}/gnome/url.py
+${PYSITELIB}/gnome/url.pyc
+${PYSITELIB}/gnome/url.pyo
+${PYSITELIB}/gnome/util.py
+${PYSITELIB}/gnome/util.pyc
+${PYSITELIB}/gnome/util.pyo
+${PYSITELIB}/gnome/xmhtml.py
+${PYSITELIB}/gnome/xmhtml.pyc
+${PYSITELIB}/gnome/xmhtml.pyo
+${PYSITELIB}/gnome/zvt.py
+${PYSITELIB}/gnome/zvt.pyc
+${PYSITELIB}/gnome/zvt.pyo
+${PYSITELIB}/gtk.py
+${PYSITELIB}/gtk.pyc
+${PYSITELIB}/gtk.pyo
+${PYSITELIB}/gtkgl.py
+${PYSITELIB}/gtkgl.pyc
+${PYSITELIB}/gtkgl.pyo
+${PYSITELIB}/libglade.py
+${PYSITELIB}/libglade.pyc
+${PYSITELIB}/libglade.pyo
+${PYSITELIB}/pyglade/__init__.py
+${PYSITELIB}/pyglade/__init__.pyc
+${PYSITELIB}/pyglade/__init__.pyo
+${PYSITELIB}/pyglade/build.py
+${PYSITELIB}/pyglade/build.pyc
+${PYSITELIB}/pyglade/build.pyo
+${PYSITELIB}/pyglade/style.py
+${PYSITELIB}/pyglade/style.pyc
+${PYSITELIB}/pyglade/style.pyo
+${PYSITELIB}/pyglade/xmlparse.py
+${PYSITELIB}/pyglade/xmlparse.pyc
+${PYSITELIB}/pyglade/xmlparse.pyo
+@dirrm ${PYSITELIB}/pyglade
+@dirrm ${PYSITELIB}/gnome
+@unexec rmdir %D/${PYSITELIB} 2>/dev/null || true
+@dirrm ${PYINC}/pygtk
diff --git a/x11/gnome-python/buildlink.mk b/x11/gnome-python/buildlink.mk
new file mode 100644
index 00000000000..3b3f2aca898
--- /dev/null
+++ b/x11/gnome-python/buildlink.mk
@@ -0,0 +1,6 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/01/19 11:44:20 drochner Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_DEPENDS.pygnome?= ${PYPKGPREFIX}-gnome-*
+DEPENDS+= ${BUILDLINK_DEPENDS.pygnome}:../../x11/gnome-python
diff --git a/x11/gnome-python/distinfo b/x11/gnome-python/distinfo
index 6a0f97049e7..9771aa30fa7 100644
--- a/x11/gnome-python/distinfo
+++ b/x11/gnome-python/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 05:27:58 tron Exp $
+$NetBSD: distinfo,v 1.3 2002/01/19 11:44:20 drochner Exp $
 
 SHA1 (gnome-python-1.4.0.tar.gz) = 402d675941cd59b9541067531583d4af0a456c1f
 Size (gnome-python-1.4.0.tar.gz) = 520383 bytes
+SHA1 (patch-aa) = 64f8e66ef10ff5100607d2e96b948a2f5b9a53cc
diff --git a/x11/gnome-python/patches/patch-aa b/x11/gnome-python/patches/patch-aa
new file mode 100644
index 00000000000..8226db9f469
--- /dev/null
+++ b/x11/gnome-python/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2002/01/19 11:44:20 drochner Exp $
+
+--- pygtk/Makefile.in.orig	Fri Feb 16 06:34:48 2001
++++ pygtk/Makefile.in	Fri Jan 18 16:24:34 2002
+@@ -35,7 +35,7 @@
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
++pkgincludedir = $(prefix)/${PYINC}/@PACKAGE@
+ 
+ top_builddir = .
+