Thanks for the comments/review.
(I see that diffs usually go in a [UPDATE] thread - I will start a new
thread if that is more appropriate)
The following removes some packages/imports that prevent the port from
building when the non-OpenBSD files are removed.
OK?
Index: patches/patch-mininet_moduledeps_py
===================================================================
RCS file: /cvs/ports/net/mininet/patches/patch-mininet_moduledeps_py,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-mininet_moduledeps_py
--- patches/patch-mininet_moduledeps_py 21 Aug 2017 18:47:12 -0000 1.1.1.1
+++ patches/patch-mininet_moduledeps_py 30 Aug 2017 06:19:05 -0000
@@ -4,12 +4,9 @@ more changes
Index: mininet/moduledeps.py
--- mininet/moduledeps.py.orig
+++ mininet/moduledeps.py
-@@ -2,21 +2,12 @@
-
- from mininet.util import quietRun
+@@ -4,19 +4,7 @@ from mininet.util import quietRun
from mininet.log import info, error, debug
--from os import environ
-+from os import environ, uname
+ from os import environ
-def lsmod():
- "Return output of lsmod."
@@ -24,10 +21,7 @@ Index: mininet/moduledeps.py
- """Return output of modprobe
- mod: module string"""
- return quietRun( [ 'modprobe', mod ] )
-+if uname()[ 0 ] == 'FreeBSD':
-+ from mininet.freebsd.util import ( lsmod, rmmod, modprobe )
-+else:
-+ from mininet.linux.util import ( lsmod, rmmod, modprobe )
++from mininet.openbsd.util import ( lsmod, rmmod, modprobe )
OF_KMOD = 'ofdatapath'
OVS_KMOD = 'openvswitch_mod' # Renamed 'openvswitch' in OVS 1.7+/Linux 3.5+
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/net/mininet/patches/patch-setup_py,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-setup_py
--- patches/patch-setup_py 21 Aug 2017 18:47:12 -0000 1.1.1.1
+++ patches/patch-setup_py 30 Aug 2017 06:19:05 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2017/
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -20,7 +20,13 @@ setup(
+@@ -20,7 +20,11 @@ setup(
description='Process-based OpenFlow emulator',
author='Bob Lantz',
author_email='[email protected]',
@@ -11,8 +11,6 @@ Index: setup.py
+ packages=[
+ 'mininet',
+ 'mininet.examples',
-+ 'mininet.linux',
-+ 'mininet.freebsd',
+ 'mininet.openbsd'
+ ],
long_description="""
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/mininet/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 21 Aug 2017 18:47:12 -0000 1.1.1.1
+++ pkg/PLIST 30 Aug 2017 06:19:05 -0000
@@ -93,26 +93,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mininet/examples/treeping64.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/vlanhost.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/vlanhost.pyc
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/__init__.py
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/intf.py
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/intf.pyc
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/node.py
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/node.pyc
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/util.py
-lib/python${MODPY_VERSION}/site-packages/mininet/freebsd/util.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/link.py
lib/python${MODPY_VERSION}/site-packages/mininet/link.pyc
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/__init__.py
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/intf.py
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/intf.pyc
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/node.py
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/node.pyc
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/util.py
-lib/python${MODPY_VERSION}/site-packages/mininet/linux/util.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/log.py
lib/python${MODPY_VERSION}/site-packages/mininet/log.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/moduledeps.py
