From f657dcb9d40d75572cc4d6babcbb719f9616f545 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 21 Sep 2002 23:46:45 +0000
Subject: 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.

---
 lang/python/application.buildlink.mk | 20 --------------------
 lang/python/application.mk           | 20 ++++++++++++++++++++
 lang/python/extension.buildlink.mk   | 33 ---------------------------------
 lang/python/extension.mk             | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 lang/python/application.buildlink.mk
 create mode 100644 lang/python/application.mk
 delete mode 100644 lang/python/extension.buildlink.mk
 create mode 100644 lang/python/extension.mk

(limited to 'lang/python')

diff --git a/lang/python/application.buildlink.mk b/lang/python/application.buildlink.mk
deleted file mode 100644
index bf73274d305..00000000000
--- a/lang/python/application.buildlink.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: application.buildlink.mk,v 1.5 2002/01/19 13:39:58 drochner Exp $
-
-.include "../../lang/python/pyversion.mk"
-
-# replace shell magic by python version specific path
-# PYTHON_PATCH_SCRIPTS is a list of Python scripts to be installed,
-#  relative to ${WRKSRC}
-
-_PYTHON_PATCH_SCRIPT_SED=	-e "1s;^\#!.*python;\#!${PYTHONBIN};"
-
-.if defined(PYTHON_PATCH_SCRIPTS)
-python-patch-scripts:
-.for s in ${PYTHON_PATCH_SCRIPTS}
-	${CP} ${WRKSRC}/$s ${WRKSRC}/$s.tmp
-	${CHMOD} +w ${WRKSRC}/$s
-	${SED} ${_PYTHON_PATCH_SCRIPT_SED} <${WRKSRC}/$s.tmp >${WRKSRC}/$s
-.endfor
-
-post-patch: python-patch-scripts
-.endif
diff --git a/lang/python/application.mk b/lang/python/application.mk
new file mode 100644
index 00000000000..ce6f21679cb
--- /dev/null
+++ b/lang/python/application.mk
@@ -0,0 +1,20 @@
+# $NetBSD: application.mk,v 1.1 2002/09/21 23:47:03 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+# replace shell magic by python version specific path
+# PYTHON_PATCH_SCRIPTS is a list of Python scripts to be installed,
+#  relative to ${WRKSRC}
+
+_PYTHON_PATCH_SCRIPT_SED=	-e "1s;^\#!.*python;\#!${PYTHONBIN};"
+
+.if defined(PYTHON_PATCH_SCRIPTS)
+python-patch-scripts:
+.for s in ${PYTHON_PATCH_SCRIPTS}
+	${CP} ${WRKSRC}/$s ${WRKSRC}/$s.tmp
+	${CHMOD} +w ${WRKSRC}/$s
+	${SED} ${_PYTHON_PATCH_SCRIPT_SED} <${WRKSRC}/$s.tmp >${WRKSRC}/$s
+.endfor
+
+post-patch: python-patch-scripts
+.endif
diff --git a/lang/python/extension.buildlink.mk b/lang/python/extension.buildlink.mk
deleted file mode 100644
index 28fbab3d122..00000000000
--- a/lang/python/extension.buildlink.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: extension.buildlink.mk,v 1.12 2002/09/20 22:53:21 jlam Exp $
-
-# derive a python version from the package name if possible
-.if defined(PKGNAME_REQD)
-PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/^py([^-]*)-.*/\1/}
-.endif
-
-.include "../../lang/python/pyversion.mk"
-
-.if defined(PYBINMODULE)
-.if ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
-IGNORE="${PKGNAME} needs dynamic loading"
-.endif
-.endif
-
-.if defined(PYDISTUTILSPKG)
-PYSETUP?=		setup.py
-PYSETUPBUILDARGS?=	#empty
-PYSETUPINSTALLARGS?=	#empty
-PY_PATCHPLIST?=		yes
-
-do-build:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \
-	 ${PYSETUP} ${PYSETUPBUILDARGS} build)
-
-do-install:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \
-	 ${PYSETUP} ${PYSETUPINSTALLARGS} install)
-.endif
-
-.if defined(PY_PATCHPLIST)
-PLIST_SUBST+=	PYINC=${PYINC} PYSITELIB=${PYSITELIB}
-.endif
diff --git a/lang/python/extension.mk b/lang/python/extension.mk
new file mode 100644
index 00000000000..d8e5bd274a5
--- /dev/null
+++ b/lang/python/extension.mk
@@ -0,0 +1,33 @@
+# $NetBSD: extension.mk,v 1.1 2002/09/21 23:47:03 jlam Exp $
+
+# derive a python version from the package name if possible
+.if defined(PKGNAME_REQD)
+PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/^py([^-]*)-.*/\1/}
+.endif
+
+.include "../../lang/python/pyversion.mk"
+
+.if defined(PYBINMODULE)
+.if ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
+IGNORE="${PKGNAME} needs dynamic loading"
+.endif
+.endif
+
+.if defined(PYDISTUTILSPKG)
+PYSETUP?=		setup.py
+PYSETUPBUILDARGS?=	#empty
+PYSETUPINSTALLARGS?=	#empty
+PY_PATCHPLIST?=		yes
+
+do-build:
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \
+	 ${PYSETUP} ${PYSETUPBUILDARGS} build)
+
+do-install:
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \
+	 ${PYSETUP} ${PYSETUPINSTALLARGS} install)
+.endif
+
+.if defined(PY_PATCHPLIST)
+PLIST_SUBST+=	PYINC=${PYINC} PYSITELIB=${PYSITELIB}
+.endif
-- 
cgit v1.2.3