From da2fc8539087dd463808a7a952672f18f079609b Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 24 Mar 2005 22:42:58 +0000
Subject: Don't check for USE_BUILDLINK3 anymore in these files.  These are
 included by other package Makefiles, and with the deprecation of
 USE_BUILDLINK3 support in the infrastructure files, these had the potential
 to break existing packages.

---
 lang/python/pyversion.mk | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'lang/python')

diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index e365c7faca2..2184b3674f5 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.32 2005/01/24 08:04:41 recht Exp $
+# $NetBSD: pyversion.mk,v 1.33 2005/03/24 22:42:58 jlam Exp $
 
 .if !defined(PYTHON_PYVERSION_MK)
 PYTHON_PYVERSION_MK=	defined
@@ -137,23 +137,15 @@ BUILD_DEPENDS+=	py15-distutils-*:../../devel/py-distutils
 	error: no valid Python version
 .endif
 
-.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
 PTHREAD_OPTS=	require
-.    include "../../mk/pthread.buildlink3.mk"
-.    if ${PTHREAD_TYPE} == "pth"
-.        include "../../devel/pth/buildlink3.mk"
-.    endif
-.  if defined(PYTHON_FOR_BUILD_ONLY)
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "pth"
+.  include "../../devel/pth/buildlink3.mk"
+.endif
+.if defined(PYTHON_FOR_BUILD_ONLY)
 BUILD_DEPMETHOD.python?=	build
-.  endif
-.  include "${PYPKGSRCDIR}/buildlink3.mk"
-.else
-.  if defined(PYTHON_FOR_BUILD_ONLY)
-BUILD_DEPENDS+=	${PYDEPENDENCY}
-.  else
-DEPENDS+=	${PYDEPENDENCY}
-.  endif
 .endif
+.include "${PYPKGSRCDIR}/buildlink3.mk"
 
 PYTHONBIN=	${LOCALBASE}/bin/python${PYVERSSUFFIX}
 
-- 
cgit v1.2.3