From 6f8b4242e8b51c5557062e5beb93e7c930aae8bb Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 22 Oct 2007 15:07:15 +0000
Subject: [PATCH] - use python MODULE (and make sure the -main subpackage
 doesn't run_depends on python) - install egg-info file

feedbacks and ok steven@
---
 net/libdnet/Makefile                | 15 +++++++--------
 net/libdnet/pkg/PFRAG.shared-python |  6 ++----
 net/libdnet/pkg/PLIST-python        |  3 ++-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 783c349e5a9..b506f061cc8 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2007/10/08 08:22:41 steven Exp $
+# $OpenBSD: Makefile,v 1.19 2007/10/22 15:07:15 ajacoutot Exp $
 
 COMMENT-main=	portable low-level networking library
 COMMENT-python= python interface to libdnet
 
 DISTNAME=	libdnet-1.10
 PKGNAME-main=	${DISTNAME}p2
-PKGNAME-python= ${DISTNAME:S/^libdnet/py-libdnet/}p2
+PKGNAME-python= ${DISTNAME:S/^libdnet/py-libdnet/}p3
 SHARED_LIBS=	dnet	1.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libdnet/}
@@ -28,19 +28,18 @@ USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 MULTI_PACKAGES=		-main
 
+RUN_DEPENDS-main=
+
 .if ${FLAVOR:L:Mno_python}
 CONFIGURE_ARGS+=	--without-python
 .else
+MODULES+=		lang/python
 MULTI_PACKAGES+=	-python
 CONFIGURE_ARGS+=	--with-python
-BUILD_DEPENDS+=		:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
-MAKE_FLAGS=		PYTHON=${LOCALBASE}/bin/python${PYTHON_VER}
+MAKE_FLAGS=		PYTHON=${MODPY_BIN}
 FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST}
-PYTHON_VER=		2.4
-SUBST_VARS=		PYTHON_VER
 REGRESS_DEPENDS=	::net/libdnet,-python
-REGRESS_FLAGS=		TESTS_ENVIRONMENT=${LOCALBASE}/bin/python${PYTHON_VER}
-RUN_DEPENDS-python=	:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
+REGRESS_FLAGS=		TESTS_ENVIRONMENT=${MODPY_BIN}
 WANTLIB-python=
 .endif
 
diff --git a/net/libdnet/pkg/PFRAG.shared-python b/net/libdnet/pkg/PFRAG.shared-python
index 12569ba34fc..b1ee1340add 100644
--- a/net/libdnet/pkg/PFRAG.shared-python
+++ b/net/libdnet/pkg/PFRAG.shared-python
@@ -1,4 +1,2 @@
-@comment $OpenBSD: PFRAG.shared-python,v 1.1 2005/05/22 05:34:52 mjc Exp $
-lib/python${PYTHON_VER}/
-lib/python${PYTHON_VER}/site-packages/
-lib/python${PYTHON_VER}/site-packages/dnet.so
+@comment $OpenBSD: PFRAG.shared-python,v 1.2 2007/10/22 15:07:15 ajacoutot Exp $
+lib/python${MODPY_VERSION}/site-packages/dnet.so
diff --git a/net/libdnet/pkg/PLIST-python b/net/libdnet/pkg/PLIST-python
index 99ea876aec1..c940c228298 100644
--- a/net/libdnet/pkg/PLIST-python
+++ b/net/libdnet/pkg/PLIST-python
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PLIST-python,v 1.2 2005/12/31 13:10:15 steven Exp $
+@comment $OpenBSD: PLIST-python,v 1.3 2007/10/22 15:07:15 ajacoutot Exp $
 %%SHARED%%
+lib/python${MODPY_VERSION}/site-packages/dnet-1.10-py${MODPY_VERSION}.egg-info