3 files changed, 36 insertions, 25 deletions

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 28fe38e3fc7d..21d8feaf54cd 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.7.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	net-
@@ -57,29 +57,16 @@ CONFIGURE_ARGS+=--with-defaults
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-# borrowed from bsd.python.mk and adapted for our needs
-PYEASYINSTALL_CMD?=		${LOCALBASE}/bin/easy_install-${PYTHON_VER}
-PYEASYINSTALL_BINDIR?=		${PREFIX}/bin
-PYEASYINSTALL_SITELIBDIR?=	${PYTHONPREFIX_SITELIBDIR}
 PYDISTUTILS_PKGNAME?=		netsnmp-python
 PYDISTUTILS_PKGVERSION?=	1.0a1
-PYEASYINSTALL_INSTALLARGS?=	-q -N -S ${PYTHON_SITELIBDIR} \
-				-d ${PYEASYINSTALL_SITELIBDIR} \
-				-s ${PYEASYINSTALL_BINDIR} \
-				${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION}
-PYEASYUNINSTALL_UNINSTALLARGS?=	-q -N -m -S ${PYTHON_SITELIBDIR} \
-				-d ${PYEASYINSTALL_SITELIBDIR} \
-				-s ${PYEASYINSTALL_BINDIR} \
-				${PYDISTUTILS_PKGNAME}
 USE_PYTHON=	yes
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
 CONFIGURE_ARGS+=--with-python-modules
-CONFIGURE_ENV+=	PYTHONPROG="${LOCALBASE}/bin/${PYTHON_DEFAULT_VERSION}"
+CONFIGURE_ENV+=	PYTHONPROG="${PYTHON_CMD}"
+MAKE_ENV+= 	PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}"
 PLIST_SUB+=	WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
 PLIST_SUB+=	PYDISTUTILS_PKGVERSION=${PYDISTUTILS_PKGVERSION}
-PLIST_SUB+=	PYINSTALL="@exec ${SETENV} PYTHONPATH=${PYEASYINSTALL_SITELIBDIR} ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_INSTALLARGS}"
-PLIST_SUB+=	PYUNINSTALL="@unexec ${PYEASYINSTALL_CMD} ${PYEASYUNINSTALL_UNINSTALLARGS}"
 .else
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
diff --git a/net-mgmt/net-snmp/files/patch-Makefile.in b/net-mgmt/net-snmp/files/patch-Makefile.in
index d05757edaac1..bb595b9a4849 100644
--- a/net-mgmt/net-snmp/files/patch-Makefile.in
+++ b/net-mgmt/net-snmp/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2013-11-22 12:27:23.000000000 -0800
-+++ Makefile.in	2013-11-22 12:28:30.000000000 -0800
+--- ./Makefile.in.orig	2012-10-10 01:28:58.000000000 +0300
++++ ./Makefile.in	2014-04-10 18:31:37.128627539 +0300
 @@ -20,7 +20,7 @@
  INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
  	darwin.h darwin7.h darwin8.h darwin9.h darwin10.h dragonfly.h dynix.h \
@@ -9,3 +9,12 @@
          generic.h \
  	hpux.h irix.h linux.h mingw32.h mips.h netbsd.h osf5.h \
  	openbsd.h openbsd5.h openbsd4.h \
+@@ -229,7 +229,7 @@
+         fi
+ 
+ pythoninstall:
+-	@(dir=`pwd`; cd python; $(PYMAKE) install --basedir=$$dir) ; \
++	@(dir=`pwd`; cd python; $(PYMAKE) install --root=${STAGEDIR} --basedir=$$dir ${PYDISTUTILS_INSTALLARGS}) ; \
+         if test $$? != 0 ; then \
+            exit 1 ; \
+         fi
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 454b93531853..bc24507b1701 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -610,15 +610,30 @@ sbin/snmptrapd
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
 %%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
-%%WITH_PYTHON%%%%PYINSTALL%%
-%%WITH_PYTHON%%%%PYUNINSTALL%%
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.pyo
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.pyo
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.py
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.py
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client_intf.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.pyo
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.py
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.pyo
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.py
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%WITH_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info
+%%WITH_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/netsnmp/tests
+%%WITH_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/netsnmp
 @dirrm include/net-snmp/system
 @dirrm include/net-snmp/machine
 @dirrm include/net-snmp/library
 @dirrm include/net-snmp/agent
 @dirrm include/net-snmp
-@cwd /
-@exec mkdir -p var/agentx
-@unexec rmdir var/agentx 2>/dev/null || true
-@dirrmtry /var/agentx
+@exec mkdir -p /var/agentx
+@unexec rm -d /var/agentx 2>/dev/null || true