From 94f22279a16193c2c6cad905cb7a2120876d4c56 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Mon, 22 Oct 2007 10:14:02 +0000
Subject: [PATCH] replace MODPY_NO_RUNDEP with MODPY_RUNDEP (yes by default)
 add MODPY_LIB_DEPENDS

no objection djm@, ok bernd@
---
 devel/iso-codes/Makefile   | 4 ++--
 lang/python/python.port.mk | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/devel/iso-codes/Makefile b/devel/iso-codes/Makefile
index d74f9819f63..337a67d4cce 100644
--- a/devel/iso-codes/Makefile
+++ b/devel/iso-codes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/21 18:00:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2007/10/22 10:14:02 steven Exp $
 
 COMMENT=	lists of the country, language and currency iso names
 
@@ -19,7 +19,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 
 MODULES=	lang/python
-MODPY_NO_RUNDEP=Yes
+MODPY_RUNDEP=	No
 
 BUILD_DEPENDS=	:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat
 
diff --git a/lang/python/python.port.mk b/lang/python/python.port.mk
index e5723a533ed..df51604dde1 100644
--- a/lang/python/python.port.mk
+++ b/lang/python/python.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: python.port.mk,v 1.18 2007/10/10 21:44:06 steven Exp $
+# $OpenBSD: python.port.mk,v 1.19 2007/10/22 10:14:02 steven Exp $
 #
 #	python.port.mk - Xavier Santolaria <xavier@santolaria.net>
 #	This file is in the public domain.
@@ -6,14 +6,15 @@
 MODPY_VERSION?=		2.5
 
 MODPY_RUN_DEPENDS=	:python-${MODPY_VERSION}*:lang/python/${MODPY_VERSION}
+MODPY_LIB_DEPENDS=	python${MODPY_VERSION}:python-${MODPY_VERSION}*:lang/python/${MODPY_VERSION}
 _MODPY_BUILD_DEPENDS=	:python-${MODPY_VERSION}*:lang/python/${MODPY_VERSION}
 
-MODPY_NO_RUNDEP?=	No
+MODPY_RUNDEP?=		Yes
 
 .if ${NO_BUILD:L} == "no"
 BUILD_DEPENDS+=		${_MODPY_BUILD_DEPENDS}
 .endif
-.if ${MODPY_NO_RUNDEP:L} == "no"
+.if ${MODPY_RUNDEP:L} == "yes"
 RUN_DEPENDS+=		${MODPY_RUN_DEPENDS}
 .endif