Partially back out change to PYTHON_FOR_BUILD_ONLY.

This broke packages that needed a target Python at build-time.
Instead, change it from defined/undefined to yes/no/tool.  Most cases
of defined used `yes' anyway; fix the few stragglers do that instead.
New case `tool' is for TOOL_DEPENDS rather than buildlink3.

6 files changed, 18 insertions, 16 deletions

diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile
index 031bf9a6d47..ca0fc1678c5 100644
--- a/lang/pfe/Makefile
+++ b/lang/pfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 21:56:20 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2013/05/10 20:07:33 riastradh Exp $
 
 DISTNAME=	pfe-0.33.71
 PKGREVISION=	4
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install install-mans install-docs
 TEST_TARGET=	tests
 
 BUILD_DEPENDS=	xmlto-[0-9]*:../../textproc/xmlto	# documentation
-PYTHON_FOR_BUILD_ONLY=	# defined
+PYTHON_FOR_BUILD_ONLY=	yes
 
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/termcap.buildlink3.mk"
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index 82768624c87..6d2dcec13f5 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.107 2013/05/10 00:35:51 riastradh Exp $
+# $NetBSD: pyversion.mk,v 1.108 2013/05/10 20:07:34 riastradh Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -47,8 +47,8 @@
 # PYTHON_FOR_BUILD_ONLY
 #	Whether Python is needed only at build time or at run time.
 #
-#	Possible values: (defined) (undefined)
-#	Default: (undefined)
+#	Possible values: yes no tool
+#	Default: no
 #
 # PYTHON_SELF_CONFLICT
 #	If set to "yes", additional CONFLICTS entries are added for
@@ -196,10 +196,12 @@ PTHREAD_OPTS+=	require
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PYPKGSRCDIR)
-# XXX BUILD_DEPENDS/TOOL_DEPENDS split makes this variable name confusing.
-.  if defined(PYTHON_FOR_BUILD_ONLY)
-TOOL_DEPENDS+=	${PYDEPENDENCY}
+.  if !empty(PYTHON_FOR_BUILD_ONLY:M[tT][oO][oO][lL])
+TOOL_DEPENDS+=			${PYDEPENDENCY}
 .  else
+.    if !empty(PYTHON_FOR_BUILD_ONLY:M[yY][eE][sS])
+BUILDLINK_DEPMETHOD.python?=	build
+.    endif
 .    include "${PYPKGSRCDIR}/buildlink3.mk"
 .  endif
 .endif
diff --git a/sysutils/munin-doc/Makefile b/sysutils/munin-doc/Makefile
index e8111a6d265..c4f1e39ab8f 100644
--- a/sysutils/munin-doc/Makefile
+++ b/sysutils/munin-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 19:51:14 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/05/10 20:07:34 riastradh Exp $
 #
 
 VERS=		1.3.2
@@ -29,7 +29,7 @@ MAKE_ENV+=	PERL5=${PERL5:Q}
 MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 CHECK_PORTABILITY_SKIP+=	node/node.d/*
 
-PYTHON_FOR_BUILD_ONLY=	# empty
+PYTHON_FOR_BUILD_ONLY=	yes
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile
index ab8bf726766..6ecafe8cd67 100644
--- a/sysutils/xenkernel33/Makefile
+++ b/sysutils/xenkernel33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/04/11 19:57:51 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2013/05/10 20:07:34 riastradh Exp $
 #
 
 VERSION=	3.3.2
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/xen-${VERSION}
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
-PYTHON_FOR_BUILD_ONLY=	# empty
+PYTHON_FOR_BUILD_ONLY=	yes
 PY_PATCHPLIST=		NO
 
 SUBST_CLASSES+=		py
diff --git a/sysutils/xenkernel41/Makefile b/sysutils/xenkernel41/Makefile
index 16011e0077a..cc77a796e99 100644
--- a/sysutils/xenkernel41/Makefile
+++ b/sysutils/xenkernel41/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/05/03 16:48:37 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2013/05/10 20:07:34 riastradh Exp $
 #
 
 VERSION=	4.1.5
@@ -19,7 +19,7 @@ ONLY_FOR_PLATFORM+=	NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
-PYTHON_FOR_BUILD_ONLY=	# empty
+PYTHON_FOR_BUILD_ONLY=	yes
 PY_PATCHPLIST=		NO
 
 # XXX Why does this not work?
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index cd2a00ba4e1..8265f990c6d 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2011/06/04 15:23:35 schmonz Exp $
+# $NetBSD: options.mk,v 1.14 2013/05/10 20:07:34 riastradh Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=		cvs ikiwiki-amazon-s3 ikiwiki-search
@@ -33,7 +33,7 @@ DEPENDS+=	p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
 .if !empty(PKG_OPTIONS:Mpython)
 DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
 .else
-PYTHON_FOR_BUILD_ONLY=	yes	# actually just defined
+PYTHON_FOR_BUILD_ONLY=	yes
 .endif
 
 .if !empty(PKG_OPTIONS:Msvn)