Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Sep 2020 15:48:18 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548623 - in head/net-mgmt/net-snmp: . files
Message-ID:  <202009141548.08EFmI2I030375@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Mon Sep 14 15:48:18 2020
New Revision: 548623
URL: https://svnweb.freebsd.org/changeset/ports/548623

Log:
  - Fix PYTHON OPTION
  - Require python 3.5+
  
  PR:		249298
  Submitted by:	John Hein <jcfyecrayz@liamekaens.com>

Added:
  head/net-mgmt/net-snmp/files/patch-Makefile.in   (contents, props changed)
Modified:
  head/net-mgmt/net-snmp/Makefile
  head/net-mgmt/net-snmp/pkg-plist

Modified: head/net-mgmt/net-snmp/Makefile
==============================================================================
--- head/net-mgmt/net-snmp/Makefile	Mon Sep 14 15:34:05 2020	(r548622)
+++ head/net-mgmt/net-snmp/Makefile	Mon Sep 14 15:48:18 2020	(r548623)
@@ -77,7 +77,7 @@ TLS_CONFIGURE_ON=	--with-security-modules=tsm --with-t
 .if ${PORT_OPTIONS:MPYTHON}
 PYDISTUTILS_PKGNAME?=		netsnmp-python
 PYDISTUTILS_PKGVERSION?=	1.0a1
-USES+=		python:2.7
+USES+=		python:3.5+
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 CONFIGURE_ARGS+=--with-python-modules

Added: head/net-mgmt/net-snmp/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/net-snmp/files/patch-Makefile.in	Mon Sep 14 15:48:18 2020	(r548623)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2020-08-14 21:41:47 UTC
++++ Makefile.in
+@@ -235,7 +235,7 @@ pythonmodules: subdirs
+         fi
+ 
+ pythoninstall:
+-	@(dir=`pwd`; cd python; $(PYMAKE) install --basedir=$$dir --root=$(DESTDIR) --prefix=$(prefix)) ; \
++	@(dir=`pwd`; cd python; $(PYMAKE) install --basedir=$$dir --root=$(DESTDIR) --prefix=$(prefix) ${PYDISTUTILS_INSTALLARGS}); \
+         if test $$? != 0 ; then \
+            exit 1 ; \
+         fi

Modified: head/net-mgmt/net-snmp/pkg-plist
==============================================================================
--- head/net-mgmt/net-snmp/pkg-plist	Mon Sep 14 15:34:05 2020	(r548622)
+++ head/net-mgmt/net-snmp/pkg-plist	Mon Sep 14 15:48:18 2020	(r548623)
@@ -617,19 +617,19 @@ sbin/snmptrapd
 %%DATADIR%%/snmpconf-data/snmptrapd-data/traphandle
 @dir /var/agentx
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.pyo
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.pyo
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client_intf.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.pyo
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__pycache__/test.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__pycache__/test.cpython-%%PYTHON_SUFFIX%%.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.pyo
-%%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%%%%PYTHON_SITELIBDIR%%/netsnmp_python-1.0a1-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-1.0a1-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-1.0a1-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-1.0a1-py%%PYTHON_VER%%.egg-info/top_level.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009141548.08EFmI2I030375>