Date: Thu, 10 Apr 2014 22:32:56 +0300 (EEST) From: Johannes Jost Meixner <xmj@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: xmj@FreeBSD.org Subject: ports/188440: [PATCH] net-mgmt/net-snmp: Makefile cleanup, deprecate easy_install Message-ID: <8954820666130378198.enqueue@mx12.chaot.net> Resent-Message-ID: <201404101940.s3AJe0DQ001426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188440 >Category: ports >Synopsis: [PATCH] net-mgmt/net-snmp: Makefile cleanup, deprecate easy_install >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 10 19:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Johannes Jost Meixner >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Goldener Grund OUe >Environment: System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #7: Wed Apr 2 13:50:37 EEST >Description: - Deprecate easy_install. The diff attached deprecates easy_install in favor of standard python setuptools methods used by Mk/bsd.python.mk This way, most of the parts in the port Makefile that had to be copied there are no longer needed, which makes for a simpler Makefile. However, python scripts need to be explicitly listed in pkg-plist. Port maintainer (zi@FreeBSD.org) is cc'd. portlint: 0 fatal errors and 9 warnings found. (not caused by the change) port test: ok testport: ok redports: https://redports.org/buildarchive/20140410162827-87814/ Generated with FreeBSD Port Tools 1.00.2014.03.22 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- net-snmp-5.7.2.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 350836) +++ Makefile (working copy) @@ -57,29 +57,16 @@ .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 Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 350836) +++ files/patch-Makefile.in (working copy) @@ -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 Index: pkg-plist =================================================================== --- pkg-plist (revision 350836) +++ pkg-plist (working copy) @@ -610,9 +610,26 @@ %%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 --- net-snmp-5.7.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8954820666130378198.enqueue>