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.

6 files changed, 12 insertions, 12 deletions

diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
index a82d4c26ee2..5f5f7037711 100644
--- a/www/ap-python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/02/28 18:32:19 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:00 jlam Exp $
 #
 
 DISTNAME=		mod_python-2.7.6
@@ -32,6 +32,6 @@ post-install:
 		share/doc/html/ap-mod_python \
 		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} )
 
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../www/apache/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/grail/Makefile b/www/grail/Makefile
index 66b0ae696ea..f4ead2933c3 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/05/12 10:16:51 abs Exp $
+# $NetBSD: Makefile,v 1.15 2002/09/21 23:47:00 jlam Exp $
 #
 
 DISTNAME=	grail-0.6
@@ -32,6 +32,6 @@ do-install:
 	(cd ${PREFIX}; ${FIND} -d ${GRAILDIR} -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 
-.include "../../lang/python/application.buildlink.mk"
+.include "../../lang/python/application.mk"
 .include "../../x11/py-Tk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 32ace61571c..deda2bdae35 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/05 19:44:53 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 23:47:00 jlam Exp $
 #
 
 DISTNAME=	HTMLgen
@@ -16,5 +16,5 @@ NO_BUILD=	yes
 MAKE_ENV+=	PYTHONBIN=${PYTHONBIN}
 PY_PATCHPLIST=	yes
 
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 6fbaf674b0c..d1e1dcf6189 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/06/10 01:47:15 shell Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/21 23:47:00 jlam Exp $
 
 DISTNAME=	pycurl-7.9.7
 PKGNAME=	${PYPKGPREFIX}-curl-7.9.7
@@ -14,5 +14,5 @@ DEPENDS+=	curl>=7.9.7:../../www/curl
 PYDISTUTILSPKG=	# defined
 PYBINMODULE=	# defined
 
-.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope/Makefile b/www/zope/Makefile
index bb447bf3a40..cef3635c7e9 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/01/22 18:47:14 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2002/09/21 23:47:00 jlam Exp $
 #
 
 DISTNAME=	Zope-2.2.2-src
@@ -46,5 +46,5 @@ do-install:
 		<${FILESDIR}/zope-shutdown.py >${PREFIX}/sbin/zope-shutdown
 	${CHMOD} 755 ${PREFIX}/sbin/zope-install ${PREFIX}/sbin/zope-shutdown
 
-.include "../../lang/python/application.buildlink.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25/Makefile b/www/zope25/Makefile
index fc741fc5d8d..18ac2ef0394 100644
--- a/www/zope25/Makefile
+++ b/www/zope25/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/22 16:54:48 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 23:47:01 jlam Exp $
 #
 
 DISTNAME=	Zope-2.5.1-src
@@ -48,5 +48,5 @@ do-install:
 	(cd ${ZOPEDIR}; ${PYTHONBIN} ${WRKSRC}/inst/compilezpy.py)
 	(cd ${WRKSRC}; ${PAX} -r -w ${ZOPEDATA} ${ZOPEDIR})
 
-.include "../../lang/python/application.buildlink.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"