aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Steinmetz <zi@FreeBSD.org>2020-09-14 15:48:18 +0000
committerRyan Steinmetz <zi@FreeBSD.org>2020-09-14 15:48:18 +0000
commit713b96a4098aa45205716601e71ebacfe5713bc4 (patch)
treed38e53575cfa4e2689e317e6811ed99a14c3f4ce
parent4f324cb5a4a45961b6f6470000917908f1f3c67b (diff)
- Fix PYTHON OPTION
- Require python 3.5+ PR: 249298 Submitted by: John Hein <jcfyecrayz@liamekaens.com>
Notes
Notes: svn path=/head/; revision=548623
-rw-r--r--net-mgmt/net-snmp/Makefile2
-rw-r--r--net-mgmt/net-snmp/files/patch-Makefile.in11
-rw-r--r--net-mgmt/net-snmp/pkg-plist24
3 files changed, 24 insertions, 13 deletions
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 310a9044106f..058ebbb659a7 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -77,7 +77,7 @@ TLS_CONFIGURE_ON= --with-security-modules=tsm --with-transports=TLSTCP,DTLSUDP
.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
diff --git a/net-mgmt/net-snmp/files/patch-Makefile.in b/net-mgmt/net-snmp/files/patch-Makefile.in
new file mode 100644
index 000000000000..f52bdf80ad44
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-Makefile.in
@@ -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
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 493f9a206510..3edaa1ddb0a4 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -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