Strip the ".buildlink" from the names of the python application and

extension Makefile fragments, because they really don't have anything to
do with the buildlink[12] frameworks.  Change all the Makefiles that use
application.buildlink.mk and extension.buildlink.mk to use application.mk
and extension.mk instead.

7 files changed, 25 insertions, 23 deletions

diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index bc6f8058107..cd9241d7b94 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/09/10 16:06:52 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2002/09/21 23:47:01 jlam Exp $
 
 DISTNAME=		gnome-python-1.4.0
 PKGNAME=		${PYPKGPREFIX}-gnome-1.4.0
@@ -38,6 +38,6 @@ post-configure:
 .endfor
 .endif
 
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../x11/gnome-core/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile
index 0bf4fe9e2aa..eefa1c7fade 100644
--- a/x11/py-Pmw/Makefile
+++ b/x11/py-Pmw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/01/28 17:35:39 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/21 23:47:01 jlam Exp $
 #
 
 DISTNAME=	Pmw.0.8.5
@@ -25,6 +25,6 @@ do-install:
 	(cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/Pmw \
 		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../x11/py-Tk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile
index 7f58cc7763d..784448f7ebb 100644
--- a/x11/py-Tk/Makefile
+++ b/x11/py-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/01/31 15:48:10 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2002/09/21 23:47:01 jlam Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-Tk-0
@@ -34,7 +34,7 @@ post-install:
 		-e "s|@X11BASE@|${X11BASE}|g" \
 		<${FILESDIR}/Setup.in >${PREFIX}/${PYLIB}/config/Setup.tk
 
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
 .include "../../lang/tcl/buildlink.mk"
 .include "../../x11/tk/buildlink.mk"
diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile
index d3b21dc50a7..62a0463cfbb 100644
--- a/x11/py-qt2-sip/Makefile
+++ b/x11/py-qt2-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/20 22:46:08 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:01 jlam Exp $
 #
 
 DISTNAME=	sip-3.1
@@ -24,7 +24,7 @@ PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 MAKE_ENV+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../x11/qt2-libs/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 7df0c7fc7a8..72a2d6bd39d 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/17 10:31:36 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 23:47:02 jlam Exp $
 #
 
 DISTNAME=	PyQt-3.1-Qt-2.3.1
@@ -11,21 +11,23 @@ MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://www.riverbankcomputing.co.uk/pyqt/index.php
 COMMENT=	Python bindings for the Qt tooltit
 
-USE_LIBTOOL=	yes
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
+USE_LIBTOOL=		# defined
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_BUILDLINK_ONLY=	yes
 
-HAVE_CONFIGURE=	YES
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-python=${PYTHONBIN} \
-		--with-qt-dir=${QT_BUILDLINK_DIR}
+HAVE_CONFIGURE=		# defined
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS=		--with-python=${PYTHONBIN} \
+			--with-qt-dir=${QTDIR}
 
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 MAKE_ENV+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-.include "../../x11/py-qt2-sip/buildlink.mk"
-.include "../../lang/python/extension.buildlink.mk"
-.include "../../x11/qt2-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../lang/python/extension.mk"
+
+.include "../../x11/py-qt2-sip/buildlink2.mk"
+.include "../../x11/qt2-libs/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index 7e81565b375..2b3589802d7 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:59 fredb Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/21 23:47:02 jlam Exp $
 #
 
 DISTNAME=	wxPython-2.2.2
@@ -31,5 +31,5 @@ post-install:
 		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 
 .include "../../x11/wxGTK/buildlink.mk"
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 987b945152d..88cc3a48d2c 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:59 fredb Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:02 jlam Exp $
 #
 
 DISTNAME=	pygtk-0.6.9
@@ -24,6 +24,6 @@ PY_PATCHPLIST=	yes
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../graphics/gdk-pixbuf/buildlink.mk"
 .include "../../devel/libglade/buildlink.mk"
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"